1.更新日工时统计

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfWorkHourDao.java

@@ -60,6 +60,8 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
             "chuanyun_self_work_hour.project_id," +
             "chuanyun_self_work_hour.project_type," +
             "chuanyun_self_work_hour.status," +
+            "chuanyun_self_work_hour.department_name," +
+            "chuanyun_self_work_hour.department_id," +
             "chuanyun_self_work_hour.object_id " +
             "FROM chuanyun_self_work_hour " +
             "WHERE chuanyun_self_work_hour.user_id=? " +
@@ -83,6 +85,8 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
             "chuanyun_self_work_hour.project_id," +
             "chuanyun_self_work_hour.project_type," +
             "chuanyun_self_work_hour.status," +
+            "chuanyun_self_work_hour.department_id," +
+            "chuanyun_self_work_hour.department_name," +
             "chuanyun_self_work_hour.object_id " +
             "FROM chuanyun_self_work_hour " +
             "WHERE chuanyun_self_work_hour.user_id=? " +
@@ -109,6 +113,8 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
             "chuanyun_self_work_hour.status," +
             "chuanyun_self_work_hour.project_type," +
             "chuanyun_self_work_hour.project_id," +
+            "chuanyun_self_work_hour.department_id," +
+            "chuanyun_self_work_hour.department_name," +
             "chuanyun_self_work_hour.object_id "+
             "FROM chuanyun_self_work_hour " +
             "WHERE chuanyun_self_work_hour.user_id= ?1 " +

src/main/java/com/galaxis/manatee/dao/ChuanyunUserDepartmentNameDao.java

@@ -0,0 +1,12 @@
+package com.galaxis.manatee.dao;
+
+import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfWorkHourDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserDepartmentNameDO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ChuanyunUserDepartmentNameDao extends GalaxisRepository<ChuanyunUserDepartmentNameDO,String> {
+
+    ChuanyunUserDepartmentNameDO findByUserName(String username);
+}

src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -26,6 +26,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_day_log.project_id," +
             "chuanyun_day_log.project_type," +
             "chuanyun_log.user_id," +
