syc 3 years ago
parent
commit
2c78a9e163
  1. 1
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java
  2. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  3. 2
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

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

@ -97,6 +97,7 @@ public class OrgProjectListResultDTO implements Serializable {
* 状态 处理中 pending已结案 closed * 状态 处理中 pending已结案 closed
*/ */
private String status; private String status;
private String statusValue;
/** /**
* 是否需要自己处理 true:需要 false:不需要 * 是否需要自己处理 true:需要 false:不需要
*/ */

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

@ -3518,7 +3518,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
dto.setImageUrl(imageUrl); dto.setImageUrl(imageUrl);
} }
//判断未结案项目是否涉及需要当前工作人员处理[列表查询需要,导出的不需要这段逻辑] //判断未结案项目是否涉及需要当前工作人员处理[列表查询需要,导出的不需要这段逻辑]
if (formDTO.getIsPage() && "pending".equals(dto.getStatus())) { if (formDTO.getIsPage() && "pending".equals(dto.getStatusValue())) {
//查询当前工作人员是否存在当前项目的未处理节点 //查询当前工作人员是否存在当前项目的未处理节点
ProjectStaffDTO projectStaff = projectStaffDao.selectLatestByProjectIdAndStaffId(dto.getProjectId(), formDTO.getUserId()); ProjectStaffDTO projectStaff = projectStaffDao.selectLatestByProjectIdAndStaffId(dto.getProjectId(), formDTO.getUserId());
if (null != projectStaff) { if (null != projectStaff) {

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

@ -632,6 +632,7 @@
<result property="createdTime" column="created_time"></result> <result property="createdTime" column="created_time"></result>
<result property="backGround" column="back_ground"></result> <result property="backGround" column="back_ground"></result>
<result property="status" column="status"></result> <result property="status" column="status"></result>
<result property="statusValue" column="statusValue"></result>
<result property="firstId" column="category_pids"></result> <result property="firstId" column="category_pids"></result>
<result property="secondId" column="category_id"></result> <result property="secondId" column="category_id"></result>
<result property="publicReply" column="public_reply"></result> <result property="publicReply" column="public_reply"></result>
@ -653,6 +654,7 @@
DATE_FORMAT(p.created_time, '%Y-%m-%d %H:%i:%s') AS created_time, DATE_FORMAT(p.created_time, '%Y-%m-%d %H:%i:%s') AS created_time,
p.back_ground, p.back_ground,
( CASE WHEN p.`STATUS` = 'pending' THEN '处理中' WHEN p.`STATUS` = 'closed' THEN '已结案' ELSE '' END ) AS status, ( CASE WHEN p.`STATUS` = 'pending' THEN '处理中' WHEN p.`STATUS` = 'closed' THEN '已结案' ELSE '' END ) AS status,
p.`status` AS statusValue,
pc.category_pids, pc.category_pids,
pc.category_id, pc.category_id,
pp.public_reply, pp.public_reply,

Loading…
Cancel
Save