Browse Source

修复编辑报告附件、图片异常问题

fuyuchuan 3 weeks ago
parent
commit
3261849176

+ 4 - 3
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java

@@ -421,13 +421,14 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 }
             } else {
                 rp.setId(rid);
-                rp.setCcTo(ccTo);
                 rp.setCoordinateWork(pmWorkReport.getCoordinateWork());
                 rp.setTomorrowPlan(pmWorkReport.getTomorrowPlan());
                 rp.setUpdateBy(userName);
                 rp.setUpdateTime(dateTime);
+                rp.setTotalHours(totalWorkTime);
                 rp.setIsRegularlySend(pmWorkReport.getIsRegularlySend());
-                rp.setSendDingTalk(pmWorkReport.getSendDingTalk());
+                rp.setReportFile(pmWorkReport.getReportFile());
+                rp.setReportImage(pmWorkReport.getReportImage());
                 pmWorkReportMapper.updateById(rp);
 
                 pmWorkContentService.deleteContent(rid);
@@ -759,7 +760,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 .eq(SysUser::getStatus, 0)
                 .eq(SysUser::getDelFlag, 0)
                 .notIn(!userIds.isEmpty(), SysUser::getUserId, userIds);
-        userIds =  sysUserMapper.selectList(userQueryWrapper).stream().map(SysUser::getUserId).collect(Collectors.toList());
+        userIds = sysUserMapper.selectList(userQueryWrapper).stream().map(SysUser::getUserId).collect(Collectors.toList());
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("infoTitle", INFO_TITLE);