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

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

@@ -135,7 +135,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         // 固定返回七条数据，没有内容也要设置时间给前端渲染
         LambdaQueryWrapper<PmWorkReport> queryWrapperR = Wrappers.lambdaQuery();
         queryWrapperR.eq(PmWorkReport::getTenantId, tenantId)
-    .eq(PmWorkReport::getSubmitterId, userId)
+                .eq(PmWorkReport::getSubmitterId, userId)
                 .between(reportId == 0, PmWorkReport::getReportDate, startDate1, endDate1)
                 .eq(reportId != 0, PmWorkReport::getId, reportId)
                 .orderByAsc(PmWorkReport::getReportDate);

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

@@ -656,9 +656,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                     receiveMessages(report.getCcTo(), report.getId());
                 } catch (Exception e) {
                     log.error("定时报告" + report.getId() + "更新状态异常" + e);
-                } finally {
-                    // 更新状态为2：发送异常
-                    report.setReportStatus(2);
+                    report.setReportStatus(1);
                     report.setSubmitDate(time);
                     pmWorkReportMapper.updateById(report);
                 }