党建园地-最新议题、结案项目业务调整接口变动

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java

@@ -21,16 +21,21 @@ public class LatestIssueListResultDTO implements Serializable {
      * 议题标题
      */
     private String issueTitle = "";
-    /**
-     * 议题发起人：XX路-XX先生
-     */
-    private String issuePublisherName = "";
     /**
      * 话题内容
      */
     private String topicContent = "";
     /**
-     * 表达态度总人数
+     * 用户头像
+     */
+    private String staffHeadPhoto = "";
+    /**
+     * 议题发起人：XX路-XX先生/女士
+     *
+     */
+    private String issuePublisherName = "";
+    /**
+     * 议题创建时间
      */
-    private Integer votedCount = 0;
+    private Long createIssueTime;
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -20,10 +20,6 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.ClosedIssueListGovResultDTO;
-import com.epmet.dto.result.ClosedIssueListResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
-import com.epmet.dto.result.VotingIssueListResultDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java

@@ -68,13 +68,6 @@ public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEnt
      */
     List<PolyLineDTO> polyLineData(IssueIdFormDTO issueId);
 
-    /**
-     * @param issueIdList
-     * @return
-     * @Author sun
-     * @Description 根据议题Id查询议题投票情况
-     **/
-    List<IssueVoteStatisticalEntity> selectListByissueId(@Param("issueIdList") List<String> issueIdList);
     /**
      * @Description 得到表决中的议题 来进行缓存与数据库的同步
      * @param

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -614,7 +614,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         LatestListFormDTO latestListForm = formDTO.getLatestListForm();
         latestListForm.setPageNo((latestListForm.getPageNo() - NumConstant.ONE) * latestListForm.getPageSize());
         List<IssueEntity> entityList = baseDao.selectIssueList(issueIdList, latestListForm);
-
+        if (null == entityList || entityList.size() < NumConstant.ONE) {
+            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+        }
         //3:遍历封装数据
         entityList.forEach(issue -> {
             listRelation.forEach(relation -> {
@@ -649,11 +651,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             return returnList;
         }
 
-        //2:根据议题Id查询议题投票情况
+        //2:调用epmet-user服务，查询议题发起人基本信息
-        List<String> issueIdList = entityList.stream().map(IssueEntity::getId).collect(Collectors.toList());
-        List<IssueVoteStatisticalEntity> StatisticalList = issueVoteStatisticalDao.selectListByissueId(issueIdList);
-
-        //3:调用epmet-user服务，查询议题发起人基本信息
         List<String> userIdList = entityList.stream().map(IssueEntity::getCreatedBy).collect(Collectors.toList());
         UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
         userResiInfoListFormDTO.setUserIdList(userIdList);
@@ -663,7 +661,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<UserResiInfoResultDTO> userInfoList = listResult.getData();
 
-        //4:调用resi-group服务，批量查询话题内容
+        //3:调用resi-group服务，批量查询话题内容
         List<String> topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList());
         Result<List<ResiTopicDTO>> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList);
         if (!resultTopicList.success() || null == resultTopicList.getData()) {
@@ -671,19 +669,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<ResiTopicDTO> topicList = resultTopicList.getData();
 
-        //5:遍历组装对象
+        //4:遍历组装对象
         entityList.forEach(issue -> {
             LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO();
             resultDTO.setIssueId(issue.getId());
             resultDTO.setIssueTitle(issue.getIssueTitle());
-            StatisticalList.forEach(sta -> {
+            resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000);
-                if (issue.getId().equals(sta.getIssueId())) {
-                    //表达态度总人数
-                    resultDTO.setVotedCount(sta.getSupportCount() + sta.getOppositionCount());
-                }
-            });
             userInfoList.forEach(user -> {
                 if (issue.getCreatedBy().equals(user.getUserId())) {
+                    resultDTO.setStaffHeadPhoto(user.getHeadPhoto());
                     //话题发起人昵称
                     resultDTO.setIssuePublisherName(user.getShowName());
                 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml

@@ -69,17 +69,6 @@
             ORDER BY statistical_date ASC
     </select>
 
-    <select id="selectListByissueId" resultType="com.epmet.entity.IssueVoteStatisticalEntity">
-        SELECT
-            *
-        FROM
-            issue_vote_statistical
-        WHERE del_flag = '0'
-        <foreach item="issueId" collection="issueIdList" separator="OR" open="AND (" close=")" index="">
-            issue_id = #{issueId}
-        </foreach>
-    </select>
-
     <!-- 得到表决中的议题 来进行缓存与数据库的同步 -->
     <select id="getVotingIssuesStatisticalForSync" resultType="com.epmet.dto.IssueVoteStatisticalDTO" >
         SELECT

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

@@ -31,12 +31,12 @@ public class LatestListResultDTO implements Serializable {
 	 */
 	private String publicReply = "";
 	/**
-	 * 结案人名称、实名显示
+	 * 结案的处理部门
 	 */
-	private String closeUserName = "";
+	private String departmentName = "";
 	/**
-	 * 结案人Id
+	 * 项目结案时间
 	 */
-	private String closeUserId = "";
+	private Long closeProjectTime;
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -110,7 +110,7 @@ public interface ProjectConstant {
 	 */
 	String GOV = "gov";
 	/**
-	 * 调用epmet-user服务获取工作人员信息失败
+	 * 获取项目节点数据失败
 	 */
-	String SELECT_STAFF_EXCEPTION = "获取工作人员信息失败";
+	String SELECT_process_EXCEPTION = "获取项目节点数据失败";
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -5,13 +5,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.CustomerStaffListResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -52,12 +49,4 @@ public interface EpmetUserFeignClient {
     @PostMapping(value = "epmetuser/customerstaff/getstaffinfobyuserid")
     Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO);
 
-    /**
-     * @param staffIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询工作人员基础信息
-     **/
-    @PostMapping(value = "epmetuser/customerstaff/getstafflistbyids", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result<List<StaffListResultDTO>> getStaffListByIds(@RequestBody List<String> staffIdList);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -7,7 +7,6 @@ import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -36,8 +35,4 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "CustomerStaffDTO", formDTO);
     }
 
-    @Override
-    public Result<List<StaffListResultDTO>> getStaffListByIds(List<String> staffIdList) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffListByIds", staffIdList);
-    }
 }

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

