|
@@ -570,7 +570,7 @@ public class ChuanyunProjectScheduledTask {
|
|
|
page += 1;
|
|
|
updateList.forEach(chuanyunSelfWorkHourDO -> {
|
|
|
try{
|
|
|
- String departmentId=chuanyunUserCompanyDao.findByUserId(chuanyunSelfWorkHourDO.getUserId()).getDepartmentId();
|
|
|
+ String departmentId=chuanyunUserCompanyDao.findAllByUserId(chuanyunSelfWorkHourDO.getUserId()).get(0).getDepartmentId();
|
|
|
ChuanyunSelfWorkHourDTO chuanyunSelfWorkHourDTO = new ChuanyunSelfWorkHourDTO();
|
|
|
BeanUtils.copyProperties(chuanyunSelfWorkHourDO,chuanyunSelfWorkHourDTO);
|
|
|
chuanyunSelfWorkHourDTO.setDepartmentId(departmentId);
|
|
@@ -625,6 +625,7 @@ public class ChuanyunProjectScheduledTask {
|
|
|
updateList.getContent().forEach(chuanyunWeekMemberHourDO -> {
|
|
|
//更新氚云
|
|
|
try {
|
|
|
+ String departmentId=chuanyunUserCompanyDao.findAllByUserId(chuanyunWeekMemberHourDO.getUserId()).get(0).getDepartmentId();
|
|
|
BigDecimal standard = new BigDecimal(8);
|
|
|
ChuanyunProjectMemberWeekHourDTO chuanyunProjectMemberWeekHourDTO = new ChuanyunProjectMemberWeekHourDTO();
|
|
|
chuanyunProjectMemberWeekHourDTO.setProjectId(chuanyunWeekMemberHourDO.getProjectId());
|
|
@@ -635,6 +636,7 @@ public class ChuanyunProjectScheduledTask {
|
|
|
chuanyunProjectMemberWeekHourDTO.setPersonDays(chuanyunWeekMemberHourDO.getStandardWorkHour().divide(standard,2,RoundingMode.HALF_UP));
|
|
|
chuanyunProjectMemberWeekHourDTO.setHourStatus(chuanyunWeekMemberHourDO.getStatus());
|
|
|
chuanyunProjectMemberWeekHourDTO.setYear(chuanyunProjectMemberWeekHourDTO.getYear());
|
|
|
+ chuanyunProjectMemberWeekHourDTO.setDepartmentId(departmentId);
|
|
|
|
|
|
List<String> matchers = new ArrayList<>();
|
|
|
matchers.add("F0000001_2,"+chuanyunWeekMemberHourDO.getProjectId());
|
|
@@ -866,6 +868,12 @@ class ChuanyunProjectMemberWeekHourDTO{
|
|
|
|
|
|
@JsonProperty("F0000007")
|
|
|
private String hourStatus;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 部门信息
|
|
|
+ */
|
|
|
+ @JsonProperty("F0000009")
|
|
|
+ private String departmentId;
|
|
|
}
|
|
|
|
|
|
/**
|