项目列表bug修改

项目添加项目耗时字段

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -272,4 +272,15 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @Date 2022/1/4 16:45
 	 */
 	List<ApprovaledListResultDTO> getGridMemberProjectList(@Param("agencyId") String agencyId, @Param("staffId") String staffId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	/**
+	 * 获取项目列表，用来计算项目耗时
+	 * @Param customerId
+	 * @Param projectId
+	 * @Param status
+	 * @Return {@link List< ProjectEntity>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/12 17:05
+	 */
+	List<ProjectEntity> getProjectListForWorkMinutes(@Param("customerId")String customerId, @Param("projectId")String projectId, @Param("status")String status);
 }

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

@@ -18,7 +18,6 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -59,6 +58,7 @@ import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.*;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.base.Joiner;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -3079,11 +3079,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			pageNo = pageNo + NumConstant.ONE;
 			PageHelper.startPage(pageNo, PageSize);
 			//获取项目列表
-			LambdaQueryWrapper<ProjectEntity> wrapper = new LambdaQueryWrapper<>();
-			wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), ProjectEntity::getCustomerId, dto.getCustomerId());
-			wrapper.eq(StringUtils.isNotBlank(dto.getId()), ProjectEntity::getId, dto.getId());
-			wrapper.eq(StringUtils.isNotBlank(dto.getStatus()), ProjectEntity::getStatus, dto.getStatus());
-			list = baseDao.selectList(wrapper);
+			list = baseDao.getProjectListForWorkMinutes(dto.getCustomerId(), dto.getId(), dto.getStatus());;
 			if (CollectionUtils.isNotEmpty(list)) {
 				//提取项目ID，创建时间，更新时间
 				List<TimestampIntervalFormDTO> intervalList = list.stream().map(item -> {

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

@@ -506,4 +506,26 @@
             </if>
         ORDER BY CREATED_TIME DESC
     </select>
+    <select id="getProjectListForWorkMinutes" resultType="com.epmet.entity.ProjectEntity">
+        SELECT
+            a.ID,
+            a.`STATUS`,
+            a.CREATED_TIME,
+            b.CREATED_TIME AS "updatedTime"
+        FROM
+            project a
+            LEFT JOIN project_process b ON a.ID = b.PROJECT_ID
+            AND b.OPERATION = 'close'
+        WHERE
+            a.DEL_FLAG = '0'
+        <if test="customerId != null and customerId != ''">
+            AND a.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="projectId != null and projectId != ''">
+            AND a.ID = #{projectId}
+        </if>
+        <if test="status != null and status != ''">
+            AND a.`STATUS` = #{status}
+        </if>
+    </select>
 </mapper>