议题-全部

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/IssueConstant.java

@@ -15,4 +15,10 @@ public interface IssueConstant {
     String ISSUE_STATUS_AUDITING = "auditing";
     String ISSUE_STATUS_REJECTED = "rejected";
 
+    String GET_AGENCY_FAILURE = "根据userId查询组织ID失败......";
+
+    String GET_GRID_LIST_FAILURE = "获取网格ID列表失败......";
+
+    String NOT_EXISTS_PROJECT_INFO = "未查询到项目信息......";
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java

@@ -3,6 +3,8 @@ package com.epmet.dataaggre.dto.govissue.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -18,6 +20,11 @@ public class IssueListResultDTO implements Serializable {
      */
     private String issueId;
 
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
     /**
      * 议题标题
      */
@@ -88,6 +95,11 @@ public class IssueListResultDTO implements Serializable {
      */
     private Long shiftProjectTime;
 
+    /**
+     * 当前处理部门
+     */
+    private List<String> currentDepartment;
+
     public IssueListResultDTO() {
         this.issueId = "";
         this.issueTitle = "";
@@ -104,5 +116,6 @@ public class IssueListResultDTO implements Serializable {
         this.topicId = "";
         this.auditingTime = 0L;
         this.shiftProjectTime = 0L;
+        this.currentDepartment = new ArrayList<>();
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovIssueController.java

@@ -1,8 +1,6 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.annotation.RequirePermission;
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -38,6 +36,7 @@ public class GovIssueController {
      * @date 2020/12/25 下午2:37
      */
     @PostMapping("allissuelist")
+//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_HOT_ISSUE_ALL)
     public Result<AllIssueResultDTO> allIssueList(@RequestBody AllIssueFormDTO formDTO, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO, AllIssueFormDTO.AllIssueForm.class);
         return new Result<AllIssueResultDTO>().ok(govIssueService.allIssueList(formDTO,tokenDto));

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java

@@ -37,13 +37,21 @@ import java.util.List;
 public interface IssueDao extends BaseDao<IssueEntity> {
 
     /**
-     * @Description  查询议题
+     * @Description  查询议题【表决中、已关闭】
      * @Param gridIds
      * @author zxc
      * @date 2020/12/25 下午2:19
      */
     List<IssueListResultDTO> issueStatusClosedOrVoting(@Param("gridIds") List<String> gridIds, @Param("issueStatus")String issueStatus);
 
+    /**
+     * @Description  查询已转项目议题
+     * @Param gridIds
+     * @author zxc
+     * @date 2020/12/25 下午5:27
+     */
+    List<IssueListResultDTO> issueStatusShiftProject(@Param("gridIds") List<String> gridIds);
+
     /**
      * @Description 查询网格列表下表决中的议题列表
      * @author sun

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java

@@ -39,4 +39,12 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @Description 递归查询当前机关的下一级机关列表
      **/
     List<AgencyGridResultDTO> selectAllSubAgency(@Param("subPids") String subPids);
+
+    /**
+     * @Description  根据userId查询组织ID
+     * @Param userId
+     * @author zxc
+     * @date 2020/12/25 下午4:55
+     */
+    String getAgencyIdByUserId(@Param("userId") String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

@@ -18,8 +18,12 @@
 package com.epmet.dataaggre.dao.govproject;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.entity.govproject.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目表
@@ -29,5 +33,21 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectDao extends BaseDao<ProjectEntity> {
-	
+
+    /**
+     * @Description  查询项目信息【已关闭】
+     * @Param issueIds
+     * @author zxc
+     * @date 2020/12/25 下午5:47
+     */
+    List<IssueListResultDTO> selectProjectInfoClosed(@Param("issueIds") List<String> issueIds);
+
+    /**
+     * @Description  查询项目信息【处理中】
+     * @Param issueIds
+     * @author zxc
+     * @date 2020/12/28 上午9:26
+     */
+    List<IssueListResultDTO> selectProjectInfoPending(@Param("issueIds") List<String> issueIds);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java

@@ -2,8 +2,10 @@ package com.epmet.dataaggre.service.govissue.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.constant.IssueConstant;
 import com.epmet.dataaggre.dao.govissue.IssueApplicationDao;
 import com.epmet.dataaggre.dao.govissue.IssueDao;
 import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO;
@@ -15,16 +17,16 @@ import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
 import com.epmet.dataaggre.service.govissue.GovIssueService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +44,8 @@ public class GovIssueServiceImpl implements GovIssueService {
     private IssueApplicationDao issueApplicationDao;
     @Autowired
     private GovOrgService govOrgService;
+    @Autowired
+    private GovProjectService govProjectService;
 
     /**
      * @Description  按组织查询所有议题
@@ -53,9 +57,42 @@ public class GovIssueServiceImpl implements GovIssueService {
     @Override
     public AllIssueResultDTO allIssueList(AllIssueFormDTO formDTO, TokenDto tokenDto) {
         if (CollectionUtils.isEmpty(formDTO.getGridIdList())){
-
+            String userId = govOrgService.getAgencyIdByUserId(tokenDto.getUserId());
+            if (StringUtils.isBlank(userId)){
+                throw new RenException(IssueConstant.GET_AGENCY_FAILURE);
+            }
+            List<GridInfoResultDTO> gridList = govOrgService.gridList(userId);
+            if (CollectionUtils.isEmpty(gridList)){
+                throw new RenException(IssueConstant.GET_GRID_LIST_FAILURE);
+            }
+            formDTO.setGridIdList(gridList.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
         }
-        return null;
+        // xx街道-xx网格
+        List<GridsInfoListResultDTO> gridsInfoList = govOrgService.gridListByIds(formDTO.getGridIdList());
+        AllIssueResultDTO result = new AllIssueResultDTO();
+        switch (formDTO.getIssueType()){
+            case IssueConstant.ISSUE_STATUS_AUDITING:
+                List<IssueListResultDTO> resultAuditing = issueStatusAuditing(formDTO);
+                result.setIssueList(resultAuditing);
+                result.setTotal(resultAuditing.size());
+                break;
+            case IssueConstant.ISSUE_STATUS_REJECTED:
+                List<IssueListResultDTO> resultRejected = issueStatusRejected(formDTO);
+                result.setIssueList(resultRejected);
+                result.setTotal(resultRejected.size());
+                break;
+            case IssueConstant.ISSUE_STATUS_SHIFT_PROJECT:
+                List<IssueListResultDTO> resultShiftProject = issueStatusShiftProject(formDTO);
+                result.setIssueList(resultShiftProject);
+                result.setTotal(resultShiftProject.size());
+                break;
+            default:
+                List<IssueListResultDTO> resultClosedOrVoting = issueStatusClosedOrVoting(formDTO);
+                result.setIssueList(resultClosedOrVoting);
+                result.setTotal(resultClosedOrVoting.size());
+        }
+        result.getIssueList().forEach(issue -> gridsInfoList.stream().filter(g -> issue.getGridId().equals(g.getGridId())).forEach(g -> issue.setBelongsGridName(g.getGridName())));
+        return result;
     }
 
     /**
@@ -82,8 +119,65 @@ public class GovIssueServiceImpl implements GovIssueService {
         if (CollectionUtils.isEmpty(formDTO.getGridIdList())){
             return new ArrayList<>();
         }
-//        PageInfo<IssueListResultDTO> result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> .issueStatusClosed(formDTO.getGridIdList()));
+        PageInfo<IssueListResultDTO> result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> issueApplicationDao.issueStatusRejected(formDTO.getGridIdList()));
-        return null;
+        List<IssueListResultDTO> list = result.getList();
+        if (CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
+        List<IssueListResultDTO> resultDTOs = new ArrayList<>();
+        Map<String, List<IssueListResultDTO>> groupByTopic = list.stream().collect(Collectors.groupingBy(IssueListResultDTO::getTopicId));
+        groupByTopic.forEach((topicId,l) -> {
+            IssueListResultDTO issueListResultDTO = l.stream().max(Comparator.comparing(IssueListResultDTO::getRejectedTime)).get();
+            resultDTOs.add(issueListResultDTO);
+        });
+        List<IssueListResultDTO> collect = resultDTOs.stream().sorted(Comparator.comparing(IssueListResultDTO::getRejectedTime).reversed()).collect(Collectors.toList());
+        return collect;
+    }
+
+    /**
+     * @Description  审核中的议题走此方法
+     * @Param formDTO
+     * @author zxc
+     * @date 2020/12/25 下午4:34
+     */
+    public List<IssueListResultDTO> issueStatusAuditing(AllIssueFormDTO formDTO){
+        if (CollectionUtils.isEmpty(formDTO.getGridIdList())){
+            return new ArrayList<>();
+        }
+        PageInfo<IssueListResultDTO> result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> issueApplicationDao.issueStatusAuditing(formDTO.getGridIdList()));
+        return result.getList();
+    }
+
+    /**
+     * @Description  议题状态为转项目时走此方法
+     * @Param formDTO
+     * @author zxc
+     * @date 2020/12/28 上午9:13
+     */
+    public List<IssueListResultDTO> issueStatusShiftProject(AllIssueFormDTO formDTO){
+        if (CollectionUtils.isEmpty(formDTO.getGridIdList())){
+            return new ArrayList<>();
+        }
+        PageInfo<IssueListResultDTO> result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> issueDao.issueStatusShiftProject(formDTO.getGridIdList()));
+        List<IssueListResultDTO> list = result.getList();
+        if (CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
+        List<String> issueIds = list.stream().map(m -> m.getIssueId()).collect(Collectors.toList());
+        List<IssueListResultDTO> resultDTOS = govProjectService.selectProjectInfo(issueIds);
+        if (CollectionUtils.isEmpty(resultDTOS)){
+            throw new RenException(IssueConstant.NOT_EXISTS_PROJECT_INFO);
+        }
+        list.forEach(l -> {
+            resultDTOS.forEach(r -> {
+                if (l.getIssueId().equals(r.getIssueId())){
+                    l.setClosedReason(r.getClosedReason());
+                    l.setStatus(r.getStatus());
+                    l.setCurrentDepartment(r.getCurrentDepartment());
+                }
+            });
+        });
+        return list;
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -34,4 +34,12 @@ public interface GovOrgService {
      */
     List<GridsInfoListResultDTO> gridListByIds(List<String> gridIdList);
 
+    /**
+     * @Description  根据userId查询组织ID
+     * @Param userId
+     * @author zxc
+     * @date 2020/12/25 下午4:53
+     */
+    String getAgencyIdByUserId(String userId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -109,5 +109,16 @@ public class GovOrgServiceImpl implements GovOrgService {
         return customerGridDao.selectGridByIds(gridIdList);
     }
 
+    /**
+     * @Description  根据userId查询组织ID
+     * @Param userId
+     * @author zxc
+     * @date 2020/12/25 下午4:53
+     */
+    @Override
+    public String getAgencyIdByUserId(String userId) {
+        return customerAgencyDao.getAgencyIdByUserId(userId);
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -1,8 +1,21 @@
 package com.epmet.dataaggre.service.govproject;
 
+import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
+
+import java.util.List;
+
 /**
  * @Author zxc
  * @DateTime 2020/12/24 下午5:50
  */
 public interface GovProjectService {
+
+    /**
+     * @Description  查询项目信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2020/12/25 下午5:46
+     */
+    List<IssueListResultDTO> selectProjectInfo(List<String> issueIds);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -2,8 +2,15 @@ package com.epmet.dataaggre.service.govproject.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.govproject.ProjectDao;
+import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -12,4 +19,32 @@ import org.springframework.stereotype.Service;
 @Service
 @DataSource(DataSourceConstant.GOV_PROJECT)
 public class GovProjectServiceImpl implements GovProjectService {
+
+    @Autowired
+    private ProjectDao projectDao;
+
+    /**
+     * @Description  查询项目信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2020/12/25 下午5:47
+     */
+    @Override
+    public List<IssueListResultDTO> selectProjectInfo(List<String> issueIds) {
+        if (CollectionUtils.isEmpty(issueIds)){
+            return new ArrayList<>();
+        }
+        List<IssueListResultDTO> closedResult = projectDao.selectProjectInfoClosed(issueIds);
+        List<IssueListResultDTO> pendingResult = projectDao.selectProjectInfoPending(issueIds);
+        if (CollectionUtils.isEmpty(closedResult)){
+            if (CollectionUtils.isEmpty(pendingResult))return new ArrayList<>();
+            return pendingResult;
+        }
+        if (CollectionUtils.isEmpty(pendingResult)){
+            if (CollectionUtils.isEmpty(closedResult))return new ArrayList<>();
+            return closedResult;
+        }
+        closedResult.addAll(pendingResult);
+        return closedResult;
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml

@@ -5,7 +5,20 @@
 
     <!-- 查询被拒绝的议题 -->
     <select id="issueStatusRejected" resultType="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
-        select * from issue;
+        SELECT
+            UNIX_TIMESTAMP(iah.CREATED_TIME) AS rejectedTime,
+            ia.ISSUE_TITLE,
+            ia.TOPIC_ID,
+            iah.REASON AS rejectedReason
+        FROM issue_application_history iah
+                 LEFT JOIN issue_application ia ON iah.ISSUE_APPLICATION_ID = ia.ID
+        WHERE ia.DEL_FLAG = 0
+          AND ia.APPLY_STATUS = 'rejected'
+          AND iah.ACTION_TYPE = 'rejected'
+          AND
+          <foreach collection="gridIds" item="gridId" separator=" OR ">
+              ia.GRID_ID = #{gridId}
+          </foreach>
     </select>
 
     <!-- 查询被拒绝的议题 -->

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml

@@ -21,6 +21,21 @@
           </foreach>
     </select>
 
+    <!-- 查询已转项目议题 -->
+    <select id="issueStatusShiftProject" resultType="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
+        SELECT
+            ID AS issueId,
+            SUGGESTION ,
+            UNIX_TIMESTAMP(SHIFTED_TIME) AS shiftProjectTime
+        FROM issue
+        WHERE DEL_FLAG = '0'
+          AND ISSUE_STATUS = 'shift_project'
+          AND
+        <foreach collection="gridIds" item="gridId" separator=" OR ">
+            GRID_ID = #{gridId}
+        </foreach>
+    </select>
+
     <select id="selectVotingList" resultType="com.epmet.dataaggre.dto.govissue.result.VotingIssueListResultDTO">
         SELECT
             i.id AS "issueId",

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -17,4 +17,9 @@
             created_time DESC
     </select>
 
+    <!-- 根据userId查询组织ID -->
+    <select id="getAgencyIdByUserId" resultType="java.lang.String">
+        SELECT AGENCY_ID FROM customer_staff_agency WHERE DEL_FLAG = 0 AND USER_ID = #{userId}
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -3,4 +3,48 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.govproject.ProjectDao">
 
+    <!-- 查询项目信息 -->
+    <select id="selectProjectInfoClosed" resultType="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
+        SELECT
+            p.ID AS projectId,
+            p.ORIGIN_ID AS issueId,
+            p.`STATUS`,
+            pp.PUBLIC_REPLY AS closedReason
+        FROM project p
+                 LEFT JOIN project_process pp ON pp.PROJECT_ID = p.ID AND pp.OPERATION = 'close'
+        WHERE p.DEL_FLAG = '0'
+          AND pp.DEL_FLAG = '0'
+          AND
+              <foreach collection="issueIds" item="issueId" separator=" OR ">
+                  p.ORIGIN_ID = #{issueId}
+              </foreach>
+    </select>
+
+    <!-- 查询项目信息【处理中】 -->
+    <resultMap id="selectProjectInfoPending" type="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
+        <result property="projectId" column="projectId"></result>
+        <result property="issueId" column="issueId"></result>
+        <result property="status" column="status"></result>
+        <collection property="currentDepartment" ofType="java.lang.String">
+            <result column="departmentName"/>
+            <result column="id"/>
+        </collection>
+    </resultMap>
+    <select id="selectProjectInfoPending" resultMap="selectProjectInfoPending">
+        SELECT
+            p.ID AS projectId,
+            p.ORIGIN_ID AS issueId,
+            p.`STATUS`,
+            ps.DEPARTMENT_NAME
+        FROM project p
+        LEFT JOIN project_staff ps ON p.ID = ps.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+          AND ps.DEL_FLAG = '0'
+          AND p.`STATUS` = 'pending'
+          AND ps.IS_HANDLE = 'unhandled'
+          AND
+            <foreach collection="issueIds" item="issueId" separator=" OR ">
+                p.ORIGIN_ID = #{issueId}
+            </foreach>
+    </select>
 </mapper>