Merge branch 'dev_issue_project' into dev

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@@ -175,7 +175,7 @@ public class IssueManageController {
      * @author wangc
      * @date 2020.05.16 10:17
     **/
-    @PostMapping("processlist")
+    @PostMapping("progress")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId){
         return new Result<List<ProcessListResultDTO>>().ok(issueProcessService.processList(issueId));

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

@@ -92,4 +92,13 @@ public interface IssueVoteStatisticalDailyService extends BaseService<IssueVoteS
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 定时任务 每天零点统计前一天所有表决中议题的表决信息 生成前端显示折现图所需的数据
+     * @param
+     * @return
+     * @author wangc
+     * @date 2020.05.19 09:23
+    **/
+    void countVotingDailyStatistic();
 }

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

@@ -101,4 +101,22 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 定时任务 每天零点统计前一天所有表决中议题的表决信息 生成前端显示折现图所需的数据
+     * @param
+     * @return
+     * @author wangc
+     * @date 2020.05.19 09:23
+     **/
+    @Override
+    public void countVotingDailyStatistic() {
+        //1.获取所有表决中的议题以及在昨日表决截至的议题，将昨日新生成的议题单独拿出来
+
+        //2.对每一个表决中的议题校验有没有生成过前一天的统计数据，如果生成过则跳过次议题
+
+        //3.如果没有生成过，取前一天的日统计信息与缓存中的表决数进行对比生成昨日数据(非昨日新生成议题)
+
+        //4.获取人员投票详情对昨日的count数(昨日新生成议题，保证数据的准确性)
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -340,17 +340,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         AgencyDeptGridResultDTO agencyDeptGrid = new AgencyDeptGridResultDTO();
         //1:跟踪组织Id批量查询组织信息
         List<CustomerAgencyDTO> agencyList = new ArrayList<>();
-        if (null != formDTO.getAgencyIdList()) {
+        if (null != formDTO.getAgencyIdList() && formDTO.getAgencyIdList().size() > NumConstant.ZERO) {
             agencyList = baseDao.selectAgencyListByIds(formDTO.getAgencyIdList());
         }
         //2:根据部门Id批量查询部门信息
         List<CustomerDepartmentDTO> deptList = new ArrayList<>();
-        if (null != formDTO.getDeptIdList()) {
+        if (null != formDTO.getDeptIdList() && formDTO.getDeptIdList().size() > NumConstant.ZERO) {
             deptList = customerDepartmentDao.selectDeptListByIds(formDTO.getDeptIdList());
         }
         //3:根据网格Id批量查询网格信息
         List<CustomerGridDTO> gridList = new ArrayList<>();
-        if (null != formDTO.getGridIdList()) {
+        if (null != formDTO.getGridIdList() && formDTO.getGridIdList().size() > NumConstant.ZERO) {
             gridList = customerGridDao.selectGridListByIds(formDTO.getGridIdList());
         }
         agencyDeptGrid.setAgencyList(agencyList);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -114,8 +114,7 @@
         <include refid="sql"></include>
         FROM customer_agency ca
         WHERE ca.del_flag = '0'
-        AND
-        <foreach item="agencyId" collection="agencyIdList" open="(" separator="or" close=")" index="">
+        <foreach item="agencyId" collection="agencyIdList" open="AND (" separator="or" close=")" index="">
             ca.id = #{agencyId}
         </foreach>
         ORDER BY field(

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -50,8 +50,7 @@
             *
         FROM customer_department
         WHERE del_flag = '0'
-        AND
-        <foreach item="departmentId" collection="deptIdList" open="(" separator="or" close=")" index="">
+        <foreach item="departmentId" collection="deptIdList" open="AND (" separator="or" close=")" index="">
             id = #{departmentId}
         </foreach>
     </select>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -300,8 +300,7 @@
             *
         FROM customer_grid
         WHERE del_flag = '0'
-        AND
-        <foreach item="gridId" collection="gridIdList" open="(" separator="or" close=")" index="">
+        <foreach item="gridId" collection="gridIdList" open="AND (" separator="or" close=")" index="">
             id = #{gridId}
         </foreach>
     </select>