@@ -574,32 +574,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @param formDTO
 	 * @return
 	 * @Author sun
-	 * @Description 获取客户下已结案项目列表，按结案时间倒序
+	 * @Description 获取客户下已结案项目列表，按结案时间倒序(结案时间、结案说明、处理部门)
 	 **/
 	@Override
 	public List<LatestListResultDTO> getClosedProjectList(LatestListFormDTO formDTO) {
-		List<LatestListResultDTO> resultList = new ArrayList<>();
-		//1:查询客户下已结案项目列表
-		List<LatestListResultDTO> listProject = baseDao.selectClosedProjectList(formDTO);
-		if(null==listProject||listProject.size()<NumConstant.ONE){
-			return resultList;
-		}
-		List<String> staffIdList = listProject.stream().map(LatestListResultDTO::getCloseUserId).collect(Collectors.toList());
-		//2:调用epmet-user服务，查询结案人员真实姓名
-		Result<List<StaffListResultDTO>> listResult = epmetUserFeignClient.getStaffListByIds(staffIdList);
-		if (!listResult.success() || null == listResult.getData()) {
-			throw new RenException(ProjectConstant.SELECT_STAFF_EXCEPTION);
-		}
-		List<StaffListResultDTO> staffList = listResult.getData();
-		resultList = listProject.stream().flatMap(project ->
-				staffList.stream().filter(staff ->
-						project.getCloseUserId().equals(staff.getStaffId())).map(latest -> {
-					LatestListResultDTO resultDTO = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class);
-					resultDTO.setCloseUserName(latest.getStaffName());
-					return resultDTO;
-				})).collect(Collectors.toList());
 
-		return resultList;
+		return baseDao.selectClosedProjectList(formDTO);
 	}
 
 }

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

@@ -153,7 +153,8 @@
         SELECT
             p.id AS "projectId",
             pro.public_reply AS "publicReply",
-            pro.created_by AS "closeUserId"
+            pro.department_name AS "departmentName",
+            UNIX_TIMESTAMP(pro.created_time) AS "closeProjectTime"
         FROM project p
         INNER JOIN project_process pro ON p.id = pro.project_id
         WHERE p.del_flag = '0'

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -27,15 +27,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.excel.CustomerStaffExcel;
 import com.epmet.service.CustomerStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -281,14 +273,4 @@ public class CustomerStaffController {
         return new Result<CustomerStaffListResultDTO>().ok(customerStaffService.getCustomerStaffList(staffIdList));
     }
 
-    /**
-     * @param staffIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询工作人员基础信息
-     **/
-    @PostMapping(value = "getstafflistbyids")
-    public Result<List<StaffListResultDTO>> getStaffListByIds(@RequestBody List<String> staffIdList){
-        return new Result<List<StaffListResultDTO>>().ok(customerStaffService.getStaffListByIds(staffIdList));
-    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -21,14 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerStaffEntity;
 
@@ -232,11 +225,4 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 **/
 	CustomerStaffListResultDTO getCustomerStaffList(List<String> staffIdList);
 
-	/**
-	 * @param staffIdList
-	 * @return
-	 * @Author sun
-	 * @Description 批量查询工作人员基础信息
-	 **/
-	List<StaffListResultDTO> getStaffListByIds(List<String> staffIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -35,22 +35,6 @@ import com.epmet.dao.StaffRoleDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.StaffRoleDTO;
-import com.epmet.dto.result.StaffDetailResultDTO;
-import com.epmet.dto.result.DepartInStaffListResultDTO;
-import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffInitResultDTO;
-import com.epmet.dto.result.StaffRoleResultDTO;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
-import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
@@ -440,15 +424,4 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return list;
 	}
 
-	/**
-	 * @param staffIdList
-	 * @return
-	 * @Author sun
-	 * @Description 批量查询工作人员基础信息
-	 **/
-	@Override
-	public List<StaffListResultDTO> getStaffListByIds(List<String> staffIdList) {
-		return baseDao.selectStaffByIds(staffIdList);
-	}
-
 }