Merge branch 'server-165' of uskycloud/usky-modules into master

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

@@ -381,18 +381,25 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 .map(Long::parseLong)
                 .collect(Collectors.toList());
         List<SysUser> users = pmWorkContentService.nickNames(longList);
+
+        LambdaQueryWrapper<PmWorkReport> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(PmWorkReport::getCreateBy)
+                .eq(PmWorkReport::getId, reportId);
+        PmWorkReport pmWorkReport = pmWorkReportMapper.selectOne(queryWrapper);
+        String createBy = pmWorkReport.getCreateBy();
+
         if (longList.size() > 0) {
             for (Long id : longList) {
                 PmReceive pmReceive = new PmReceive();
                 pmReceive.setReceiverId(id);
                 pmReceive.setReportId(reportId);
-                pmReceive.setTenantId(SecurityUtils.getTenantId());
-                pmReceive.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-                pmReceive.setCreateBy(SecurityUtils.getUsername());
+                pmReceive.setCreateBy(createBy);
                 pmReceive.setCreateTime(LocalDateTime.now());
                 for (SysUser user : users) {
                     if (user.getUserId().equals(id)) {
                         pmReceive.setReceiverName(user.getUserName());
+                        pmReceive.setDeptId(user.getDeptId());
+                        pmReceive.setTenantId(user.getTenantId());
                     }
                 }
                 pmReceive.setReadFlag(0);
@@ -503,7 +510,6 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
      * @param: [time] 开始时间
      * @return: void
      **/
-    @Transactional
     @Override
     public void timedSending(LocalDateTime time) {
         log.info("定时报告任务开始---------------------------");
@@ -543,9 +549,18 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                     }
                 }
 
-                report.setReportStatus(1);
-                pmWorkReportMapper.updateById(report);
-                receiveMessages(report.getCcTo(), report.getId());
+                try {
+                    report.setReportStatus(1);
+                    report.setSubmitDate(time);
+                    pmWorkReportMapper.updateById(report);
+                    receiveMessages(report.getCcTo(), report.getId());
+                } catch (Exception e) {
+                    log.error("定时报告" + report.getId() + "更新状态异常" + e);
+                } finally {
+                    report.setReportStatus(1);
+                    report.setSubmitDate(time);
+                    pmWorkReportMapper.updateById(report);
+                }
             }
         } else {
             log.info("当前没有定时工作报告可发送");