修改删除项目接口请求方式（get→delete）；报告记录查询逻辑优化：添加提交时间倒叙；优化删除报告代码

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
      */
-    @GetMapping("/del")
+    @DeleteMapping("/del")
     public void del(@RequestParam Integer projectId) {
         pmProjectService.delProject(projectId);
     }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.domain.R;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
@@ -109,7 +110,8 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
         reportQuery.select(PmWorkReport::getId)
                 .eq(PmWorkReport::getTenantId, tenantId)
-                .apply("FIND_IN_SET(" + userId + ", cc_to) > 0");
+                .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());
     }
@@ -123,11 +125,10 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
      **/
     private List<Integer> sentOut() {
         Long userid = SecurityUtils.getUserId();
-        Integer tenantId = SecurityUtils.getTenantId();
         LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
         reportQuery.select(PmWorkReport::getId)
-                .eq(PmWorkReport::getTenantId, tenantId)
-                .eq(PmWorkReport::getSubmitterId, userid);
+                .eq(PmWorkReport::getSubmitterId, userid)
+                .orderByDesc(PmWorkReport::getSubmitDate);
         List<PmWorkReport> reportIds = pmWorkReportMapper.selectList(reportQuery);
         List<Integer> rIds = new ArrayList<>();
         for (PmWorkReport report : reportIds) {
@@ -444,8 +445,8 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
      **/
     @Override
     public CommonPage<PmWorkReport> reportPage(Integer projectAscription, Integer pageNum, Integer pageSize, Integer reportId, String startDate, String endDate, Integer projectId) {
-        LocalDateTime startDateTime = null;
-        LocalDateTime endDateTime = null;
+        // LocalDateTime startDateTime = null;
+        // LocalDateTime endDateTime = null;
         LocalDate start = null;
         LocalDate end = null;
         List<Integer> reportIds = new ArrayList<>();
@@ -474,7 +475,8 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         }
 
         CommonPage<PmWorkReport> returnPage = new CommonPage<>(new ArrayList<>(), 0, pageSize, pageNum);
-        Integer tenantId = SecurityUtils.getTenantId();
+        List<PmWorkContent> pmWorkContentList = new ArrayList<>();
+        // Integer tenantId = SecurityUtils.getTenantId();
         Long userId = SecurityUtils.getUserId();
         List<Long> userIds = new ArrayList<>();
         List<Integer> receiveList = receive();
@@ -484,8 +486,12 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
 
         LambdaQueryWrapper<PmWorkContent> contentLambdaQuery = Wrappers.lambdaQuery();
         contentLambdaQuery.select(PmWorkContent::getReportId, PmWorkContent::getWorkContent, PmWorkContent::getWorkTime, PmWorkContent::getProjectName);
-        if (reportId != null && reportId > 0) {
+        if (reportId != null && reportId >= 0) {
             contentLambdaQuery.eq(PmWorkContent::getReportId, reportId);
+            pmWorkContentList = pmWorkContentMapper.selectList(contentLambdaQuery);
+            if (pmWorkContentList.isEmpty()) {
+                throw new BusinessException("该报告已被删除!");
+            }
         } else {
             switch (projectAscription) {
                 case 1:
@@ -511,14 +517,12 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             if (!reportIds.isEmpty()) {
                 contentLambdaQuery.in(PmWorkContent::getReportId, reportIds);
             }
-        }
-        List<PmWorkContent> pmWorkContentList = pmWorkContentMapper.selectList(contentLambdaQuery);
-        if (pmWorkContentList.isEmpty()) {
-            if (reportId != null && reportId > 0) {
-                throw new BusinessException("该报告已被删除！");
+            pmWorkContentList = pmWorkContentMapper.selectList(contentLambdaQuery);
+            if (pmWorkContentList.isEmpty()) {
+                return returnPage;
             }
-            return returnPage;
         }
+
         List<Integer> reportIds2 = pmWorkContentList.stream().distinct().map(PmWorkContent::getReportId).collect(Collectors.toList());
 
         LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
@@ -529,7 +533,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             reportQuery.eq(PmWorkReport::getId, reportId);
         } else {
             reportQuery.in(PmWorkReport::getId, reportIds2)
-                    .orderByDesc(PmWorkReport::getCreateTime);
+                    .orderByDesc(PmWorkReport::getSubmitDate);
         }
         IPage<PmWorkReport> reportPage = pmWorkReportMapper.selectPage(new Page<>(pageNum, pageSize), reportQuery);
         List<PmWorkReport> reportList = reportPage.getRecords();