1.修改项目周工时汇总

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

@@ -60,5 +60,5 @@ public class ChuanyunProjectMemberWeekHourDO extends BasicDO{
      * 流程状态
      */
     @JsonProperty("F0000007")
-    private String status;
+    private String hourStatus;
 }

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

@@ -335,7 +335,7 @@ public class ChuanyunProjectScheduledTask {
                    chuanyunProjectMemberWeekHourDTO.setProjectType(chuanyunWeekMemberHourDO.getProjectType());
                    chuanyunProjectMemberWeekHourDTO.setTotalHour(chuanyunWeekMemberHourDO.getStandardWorkHour());
                    chuanyunProjectMemberWeekHourDTO.setPersonDays(chuanyunWeekMemberHourDO.getStandardWorkHour().divide(standard,2,RoundingMode.HALF_UP));
-                   chuanyunProjectMemberWeekHourDTO.setStatus(chuanyunWeekMemberHourDO.getStatus());
+                   chuanyunProjectMemberWeekHourDTO.setHourStatus(chuanyunWeekMemberHourDO.getStatus());
                    List<String> matchers = new ArrayList<>();
                    matchers.add("F0000001_2,"+chuanyunWeekMemberHourDO.getProjectId());
                    matchers.add("F0000002_2,"+chuanyunWeekMemberHourDO.getUserId());
@@ -782,7 +782,7 @@ class ChuanyunProjectMemberWeekHourDTO{
     private String week;
 
     @JsonProperty("F0000007")
-    private String status;
+    private String hourStatus;
 }
 
 /**