+            "chuanyun_log.department_name," +
             "chuanyun_log.status," +
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
@@ -48,6 +49,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
     @Query(value="SELECT\n" +
             "\tchuanyun_day_log.project_id,\n" +
             "  chuanyun_day_log.project_type,\n" +
+            "chuanyun_log.department_name," +
             "  chuanyun_log.user_id,\n" +
             "  chuanyun_day_log.day_log_date,\n" +
             "  chuanyun_day_log.hours_worked,\n" +
@@ -71,6 +73,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_day_log.project_id," +
             "chuanyun_day_log.project_type," +
             "chuanyun_log.user_id," +
+            "chuanyun_log.department_name," +
             "chuanyun_log.status," +
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
@@ -97,6 +100,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "chuanyun_day_log.project_id," +
             "chuanyun_day_log.project_type," +
             "chuanyun_log.user_id," +
+            "chuanyun_log.department_name," +
             "chuanyun_log.status," +
             "chuanyun_day_log.day_log_date " +
             "FROM chuanyun_day_log "+
@@ -119,6 +123,7 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "\tchuanyun_day_log.project_id,\n" +
             "\tchuanyun_day_log.project_type,\n" +
             "\tchuanyun_log.user_id,\n" +
+            "chuanyun_log.department_name," +
             "\tchuanyun_day_log.day_log_date,\n" +
             "\tSUM(\n" +
             "\t\tchuanyun_day_log.hours_worked\n" +

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunSelfWorkHourDO.java

@@ -35,6 +35,10 @@ public class ChuanyunSelfWorkHourDO {
 
     private String projectId;
 
+    private String departmentId;
+
+    private String departmentName;
+
     /**
      * 流程状态
      */

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunUserDepartmentNameDO.java

@@ -0,0 +1,22 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Slf4j
+@Data
+@Entity(name = "CHUANYUN_USER_DEPARTMENT_NAME")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunUserDepartmentNameDO {
+
+    @Id
+    private int id;
+
+    private String userName;
+
+    private String departmentName;
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunWorkHourDO.java

@@ -35,6 +35,8 @@ public class ChuanyunWorkHourDO {
 
     private String projectId;
 
+    private String departmentName;
+
     /**
      * 流程状态
      */

src/main/java/com/galaxis/manatee/task/ChuanyunHumanResourceScheduledTask.java

@@ -4,10 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.dao.*;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunGroupProjectDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunHolidaySalaryRuleDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunLogDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPayrollDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.*;
 import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunSaveDTO;
 import com.galaxis.manatee.entity.chuanyun.dto.Filter;
 import com.galaxis.manatee.manager.ChuanYunManager;
@@ -36,14 +33,16 @@ public class ChuanyunHumanResourceScheduledTask {
     private final ChuanyunHolidaySalaryRuleDao chuanyunHolidaySalaryRuleDao;
     private final ChuanyunUserCompanyDao chuanyunUserCompanyDao;
     private final ChuanyunPayrollDao chuanyunPayrollDao;
+    private final ChuanyunUserDepartmentNameDao chuanyunUserDepartmentNameDao;
 
-    public ChuanyunHumanResourceScheduledTask(ChuanYunManager chuanYunManager, ChuanyunLogDao chuanyunLogDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunHolidaySalaryRuleDao chuanyunHolidaySalaryRuleDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunPayrollDao chuanyunPayrollDao) {
+    public ChuanyunHumanResourceScheduledTask(ChuanYunManager chuanYunManager, ChuanyunLogDao chuanyunLogDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunHolidaySalaryRuleDao chuanyunHolidaySalaryRuleDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunPayrollDao chuanyunPayrollDao, ChuanyunUserDepartmentNameDao chuanyunUserDepartmentNameDao) {
         this.chuanYunManager = chuanYunManager;
         this.chuanyunLogDao = chuanyunLogDao;
         this.chuanyunGroupProjectDao = chuanyunGroupProjectDao;
         this.chuanyunHolidaySalaryRuleDao = chuanyunHolidaySalaryRuleDao;
         this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
         this.chuanyunPayrollDao = chuanyunPayrollDao;
+        this.chuanyunUserDepartmentNameDao = chuanyunUserDepartmentNameDao;
     }
 
     /**
@@ -70,7 +69,7 @@ public class ChuanyunHumanResourceScheduledTask {
         //由于需要统计流程中的日志，在日志数据同步时将状态为2的数据一并统计
 //        matchersString.add("Status_2,1");
         matchersString.add("Status_6,[1;2;3]");
-//        matchersString.add("logDate_4,2020-08-01 00:00:00");
+//        matchersString.add("logDate_4,2019-01-01 00:00:00");
         while (flag) {
             Long startTime= Instant.now().getEpochSecond();
             try {
@@ -104,7 +103,7 @@ public class ChuanyunHumanResourceScheduledTask {
                         //针对前期测试数据，可能出现日志为空的情况，跳过不处理
                         chuanyunLogDO.getDayLogList().forEach(chuanyunDayLog -> {
                             try{
-                                //离职人员补全用户Id
+                                //离职人员补全用户Id及部门ID
                                 if (StringUtils.isEmpty(chuanyunLogDO.getUserId())){
                                     var name="";
                                     if (StringUtils.isEmpty(chuanyunDayLog.getContent())){
@@ -113,6 +112,15 @@ public class ChuanyunHumanResourceScheduledTask {
                                         name=chuanyunDayLog.getContent();
                                     }
                                     chuanyunLogDO.setUserId(getCharacters(name));
+                                    ChuanyunUserDepartmentNameDO chuanyunUserDepartmentNameDO = chuanyunUserDepartmentNameDao.findByUserName(chuanyunLogDO.getUserId());
+                                    if (chuanyunUserDepartmentNameDO!=null){
+                                        chuanyunLogDO.setDepartmentName(chuanyunUserDepartmentNameDO.getDepartmentName());
+                                    }
+                                }else {
+                                  ChuanyunUserCompanyDO chuanyunUserCompanyDO = chuanyunUserCompanyDao.findByUserId(chuanyunLogDO.getUserObject().getObjectId());
+                                  if (chuanyunUserCompanyDO!=null){
+                                      chuanyunLogDO.setDepartmentName(getDepartmentName(chuanyunUserCompanyDO.getDepartment()));
+                                  }
                                 }
 
                                 if(!"生产项目".equals(chuanyunDayLog.getProjectType())&& StringUtils.isEmpty(chuanyunDayLog.getProjectId())){
@@ -123,7 +131,7 @@ public class ChuanyunHumanResourceScheduledTask {
                                 }
                             }catch (Exception e){
                                 e.printStackTrace();
-                                log.warn(chuanyunDayLog+"");
+                                log.warn(chuanyunLogDO+"");
                             }
                         });
                         //判断所属部门是否正确
@@ -253,7 +261,7 @@ public class ChuanyunHumanResourceScheduledTask {
         log.info("凯乐士薪酬项同步"+totalCount);
     }
 
-    @Scheduled(fixedDelay = 3600000L)
+//    @Scheduled(fixedDelay = 3600000L)
     private void updateRecentLog() {
         var objectMapper = new ObjectMapper();
         var start = 0;
@@ -334,4 +342,13 @@ public class ChuanyunHumanResourceScheduledTask {
         str = str.replaceAll(reg, " ");
         return str.trim();
     }
+
+    private String getDepartmentName(String str){
+        if (str.contains("/")){
+            String[] department = str.split("/");
+            return department[department.length-1];
+        }else {
+            return str;
+        }
+    }
 }

src/main/java/com/galaxis/manatee/task/WorkHourStatistics.java

@@ -112,6 +112,7 @@ public class WorkHourStatistics {
                 try{
                     ChuanyunSelfWorkHourDO chuanyunSelfWorkHourDO = new ChuanyunSelfWorkHourDO();
                     chuanyunSelfWorkHourDO.setStatus(self.getStatus());
+                    chuanyunSelfWorkHourDO.setDepartmentName(self.getDepartmentName());
                     chuanyunSelfWorkHourDO.setUserId(chuanyunUserCompanyDO.getUserId());
                     chuanyunSelfWorkHourDO.setProjectType(self.getProjectType());
                     if(ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())){
@@ -301,12 +302,13 @@ public class WorkHourStatistics {
                         ChuanyunSelfWorkHourDTO chuanyunSelfWorkHourDTO = new ChuanyunSelfWorkHourDTO();
                         BeanUtils.copyProperties(chuanyunSelfWorkHourDO,chuanyunSelfWorkHourDTO);
                         chuanyunSelfWorkHourDTO.setDepartmentId(departmentId);
-                        ChuanyunUserCompanyDO chuanyunUserCompanyDO =chuanyunUserCompanyDao.findByUserId(chuanyunSelfWorkHourDTO.getUserId());
+                        ChuanyunUserCompanyDO chuanyunUserCompanyDO =chuanyunUserCompanyDao.findByUserId(chuanyunSelfWorkHourDO.getUserId());
                         if (chuanyunUserCompanyDO!=null){
                             chuanyunSelfWorkHourDTO.setUserName(chuanyunUserCompanyDO.getUserName());
                         }else{
                             chuanyunSelfWorkHourDTO.setUserName(chuanyunSelfWorkHourDTO.getUserId());
                         }
+                        chuanyunSelfWorkHourDTO.setDepartmentName(chuanyunSelfWorkHourDO.getDepartmentName());
                         List<String> matchers = new ArrayList<>();
                         matchers.add("F0000001_2,"+chuanyunSelfWorkHourDO.getProjectId());
                         matchers.add("F0000002_2,"+chuanyunSelfWorkHourDO.getUserId());
@@ -729,6 +731,9 @@ public class WorkHourStatistics {
         @JsonProperty("F0000005")
         private String projectType;
 
+        @JsonProperty("F0000009")
+        private String departmentName;
+
         /**
          * 流程状态
          */

src/main/java/com/galaxis/manatee/task/WorkHourStatisticsRecently.java

@@ -185,6 +185,7 @@ public class WorkHourStatisticsRecently {
                 chuanyunSelfWorkHourDO.setStatus(self.getStatus());
                 chuanyunSelfWorkHourDO.setUserId(chuanyunUserCompanyDO.getUserId());
                 chuanyunSelfWorkHourDO.setProjectType(self.getProjectType());
+                chuanyunSelfWorkHourDO.setDepartmentName(self.getDepartmentName());
                 if(ChuanYunConstant.PRODUCTION_PROJECT.equals(self.getProjectType())){
                     chuanyunSelfWorkHourDO.setProjectId(ChuanYunConstant.PRODUCTION_PROJECT_ID);
                 }else{
@@ -242,6 +243,7 @@ public class WorkHourStatisticsRecently {
                         if (chuanyunUserCompanyDO!=null){
                             chuanyunSelfWorkHourDTO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
                         }
+                        chuanyunSelfWorkHourDTO.setDepartmentName(chuanyunSelfWorkHourDO.getDepartmentName());
                         if (!StringUtils.isEmpty(chuanyunSelfWorkHourDO.getProjectId())&&!chuanyunSelfWorkHourDO.getProjectId().equals("production_project")){
                             List<String> matchers = new ArrayList<>();
                             matchers.add("F0000001_2,"+chuanyunSelfWorkHourDO.getProjectId());