项目列表分页添加reportId参数

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

@@ -56,8 +56,9 @@ public class PmProjectController {
                                                      @RequestParam(value = "projectStatus", required = false, defaultValue = "0") Integer projectStatus,
                                                      @RequestParam(value = "projectAscription", required = false, defaultValue = "0") Integer projectAscription,
                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(pmProjectService.projectList(projectName, projectType, projectStatus, projectAscription, pageNum, pageSize));
+                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value = "projectId", required = false)Integer projectId) {
+        return ApiResult.success(pmProjectService.projectList(projectName, projectType, projectStatus, projectAscription, pageNum, pageSize, projectId));
     }
 
     /**

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

@@ -45,7 +45,7 @@ public interface PmProjectService extends CrudService<PmProject> {
      * @param pageSize          页大小
      * @return
      */
-    CommonPage<PmProject> projectList(String projectName, Integer projectType, Integer projectStatus, Integer projectAscription, Integer pageNum, Integer pageSize);
+    CommonPage<PmProject> projectList(String projectName, Integer projectType, Integer projectStatus, Integer projectAscription, Integer pageNum, Integer pageSize, Integer projectId);
 
     /**
      * 查询项目名

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

@@ -120,20 +120,24 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
      * 分页
      *
      * @param projectName       项目名
-     * @param projectType       类型
-     * @param projectStatus     状态
-     * @param projectAscription 项目归属类型
+     * @param projectType       类型(1：人力外包，2：项目研发，3：采购项目，4：过标项目，5：集成项目，6：其他)
+     * @param projectStatus     状态(1：未开始；2；进行中；3：已完成；4：已暂停；5：已作废)
+     * @param projectAscription 项目归属类型(0:全部；1：我负责；2：我参与)
      * @param pageNum           页码
      * @param pageSize          页大小
+     * @param projectId         项目id
      * @return
      */
     @Override
-    public CommonPage<PmProject> projectList(String projectName, Integer projectType, Integer projectStatus, Integer projectAscription, Integer pageNum, Integer pageSize) {
+    public CommonPage<PmProject> projectList(String projectName, Integer projectType, Integer projectStatus, Integer projectAscription, Integer pageNum, Integer pageSize, Integer projectId) {
         IPage<PmProject> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<PmProject> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(PmProject::getTenantId, SecurityUtils.getTenantId())
-                .eq(PmProject::getDelFlag, 0)
-                .orderByDesc(PmProject::getCreateTime);
+        lambdaQuery.eq(PmProject::getTenantId, SecurityUtils.getTenantId()).eq(PmProject::getDelFlag, 0);
+        if (projectId != null && projectId!= 0){
+            lambdaQuery.eq(PmProject::getId, projectId);
+            page = this.page(page, lambdaQuery);
+            return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+        }
         if (projectAscription == 0) {
             lambdaQuery.and(q -> q.eq(PmProject::getProjectHead, SecurityUtils.getUserId())
                     .or().apply("FIND_IN_SET('" + SecurityUtils.getUserId() + "', project_member) > 0")
@@ -152,6 +156,7 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         if (projectStatus != 0) {
             lambdaQuery.eq(PmProject::getProjectStatus, projectStatus);
         }
+        lambdaQuery.orderByDesc(PmProject::getCreateTime);
         page = this.page(page, lambdaQuery);
         if (page.getRecords() == null || page.getRecords().isEmpty()) {
             return new CommonPage<>(Collections.emptyList(), 0, pageSize, pageNum);
@@ -219,10 +224,10 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         List<SysUser> userList = new ArrayList<>();
         if (userId != null) {
             LambdaQueryWrapper<SysUser> queryNameId = Wrappers.lambdaQuery();
-            queryNameId.select(SysUser::getUserId,SysUser::getNickName)
+            queryNameId.select(SysUser::getUserId, SysUser::getNickName)
                     .eq(SysUser::getUserId, userId);
             userList = sysUserMapper.selectList(queryNameId);
-        }else{
+        } else {
             LambdaQueryWrapper<PmProject> wrapper = Wrappers.lambdaQuery();
             wrapper.select(PmProject::getProjectHead, PmProject::getProjectMember)
                     .eq(PmProject::getTenantId, SecurityUtils.getTenantId())
@@ -295,10 +300,10 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
     }
 
     @Override
-    public void exitProject(Integer projectId){
+    public void exitProject(Integer projectId) {
         Long userId = SecurityUtils.getUserId();
         PmProject project = pmProjectMapper.selectById(projectId);
-        String projectMember =  project.getProjectMember();
+        String projectMember = project.getProjectMember();
         String[] parts = projectMember.split(",");
         String result = String.join(",", java.util.stream.Stream.of(parts)
                 .filter(part -> !part.equals(String.valueOf(userId)))