Merge remote-tracking branch 'origin/1.0' into 1.0

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

@@ -3,17 +3,12 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 import com.dingtalk.api.response.OapiProcessinstanceGetResponse;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.galaxis.capsule.dto.MaterialDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 
 import javax.persistence.Entity;
-import java.nio.file.LinkOption;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -22,6 +17,7 @@ import java.util.UUID;
  * Created by IntelliJ IDEA.
  * User: xuj
  * Date: 2020/7/23
+ * @author xuj
  */
 @Slf4j
 @EqualsAndHashCode(callSuper = true)
@@ -128,14 +124,14 @@ public class ChuanyunAskForLeaveDo extends BasicDO {
     public static ChuanyunAskForLeaveDo fromAskForLeaveDTO(OapiProcessinstanceGetResponse.ProcessInstanceTopVo processInstanceTopVo){
         ChuanyunAskForLeaveDo chuanyunAskForLeaveDo =new ChuanyunAskForLeaveDo();
         BeanUtils.copyProperties(processInstanceTopVo, chuanyunAskForLeaveDo);
-        List<OapiProcessinstanceGetResponse.FormComponentValueVo> formComponetList = processInstanceTopVo.getFormComponentValues();
-        if(formComponetList != null && formComponetList.size() > 0) {
-            for(int i = 0; i < formComponetList.size(); i++) {
-                if(formComponetList.get(i).getName().equals("请假事由")) {
-                    chuanyunAskForLeaveDo.setLeaveType(formComponetList.get(i).getValue());
+        List<OapiProcessinstanceGetResponse.FormComponentValueVo> formComponentList = processInstanceTopVo.getFormComponentValues();
+        if(formComponentList != null && formComponentList.size() > 0) {
+            for (OapiProcessinstanceGetResponse.FormComponentValueVo formComponentValueVo : formComponentList) {
+                if ("请假事由".equals(formComponentValueVo.getName())) {
+                    chuanyunAskForLeaveDo.setLeaveType(formComponentValueVo.getValue());
                 }
-                if(formComponetList.get(i).getName().equals("劳动合同所属公司")) {
-                    chuanyunAskForLeaveDo.setContractOwnerLtd(formComponetList.get(i).getValue());
+                if ("劳动合同所属公司".equals(formComponentValueVo.getName())) {
+                    chuanyunAskForLeaveDo.setContractOwnerLtd(formComponentValueVo.getValue());
                 }
             }
         }

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

@@ -97,7 +97,7 @@ public class ChuanyunBasicDataScheduledTask {
      */
     @Scheduled(fixedDelay = 3600000L)
     private void getDataFromChuanyun() {
-        saveAskForLeave();
+//        saveAskForLeave();
         //专项费用分摊
         getSpecialProcedure();
         //获取人员-归属公司信息
@@ -364,7 +364,7 @@ public class ChuanyunBasicDataScheduledTask {
                             chuanyunSaveDTO = chuanYunManager.update(ChuanyunProjectCashFlowDO.SCHEMA_CODE,chuanyunProjectCashFlowDO.getObjectId(),purcostString);
                         }
                         if(chuanyunSaveDTO.getSuccessful()){
-                            log.info("新增项目收付款成功");
+//                            log.info("新增项目收付款成功");
                         }else{
                             log.warn("新增项目收付款失败");
                         }
@@ -408,7 +408,7 @@ public class ChuanyunBasicDataScheduledTask {
                         chuanyunSaveDTO = chuanYunManager.update(ChuanyunAskForLeaveDo.SCHEMA_CODE,askForLeave.getObjectId(),purcostString);
                     }
                     if(chuanyunSaveDTO.getSuccessful()){
-                        log.info("新增请假信息成功");
+//                        log.info("新增请假信息成功");
                     }else{
                         log.warn("新增请假信息失败");
                     }

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

@@ -68,7 +68,7 @@ public class ChuanyunHumanResourceScheduledTask {
         List<String> matchersString=new ArrayList<>();
         //由于需要统计流程中的日志，在日志数据同步时将状态为2的数据一并统计
 //        matchersString.add("Status_2,1");
-        matchersString.add("Status_6,[1,2]");
+        matchersString.add("Status_6,[1;2]");
         while (flag) {
             try {
                 //从氚云查询数据

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

@@ -426,6 +426,7 @@ public class ChuanyunProjectScheduledTask {
                     chuanyunSelfWorkHourDTO.setDayLogDate(self.getDayLogDate());
                     chuanyunSelfWorkHourDTO.setProjectType(self.getProjectType());
                     chuanyunSelfWorkHourDTO.setStatus(self.getStatus());
+                    chuanyunSelfWorkHourDTO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
                     chuanyunSelfWorkHourDTO.setStandardWorkHour(chuanyunSelfWorkHourDO.getStandardWorkHour());
                     List<String> matchers = new ArrayList<>();
                     matchers.add("F0000001_2,"+self.getProjectId());
@@ -509,6 +510,7 @@ public class ChuanyunProjectScheduledTask {
             chuanyunMemberMonthCostDTO.setMonthWorkHour(monthHour.getStandardWorkHour());
             chuanyunMemberMonthCostDTO.setDayLogDate(projectMonth.getDayLogDate().withDayOfMonth(1));
             chuanyunMemberMonthCostDTO.setWorkHour(projectMonth.getStandardWorkHour());
+            chuanyunMemberMonthCostDTO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
             try {
                 List<String> matchers = new ArrayList<>();
                 matchers.add("F0000003_2,"+projectMonth.getProjectId());
@@ -590,6 +592,12 @@ class ChuanyunMemberMonthCostDTO{
      */
     @JsonProperty("F0000007")
     private BigDecimal monthWorkHour;
+
+    /**
+     * 部门Id
+     */
+    @JsonProperty("F0000010")
+    private String departmentId;
 }
 
 @Data
@@ -751,5 +759,11 @@ class ChuanyunSelfWorkHourDTO {
 
     @JsonProperty("F0000004")
     private BigDecimal standardWorkHour;
+
+    /**
+     * 部门Id
+     */
+    @JsonProperty("F0000007")
+    private String departmentId;
 }