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

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

@@ -4,17 +4,11 @@ package com.usky.iot.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.iot.domain.PmWorkContent;
 import com.usky.iot.service.PmWorkContentService;
-import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -28,6 +22,20 @@ import java.util.List;
 @RestController
 @RequestMapping("/pmWorkContent")
 public class PmWorkContentController {
+    @Autowired
+    private PmWorkContentService pmWorkContentService;
+
+    @GetMapping("/projectName")
+    public ApiResult<List<PmWorkContent>> pageList(@RequestParam(value = "startDate", required = false) String startDate,
+                                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                                   @RequestParam(value = "projectName", required = false) String projectName,
+                                                   @RequestParam(value = "projectAscription", required = false, defaultValue = "1") Integer projectAscription) {
+        if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)) {
+            startDate = LocalDate.now().toString();
+            endDate = LocalDate.now().toString();
+        }
+        return ApiResult.success(pmWorkContentService.projectQuery(startDate, endDate, projectName, projectAscription));
+    }
 
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/PmWorkContentService.java

@@ -17,7 +17,21 @@ import java.util.List;
  */
 public interface PmWorkContentService extends CrudService<PmWorkContent> {
 
+    /**
+     * 清空报告内容
+     * @param reportId 报告id
+     */
     void deleteContent(Integer reportId);
 
+    /**
+     * 报告记录中查询项目名与id
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @param projectName 项目名
+     * @param projectAscription 查询标识（1：我负责的；2：抄送我的）
+     * @return
+     */
+    List<PmWorkContent> projectQuery(String startDate, String endDate, String projectName, Integer projectAscription);
+
 
 }

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

@@ -9,7 +9,6 @@ import com.usky.common.core.exception.BusinessException;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.PmProject;
 import com.usky.iot.domain.PmWorkContent;
-import com.usky.iot.domain.PmWorkReport;
 import com.usky.iot.mapper.PmProjectMapper;
 import com.usky.iot.mapper.PmWorkContentMapper;
 import com.usky.iot.service.PmProjectService;
@@ -17,6 +16,7 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -128,8 +128,8 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
                 .orderByDesc(PmProject::getCreateTime);
         if (projectAscription == 0) {
             lambdaQuery.and(q -> q.eq(PmProject::getProjectHead, SecurityUtils.getUserId())
-                            .or().apply("FIND_IN_SET('" + SecurityUtils.getUserId() + "', project_member) > 0")
-                            .or().eq(PmProject::getCreateBy, SecurityUtils.getUsername()));
+                    .or().apply("FIND_IN_SET('" + SecurityUtils.getUserId() + "', project_member) > 0")
+                    .or().eq(PmProject::getCreateBy, SecurityUtils.getUsername()));
         } else if (projectAscription == 1) {
             lambdaQuery.eq(PmProject::getProjectHead, SecurityUtils.getUserId());
         } else if (projectAscription == 2) {
@@ -176,7 +176,7 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         lambdaQuery.eq(PmProject::getTenantId, SecurityUtils.getTenantId())
                 .and(q -> q.eq(PmProject::getProjectHead, SecurityUtils.getUserId())
                         .or().apply("FIND_IN_SET('" + SecurityUtils.getUserId() + "', project_member) > 0")
-                .or().eq(PmProject::getCreateBy, SecurityUtils.getUsername()))
+                        .or().eq(PmProject::getCreateBy, SecurityUtils.getUsername()))
                 .eq(PmProject::getDelFlag, 0);
         Integer all = this.count(lambdaQuery);
 

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

@@ -2,14 +2,16 @@ package com.usky.iot.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.PmWorkContent;
 import com.usky.iot.mapper.PmWorkContentMapper;
 import com.usky.iot.service.PmWorkContentService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,7 +28,30 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
     @Override
     public void deleteContent(Integer reportId) {
         LambdaQueryWrapper<PmWorkContent> deleteWrapper = Wrappers.lambdaQuery();
-        deleteWrapper.eq(PmWorkContent::getReportId,reportId);
+        deleteWrapper.eq(PmWorkContent::getReportId, reportId);
         baseMapper.delete(deleteWrapper);
     }
+
+    @Override
+    public List<PmWorkContent> projectQuery(String startDate, String endDate, String projectName, Integer projectAscription) {
+        LocalDate start = LocalDate.parse(startDate);
+        LocalDate end = LocalDate.parse(endDate);
+        String subQueryReports = "SELECT id FROM pm_work_report WHERE report_date BETWEEN '" + start + "' AND '" + end + "'";
+        String subQueryReport = "SELECT id FROM pm_work_report WHERE FIND_IN_SET('" + SecurityUtils.getUserId() + "', cc_to) > 0";
+        String subQueryProjects = "SELECT id FROM pm_project WHERE project_head = " + SecurityUtils.getUserId();
+        LambdaQueryWrapper<PmWorkContent> contentLambdaQuery = Wrappers.lambdaQuery();
+        contentLambdaQuery.select(PmWorkContent::getProjectId, PmWorkContent::getProjectName)
+                .inSql(PmWorkContent::getReportId, subQueryReports);
+        if (StringUtils.isNotBlank(projectName)) {
+            contentLambdaQuery.like(PmWorkContent::getProjectName, projectName);
+        }
+        if (projectAscription == 1) {
+            contentLambdaQuery.inSql(PmWorkContent::getProjectId, subQueryProjects);
+        } else if (projectAscription == 2) {
+            contentLambdaQuery.inSql(PmWorkContent::getReportId, subQueryReport);
+        }
+        contentLambdaQuery.groupBy(PmWorkContent::getProjectId, PmWorkContent::getProjectName);
+        List<PmWorkContent> pmWorkContentList = this.list(contentLambdaQuery);
+        return pmWorkContentList;
+    }
 }