Selaa lähdekoodia

1.修改项目周工时汇总

WoNiu 4 vuotta sitten
vanhempi
commit
77fb24a176

+ 7 - 1
src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunProjectMemberWeekHourDO.java

@@ -18,7 +18,7 @@ public class ChuanyunProjectMemberWeekHourDO extends BasicDO{
     /**
      * 表名
      */
-    public static final String SCHEMA_CODE ="D001789Sppe58rql3jvql2id9ocyccoz1";
+    public static final String SCHEMA_CODE ="D001789Sffuni6ej7u55hkaw0xwj9nh22";
 
     /**
      * 项目ID
@@ -55,4 +55,10 @@ public class ChuanyunProjectMemberWeekHourDO extends BasicDO{
      */
     @JsonProperty("F0000006")
     private String week;
+
+    /**
+     * 流程状态
+     */
+    @JsonProperty("F0000007")
+    private String status;
 }

+ 4 - 0
src/main/java/com/galaxis/manatee/task/ChuanyunProjectScheduledTask.java

@@ -335,6 +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());
                    List<String> matchers = new ArrayList<>();
                    matchers.add("F0000001_2,"+chuanyunWeekMemberHourDO.getProjectId());
                    matchers.add("F0000002_2,"+chuanyunWeekMemberHourDO.getUserId());
@@ -779,6 +780,9 @@ class ChuanyunProjectMemberWeekHourDTO{
 
     @JsonProperty("F0000006")
     private String week;
+
+    @JsonProperty("F0000007")
+    private String status;
 }
 
 /**