|
@@ -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;
|
|
|
}
|
|
|
|
|
|
/**
|