列表添加条件

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectManageListFormDTO.java

@@ -40,4 +40,8 @@ public class ProjectManageListFormDTO extends PageFormDTO implements Serializabl
     private String status;
 
     private String userId;
+
+    private String customerId;
+
+    private String agencyId;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -65,7 +66,10 @@ public class ProjectManageListResultDTO implements Serializable {
      */
     private List<String> departmentNameList;
 
+    @JsonIgnore
     private Date updatedTime;
+
+    @JsonIgnore
     private String isHandle;
 
     public ProjectManageListResultDTO() {

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -345,9 +345,10 @@ public class ProjectController {
      * @date 2022/5/17 14:19
      */
     @PostMapping("project-list")
-    public Result<PageData> projectList(@LoginUser TokenDto tokenDto,ProjectManageListFormDTO formDTO){
+    public Result<PageData> projectList(@LoginUser TokenDto tokenDto,@RequestBody ProjectManageListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, ProjectManageListFormDTO.ProjectManageListForm.class);
         formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<PageData>().ok(projectService.projectList(formDTO));
     }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -3183,6 +3183,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
     @Override
     public PageData<ProjectManageListResultDTO> projectList(ProjectManageListFormDTO formDTO) {
+		CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+		if (null == staffInfo){
+			throw new EpmetException("未查询到此工作人员信息"+formDTO.getUserId());
+		}
+		formDTO.setAgencyId(staffInfo.getAgencyId());
 		PageData<ProjectManageListResultDTO> result = new PageData<>(new ArrayList<>(),NumConstant.ZERO);
 		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
 		formDTO.setPageNo(pageIndex);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -575,18 +575,34 @@
             p.CREATED_TIME AS shiftProjectTime,
             ps.IS_HANDLE,
             ps.CREATED_TIME AS updatedTime,
-            t.* FROM
+            t.*
+        FROM
             (SELECT
-                 DISTINCT pp.PROJECT_ID,
-                          pp.INTERNAL_REMARK,
-                          pp.PUBLIC_REPLY AS projectScheme
+                  DISTINCT pp.PROJECT_ID,
+                  pp.INTERNAL_REMARK,
+                  pp.PUBLIC_REPLY AS projectScheme
              FROM project_process pp
              WHERE DEL_FLAG = '0'
                AND pp.STAFF_ID = #{userId}
+               AND pp.ORG_ID_PATH LIKE CONCAT('%',#{agencyId})
              ORDER BY pp.CREATED_TIME DESC) t
-                INNER JOIN project p ON p.ID = t.PROJECT_ID AND p.DEL_FLAG = '0'
-                LEFT JOIN project_staff ps ON ps.PROJECT_ID = t.PROJECT_ID AND ps.DEL_FLAG = '0'
+            INNER JOIN project p ON p.ID = t.PROJECT_ID AND p.DEL_FLAG = '0'
+            LEFT JOIN project_staff ps ON ps.PROJECT_ID = t.PROJECT_ID AND ps.DEL_FLAG = '0'
+        WHERE 1=1
+            <if test='null != title and title != "" '>
+                AND p.TITLE LIKE CONCAT('',#{title},'')
+            </if>
+            <if test='null != startDate and startDate != "" '>
+                AND DATE_FORMAT(p.CREATED_TIME,'%Y%m%d') >= #{startDate}
+            </if>
+            <if test='null != endDate and endDate != "" '>
+                AND DATE_FORMAT(p.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test='null != status and status != "all" '>
+                AND p.`STATUS` = #{status}
+            </if>
         GROUP BY t.PROJECT_ID
+        ORDER BY p.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>