修改删除项目接口请求方式（因影响前端此次先不修改）；修复工作报告调用消息中心未传入’userName‘问题；优化部分代码

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/PmProjectController.java

@@ -89,7 +89,7 @@ public class PmProjectController {
      *
      * @param projectId 项目id
      */
-    @DeleteMapping("/del")
+    @GetMapping("/del")
     public void del(@RequestParam Integer projectId) {
         pmProjectService.delProject(projectId);
     }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/DingTalkAndMessage.java

@@ -276,6 +276,7 @@ public class DingTalkAndMessage {
         jsonObject.put("infoType", INFO_TYPE);
         jsonObject.put("id", newReport.getId());
         jsonObject.put("infoTypeName", INFO_TITLE);
+        jsonObject.put("userName", newReport.getCreateBy());
         if (userId != null && !userId.isEmpty()) {
             jsonObject.put("userIds", userId);
         }

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

@@ -56,6 +56,13 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
     @Autowired
     private PmProjectMapper pmProjectMapper;
 
+    /**
+     * @description: 删除报告内容
+     * @author: fu
+     * @date: 2024/8/7 17:48
+     * @param: [reportId]
+     * @return: void
+     **/
     @Override
     public void deleteContent(Integer reportId) {
         LambdaQueryWrapper<PmWorkContent> deleteWrapper = Wrappers.lambdaQuery();
@@ -112,8 +119,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
                 .eq(PmWorkReport::getTenantId, tenantId)
                 .apply("FIND_IN_SET(" + userId + ", cc_to) > 0")
                 .orderByDesc(PmWorkReport::getReportDate);
-        List<PmWorkReport> reportIds = pmWorkReportMapper.selectList(reportQuery);
-        return reportIds.stream().map(PmWorkReport::getId).collect(Collectors.toList());
+        return pmWorkReportMapper.selectList(reportQuery).stream().map(PmWorkReport::getId).collect(Collectors.toList());
     }
 
     /**
@@ -129,12 +135,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         reportQuery.select(PmWorkReport::getId)
                 .eq(PmWorkReport::getSubmitterId, userid)
                 .orderByDesc(PmWorkReport::getSubmitDate);
-        List<PmWorkReport> reportIds = pmWorkReportMapper.selectList(reportQuery);
-        List<Integer> rIds = new ArrayList<>();
-        for (PmWorkReport report : reportIds) {
-            rIds.add(report.getId());
-        }
-        return rIds;
+        return  pmWorkReportMapper.selectList(reportQuery).stream().map(PmWorkReport::getId).collect(Collectors.toList());
     }
 
     /**
@@ -151,12 +152,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         projectQuery.select(PmProject::getId)
                 .eq(PmProject::getTenantId, tenantId)
                 .eq(PmProject::getProjectHead, userId);
-        List<PmProject> projectIds = pmProjectMapper.selectList(projectQuery);
-        List<Integer> rIds = new ArrayList<>();
-        for (PmProject project : projectIds) {
-            rIds.add(project.getId());
-        }
-        return rIds;
+        return pmProjectMapper.selectList(projectQuery).stream().map(PmProject::getId).collect(Collectors.toList());
     }
 
     /**
@@ -279,15 +275,16 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         List<PmWorkReport> reportList2 = new ArrayList<>();
         List<PmWorkContent> pmWorkContentList = new ArrayList<>();
         List<Long> userIds = new ArrayList<>();
-        if (reportId != null && reportId != 0) {
+        if (reportId != null && reportId > 0) {
             LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
             reportQuery.select(PmWorkReport::getId, PmWorkReport::getCoordinateWork, PmWorkReport::getTomorrowPlan, PmWorkReport::getCcTo, PmWorkReport::getSubmitterId,
                             PmWorkReport::getCreateTime, PmWorkReport::getReportDate)
                     .eq(PmWorkReport::getId, reportId);
             PmWorkReport report = pmWorkReportMapper.selectOne(reportQuery);
             if (report == null) {
-                throw new BusinessException("报告已经不存在了哟");
+                throw new BusinessException("该报告已被删除！");
             }
+
             LambdaQueryWrapper<PmWorkContent> contentQuery = Wrappers.lambdaQuery();
             contentQuery.select(PmWorkContent::getWorkContent, PmWorkContent::getWorkTime, PmWorkContent::getProjectName)
                     .eq(PmWorkContent::getReportId, reportId);
@@ -463,6 +460,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             // endDateTime = end.atTime(23, 59, 59);
             LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
             reportQuery.select(PmWorkReport::getId)
+                    .eq(PmWorkReport::getReportStatus, 1)
                     .between(PmWorkReport::getReportDate, start, end);
             reportIds = pmWorkReportMapper.selectList(reportQuery).stream().map(PmWorkReport::getId).collect(Collectors.toList());
         }
@@ -480,7 +478,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         Long userId = SecurityUtils.getUserId();
         List<Long> userIds = new ArrayList<>();
         List<Integer> receiveList = receive();
-        if (receiveList.isEmpty()) {
+        if (receiveList.isEmpty() && projectAscription == 2) {
             return returnPage;
         }
 
@@ -574,7 +572,6 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             }
         }
 
-
         // 已读未读数量查询
         List<PmReceive> receives = receives(receiveList);
         List<Long> uId = new ArrayList<>();
@@ -583,7 +580,6 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             uId.add(receiverId);
         }
 
-
         Set<Long> userIdSet = new HashSet<>();
         for (PmWorkReport report : reportList) {
             Long submitterId = report.getSubmitterId();