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

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

@@ -331,11 +331,11 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
             rp.setTotalHours(totalWorkTime);
             rp.setIsRegularlySend(pmWorkReport.getIsRegularlySend());
             if (pmWorkReport.getReportStatus().equals(0) && pmWorkReport.getIsRegularlySend().equals(1)) {
-                    if (timingTime != null && timingTime.isAfter(currentTimePlusMinutes)) {
-                        rp.setTimingTime(timingTime);
-                    } else {
-                        throw new BusinessException("定时发送支持选中5分钟后的时间，请重新选择时间！");
-                    }
+                if (timingTime != null && timingTime.isAfter(currentTimePlusMinutes)) {
+                    rp.setTimingTime(timingTime);
+                } else {
+                    throw new BusinessException("定时发送支持选中5分钟后的时间，请重新选择时间！");
+                }
             }
             rp.setSendDingTalk(pmWorkReport.getSendDingTalk());
             pmWorkReportMapper.updateById(rp);
@@ -360,10 +360,11 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 pmWorkContentMapper.insert(e);
                 contentsList.add(e);
             }
-            if (pmWorkReport.getSendDingTalk().equals(1) && pmWorkReport.getIsRegularlySend() == 0) {
+            if (pmWorkReport.getSendDingTalk().equals(1) && pmWorkReport.getReportStatus().equals(1)) {
                 dingTalkAndMessage.sendDingTalkDailyReport(rp, contentsList);
+
             }
-            if (pmWorkReport.getIsRegularlySend() == 0){
+            if (pmWorkReport.getIsRegularlySend() == 0) {
                 receiveMessages(ccTo, rid);
                 rp.setTimingTime(null);
                 rp.setReportStatus(1);
@@ -373,7 +374,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
     }
 
     private void receiveMessages(String ids, Integer reportId) {
-        if (StringUtils.isBlank(ids)){
+        if (StringUtils.isBlank(ids)) {
             return;
         }
         List<Long> longList = Arrays.stream(ids.split(","))