Merge branches 'dev' and 'wxz_feign_exception_show' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_exception_show

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -486,7 +486,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         dto.setMobile(formDTO.getMobile());
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto);
         if (!customerStaffResult.success()) {
-            logger.error(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
+            logger.warn(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
             throw new RenException(customerStaffResult.getCode());
         }
         //2、密码是否正确
@@ -529,7 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         if(result.success()&&null!=result.getData()){
             return result.getData();
         }
-        logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
+        logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
                 ServiceConstant.GOV_ORG_SERVER,
                 formDTO.getMobile(),
                 formDTO.getPassword(),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java

@@ -66,7 +66,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
         //日期格式转换
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
+        mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN));
         mapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
 
         //Long类型转String类型

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java

@@ -62,7 +62,9 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao<ScreenWorkRecordOrg
     List<String> selectCustomerTypeCode(@Param("dataType")String dataType, @Param("customerId")String customerId);
 
 
-    WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId, @Param("dateId")String dateId,@Param("typeCodeList") List<String> typeCodeList);
+    WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId,
+                                          @Param("dateId")String dateId,
+                                          @Param("typeCodeList") List<String> typeCodeList);
 
     WorkRecordSubRank selectUpToCalGrid(@Param("gridId")String gridId, @Param("dateId")String dateId, @Param("typeCodeList")List<String> typeCodeList);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -118,6 +118,9 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         for(ScreenCustomerAgencyCommonDTO agencyCommonDTO:agencyInfoDTO.getSubAgencies()){
             WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),dateId,typeCodeList);
             if(null !=agencyRes){
+                agencyRes.setOrgId(agencyCommonDTO.getAgencyId());
+                agencyRes.setName(agencyCommonDTO.getAgencyName());
+                agencyRes.setIsDefault("no");
                 subAgencyRankList.add(agencyRes);
             }else{
                 WorkRecordSubRank agencyDefault=new WorkRecordSubRank();
@@ -135,6 +138,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         for(ScreenCustomerGridCommonDTO gridCommonDTO:agencyInfoDTO.getSubGrids()){
             WorkRecordSubRank gridRes=baseDao.selectUpToCalGrid(gridCommonDTO.getGridId(),dateId,typeCodeList);
             if (null != gridRes) {
+                gridRes.setIsDefault("no");
                 subGridList.add(gridRes);
             } else {
                 WorkRecordSubRank gridResDefault = new WorkRecordSubRank();

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -109,8 +109,6 @@
 
     <select id="selectUpToCalAgency" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            sca.AGENCY_ID AS orgId,
-            sca.AGENCY_NAME AS `NAME`,
             sum( m.PARTICIPATE_USER_TOTAL ) AS participateUserTotal,
             sum( m.ORGANIZE_TOTAL ) AS participateTotal
         FROM

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -241,6 +241,7 @@
         WHERE
             agency.DEL_FLAG = '0'
             AND agency.AREA_CODE like concat(#{areaCode},'%')
+            AND LENGTH(agency.PARENT_AREA_CODE) > 0
     </select>
 
     <!--   查找组织下的部门  -->

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java

@@ -26,7 +26,8 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
 	 * @author zhaoqifeng
 	 * @date 2020/6/17 14:13
 	 */
-	List<IssueAgencyDTO> selectAgencyIssueTotal(@Param("customerId") String customerId, @Param("date") String date);
+	List<IssueAgencyDTO> selectAgencyIssueTotal(@Param("customerId") String customerId, @Param("date") String date,
+												@Param("gridList") List<String> gridList);
 
     /**
      * 获取当前日期组织下议题增量
@@ -37,7 +38,8 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
      * @author zhaoqifeng
      * @date 2020/6/18 9:55
      */
-	List<IssueAgencyDTO> selectAgencyIssueInc(@Param("customerId") String customerId, @Param("date") String date);
+	List<IssueAgencyDTO> selectAgencyIssueInc(@Param("customerId") String customerId, @Param("date") String date,
+											  @Param("gridList") List<String> gridList);
 
     /**
      * 已关闭议题统计
@@ -48,7 +50,8 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
      * @author zhaoqifeng
      * @date 2020/6/18 14:41
 	 */
-	List<IssueAgencyDTO> selectAgencyClosedIssueTotal(@Param("customerId") String customerId, @Param("date") String date);
+	List<IssueAgencyDTO> selectAgencyClosedIssueTotal(@Param("customerId") String customerId, @Param("date") String date,
+													  @Param("gridList") List<String> gridList);
 
     /**
      * 已关闭议题增量
@@ -59,7 +62,8 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
      * @author zhaoqifeng
      * @date 2020/6/18 14:41
 	 */
-	List<IssueAgencyDTO> selectAgencyClosedIssueInc(@Param("customerId") String customerId, @Param("date") String date);
+	List<IssueAgencyDTO> selectAgencyClosedIssueInc(@Param("customerId") String customerId, @Param("date") String date,
+													@Param("gridList") List<String> gridList);
 
 	/**
 	 * @param issueEntity
@@ -181,4 +185,14 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
     List<IssueVoteStatisticalResultDTO> selectIssueVoteStatis(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
     List<IssueProjectCategoryDictDTO> selectCategory(@Param("customerId") String customerId, @Param("ids") Set<String> set);
+
+
+	List<IssueDTO> getIssueTotalList(@Param("customerId") String customerId, @Param("date") String date);
+
+	/**
+	 * @Author sun
+	 * @Description 查询议题库已删除网格下可能存在的项目Id集合
+	 **/
+	List<String> selectProjectByGrids(@Param("gridIds") List<String> gridIds);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java

@@ -87,4 +87,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @return java.util.List<com.epmet.dto.org.CustomerStaffGridDTO>
      */
     List<CustomerStaffGridDTO> getCustomerStaffGridList(@Param("customerId") String customerId);
+
+    List<String> getDelGridList(@Param("customerId") String customerId);
+
+    /**
+     * @Author sun
+     * @Description 查询客户已删除网格列表
+     **/
+    List<String> selectDelGridList(@Param("customerId") String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java

@@ -28,7 +28,7 @@ public interface IssueService {
 	 * @param date
 	 * @return java.util.List<com.epmet.dto.issue.IssueAgencyDTO>
 	 */
-	List<IssueAgencyDTO> getAgencyIssueTotal(String customerId, String date);
+	List<IssueAgencyDTO> getAgencyIssueTotal(String customerId, String date, List<String> gridList);
 
 	/**
 	 * 获取当前日期组织下议题增量
@@ -38,7 +38,7 @@ public interface IssueService {
 	 * @param date
 	 * @return java.util.List<com.epmet.dto.issue.IssueAgencyDTO>
 	 */
-	List<IssueAgencyDTO> getAgencyIssueInc(String customerId, String date);
+	List<IssueAgencyDTO> getAgencyIssueInc(String customerId, String date, List<String> gridList);
 
 	/**
 	 * 获取截止当前日期组织下已关闭议题统计
@@ -48,7 +48,7 @@ public interface IssueService {
 	 * @param date
 	 * @return java.util.List<com.epmet.dto.issue.IssueAgencyDTO>
 	 */
-	List<IssueAgencyDTO> getAgencyClosedIssueTotal(String customerId, String date);
+	List<IssueAgencyDTO> getAgencyClosedIssueTotal(String customerId, String date, List<String> gridList);
 
 	/**
 	 * 获取当前日期组织下已关闭议题增量
@@ -58,7 +58,7 @@ public interface IssueService {
 	 * @param date
 	 * @return java.util.List<com.epmet.dto.issue.IssueAgencyDTO>
 	 */
-	List<IssueAgencyDTO> getAgencyClosedIssueInc(String customerId, String date);
+	List<IssueAgencyDTO> getAgencyClosedIssueInc(String customerId, String date, List<String> gridList);
 
 	/**
 	 * @param issueEntity
@@ -183,4 +183,31 @@ public interface IssueService {
      * @date 2021.03.09 00:23
     */
     Map<String,String> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId);
+
+    /**
+     * 获取议题总数
+     * @author zhaoqifeng
+     * @date 2021/7/20 16:20
+     * @param customerId
+     * @param date
+     * @return java.util.List<com.epmet.dto.issue.IssueDTO>
+     */
+	List<IssueDTO> getIssueTotalList(String customerId, String date);
+
+
+	/**
+	 * 获取议题增量
+	 * @author zhaoqifeng
+	 * @date 2021/7/20 16:20
+	 * @param customerId
+	 * @param date
+	 * @return java.util.List<com.epmet.dto.issue.IssueDTO>
+	 */
+	List<IssueDTO> getIssueIncrList(String customerId, String date);
+
+	/**
+	 * @Author sun
+	 * @Description 查询议题库已删除网格下可能存在的项目Id集合
+	 **/
+	List<String> getProjectByGrids(List<String> gridIds);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java

@@ -34,23 +34,23 @@ public class IssueServiceImpl implements IssueService {
 	private StatsIssueDao statsIssueDao;
 
 	@Override
-	public List<IssueAgencyDTO> getAgencyIssueTotal(String customerId, String date) {
+	public List<IssueAgencyDTO> getAgencyIssueTotal(String customerId, String date, List<String> gridList) {
-		return statsIssueDao.selectAgencyIssueTotal(customerId, date);
+		return statsIssueDao.selectAgencyIssueTotal(customerId, date, gridList);
 	}
 
 	@Override
-	public List<IssueAgencyDTO> getAgencyIssueInc(String customerId, String date) {
+	public List<IssueAgencyDTO> getAgencyIssueInc(String customerId, String date, List<String> gridList) {
-		return statsIssueDao.selectAgencyIssueInc(customerId, date);
+		return statsIssueDao.selectAgencyIssueInc(customerId, date, gridList);
 	}
 
 	@Override
-	public List<IssueAgencyDTO> getAgencyClosedIssueTotal(String customerId, String date) {
+	public List<IssueAgencyDTO> getAgencyClosedIssueTotal(String customerId, String date, List<String> gridList) {
-		return statsIssueDao.selectAgencyClosedIssueTotal(customerId, date);
+		return statsIssueDao.selectAgencyClosedIssueTotal(customerId, date, gridList);
 	}
 
 	@Override
-	public List<IssueAgencyDTO> getAgencyClosedIssueInc(String customerId, String date) {
+	public List<IssueAgencyDTO> getAgencyClosedIssueInc(String customerId, String date, List<String> gridList) {
-		return statsIssueDao.selectAgencyClosedIssueInc(customerId, date);
+		return statsIssueDao.selectAgencyClosedIssueInc(customerId, date, gridList);
 	}
 
 	/**
@@ -169,4 +169,42 @@ public class IssueServiceImpl implements IssueService {
 
 		return map;
 	}
+
+	/**
+	 * 获取议题总数
+	 *
+	 * @param customerId
+	 * @param date
+	 * @return java.util.List<com.epmet.dto.issue.IssueDTO>
+	 * @author zhaoqifeng
+	 * @date 2021/7/20 16:20
+	 */
+	@Override
+	public List<IssueDTO> getIssueTotalList(String customerId, String date) {
+		return null;
+	}
+
+	/**
+	 * 获取议题增量
+	 *
+	 * @param customerId
+	 * @param date
+	 * @return java.util.List<com.epmet.dto.issue.IssueDTO>
+	 * @author zhaoqifeng
+	 * @date 2021/7/20 16:20
+	 */
+	@Override
+	public List<IssueDTO> getIssueIncrList(String customerId, String date) {
+		return null;
+	}
+
+	/**
+	 * @Author sun
+	 * @Description 查询议题库已删除网格下可能存在的项目Id集合
+	 **/
+	@Override
+	public List<String> getProjectByGrids(List<String> gridIds) {
+		return statsIssueDao.selectProjectByGrids(gridIds);
+	}
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.dto.stats.FactIssueGridMonthlyDTO;
 import com.epmet.entity.stats.*;
 import com.epmet.service.Issue.IssueService;
 import com.epmet.service.StatsIssueService;
+import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.project.ProjectService;
 import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
@@ -57,6 +58,8 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 	private FactIssueGridDailyService factIssueGridDailyService;
 	@Autowired
 	private FactIssueGridMonthlyService factIssueGridMonthlyService;
+	@Autowired
+	private CustomerGridService customerGridService;
 
 	@Override
 	public void agencyGridIssueStats(StatsFormDTO formDTO) {
@@ -119,16 +122,17 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 		DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 		//清空数据
 		factIssueAgencyDailyService.deleteByCustomerId(customerId, dimId.getDateId());
+		List<String> gridList = customerGridService.getDelGridList(customerId);
 		//获取当前客户下所有机关
 		List<DimAgencyDTO> agencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
 		//获取机关下议题各种状态的数目统计
-		List<IssueAgencyDTO> issueAgencyTotalList = issueService.getAgencyIssueTotal(customerId, dateString);
+		List<IssueAgencyDTO> issueAgencyTotalList = issueService.getAgencyIssueTotal(customerId, dateString, gridList);
 		//获取机关下议题各种状态的数目增量
-		List<IssueAgencyDTO> issueAgencyIncList = issueService.getAgencyIssueInc(customerId, dateString);
+		List<IssueAgencyDTO> issueAgencyIncList = issueService.getAgencyIssueInc(customerId, dateString, gridList);
 		//获取机关下已关闭议题统计
-		List<IssueAgencyDTO> issueAgencyClosedTotalList = issueService.getAgencyClosedIssueTotal(customerId, dateString);
+		List<IssueAgencyDTO> issueAgencyClosedTotalList = issueService.getAgencyClosedIssueTotal(customerId, dateString, gridList);
 		//获取机关下已关闭议题增量
-		List<IssueAgencyDTO> issueAgencyClosedIncList = issueService.getAgencyClosedIssueInc(customerId, dateString);
+		List<IssueAgencyDTO> issueAgencyClosedIncList = issueService.getAgencyClosedIssueInc(customerId, dateString, gridList);
 		//已结案项目统计
 		List<ProjectAgencyDTO> projectAgencyClosedTotalList = projectService.getAgencyClosedProjectTotal(customerId, dateString);
 		//已结案项目增量
@@ -180,14 +184,15 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 		dimAgencyDTO.setCustomerId(customerId);
 		//获取日期相关维度
 		DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+		List<String> gridList = customerGridService.getDelGridList(customerId);
 		//清空数据
 		factIssueAgencyMonthlyService.deleteByCustomerId(customerId, dimId.getMonthId());
 		//获取当前客户下所有机关
 		List<DimAgencyDTO> agencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
 		//获取机关下议题各种状态的数目统计
-		List<IssueAgencyDTO> issueAgencyTotalList = issueService.getAgencyIssueTotal(customerId, dateString);
+		List<IssueAgencyDTO> issueAgencyTotalList = issueService.getAgencyIssueTotal(customerId, dateString, gridList);
 		//获取机关下已关闭议题统计
-		List<IssueAgencyDTO> issueAgencyClosedTotalList = issueService.getAgencyClosedIssueTotal(customerId, dateString);
+		List<IssueAgencyDTO> issueAgencyClosedTotalList = issueService.getAgencyClosedIssueTotal(customerId, dateString, gridList);
 		//已结案项目统计
 		List<ProjectAgencyDTO> projectAgencyClosedTotalList = projectService.getAgencyClosedProjectTotal(customerId, dateString);
 		//统计机关下议题各个指标月度增量

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.entity.project.ProjectProcessEntity;
 import com.epmet.entity.stats.*;
 import com.epmet.service.Issue.IssueService;
 import com.epmet.service.StatsProjectService;
+import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.project.ProjectProcessService;
 import com.epmet.service.project.ProjectService;
 import com.epmet.service.stats.*;
@@ -29,6 +30,7 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * 数据统计-项目（独立于任何具体数据源外层的service）
@@ -59,6 +61,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
     private FactGridProjectDailyService factGridProjectDailyService;
     @Autowired
     private FactGridProjectMonthlyService factGridProjectMonthlyService;
+    @Autowired
+    private CustomerGridService customerGridService;
 
     /**
      * @Author sun
@@ -123,6 +127,31 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，对应客户Id:" + customerId);
         List<ProjectProcessEntity> processList = projectProcessService.getProcessList(projectEntity);
 
+        //20210721 sun 业务逻辑调整，网格删除，组织没有删除情况，相应的组织层级数据统计应舍弃以删除网格数据  start
+        //处理逻辑：查询已删除网格下项目Id，将已查询的项目、节点数据中的脏数据剔除【项目库有张表有网格Id，可以查出每个项目所属网格，但是关联该表后sql查询效率极低固舍弃此方案】
+        //4-1.查询客户下已删除网格列表下存在的项目Id集合
+        List<String> list = customerGridService.getdelGridProjectIdList(customerId);
+        if (list.size() > NumConstant.ZERO) {
+            Map<String, String> map = list.stream().collect(Collectors.toMap(String::toString, v -> v, (c1, c2) -> c1));
+            //4-2.遍历删除项目主表查询的无效数据
+            Iterator<ProjectEntity> proiter = projectList.iterator();
+            while (proiter.hasNext()) {
+                ProjectEntity next = proiter.next();
+                if (map.containsKey(next.getId())) {
+                    proiter.remove();
+                }
+            }
+            //4-3.遍历删除项目节点表查询的无效数据
+            Iterator<ProjectProcessEntity> iterator = processList.iterator();
+            while (iterator.hasNext()) {
+                ProjectProcessEntity next = iterator.next();
+                if (map.containsKey(next.getProjectId())) {
+                    iterator.remove();
+                }
+            }
+        }
+        //20210721 sun  end
+
         //5:机关层级日月统计
         if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) {
             //5.1:执行机关日数据统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java

@@ -61,4 +61,20 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @return java.util.List<com.epmet.dto.org.CustomerStaffGridDTO>
      */
     List<CustomerStaffGridDTO> getCustomerStaffGridList(String customerId);
+
+    /**
+     * 获取已删除的grid
+     * @author zhaoqifeng
+     * @date 2021/7/20 16:33
+     * @param customerId
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> getDelGridList(String customerId);
+
+    /**
+     * @Author sun
+     * @Description 查询客户下已删除网格列表下存在的项目Id集合
+     **/
+    List<String> getdelGridProjectIdList(String customerId);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.org.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.org.CustomerGridDao;
 import com.epmet.dto.group.AgencyDTO;
@@ -10,10 +11,12 @@ import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.entity.org.CustomerGridEntity;
+import com.epmet.service.Issue.IssueService;
 import com.epmet.service.org.CustomerGridService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -23,6 +26,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     @Autowired
     private CustomerGridDao customerGridDao;
+    @Autowired
+    private IssueService issueService;
 
     @Override
     public List<CustomerGridEntity> listGridsByCreateTime(Date start, Date end) {
@@ -79,4 +84,35 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public List<CustomerStaffGridDTO> getCustomerStaffGridList(String customerId) {
         return customerGridDao.getCustomerStaffGridList(customerId);
     }
+
+    /**
+     * 获取已删除的grid
+     *
+     * @param customerId
+     * @return java.util.List<java.lang.String>
+     * @author zhaoqifeng
+     * @date 2021/7/20 16:33
+     */
+    @Override
+    public List<String> getDelGridList(String customerId) {
+        return customerGridDao.getDelGridList(customerId);
+    }
+
+    /**
+     * @Author sun
+     * @Description 查询客户下已删除网格列表下存在的项目Id集合
+     **/
+    @Override
+    public List<String> getdelGridProjectIdList(String customerId) {
+        List<String> resultList = new ArrayList<>();
+        //1.查询客户已删除网格列表
+        List<String> gridIds = customerGridDao.selectDelGridList(customerId);
+        if (gridIds.size() < NumConstant.ONE) {
+            return resultList;
+        }
+        //2.查询议题库已删除网格下可能存在的项目Id集合
+        resultList = issueService.getProjectByGrids(gridIds);
+        return resultList;
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -13,6 +13,11 @@
             DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
         AND DATE(UPDATED_TIME) <![CDATA[ <= ]]> #{date}
+        <if test="gridList != null and gridList.size() > 0">
+        <foreach collection="gridList" item="gridId" index="index">
+            AND GRID_ID != #{gridId}
+        </foreach>
+        </if>
         GROUP BY
             ORG_ID, ISSUE_STATUS
     </select>
@@ -34,6 +39,11 @@
                     i.DEL_FLAG = '0'
                   AND i.CUSTOMER_ID = #{customerId}
                   AND DATE(ip.CREATED_TIME) = #{date}
+        <if test="gridList != null and gridList.size() > 0">
+        <foreach collection="gridList" item="gridId" index="index">
+            AND i.GRID_ID != #{gridId}
+        </foreach>
+        </if>
                 GROUP BY
                     i.ORG_ID,
                     ip.ISSUE_STATUS
@@ -55,6 +65,11 @@
           AND ISSUE_STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE(UPDATED_TIME) <![CDATA[ <= ]]> #{date}
+        <if test="gridList != null and gridList.size() > 0">
+        <foreach collection="gridList" item="gridId" index="index">
+            AND GRID_ID != #{gridId}
+        </foreach>
+        </if>
         GROUP BY
             ORG_ID,
             RESOLVE_TYPE
@@ -72,6 +87,11 @@
           AND ISSUE_STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE(UPDATED_TIME) = #{date}
+        <if test="gridList != null and gridList.size() > 0">
+        <foreach collection="gridList" item="gridId" index="index">
+            AND GRID_ID != #{gridId}
+        </foreach>
+        </if>
         GROUP BY
             ORG_ID,
             RESOLVE_TYPE
@@ -301,4 +321,31 @@
         </foreach>
         order by a.category_type,a.sort
     </select>
+    <select id="getIssueTotalList" resultType="com.epmet.dto.issue.IssueDTO">
+        SELECT ORG_ID AS "agencyId",
+               ORG_ID_PATH AS "pIds",
+               ISSUE_STATUS AS "status",
+               COUNT(ID) AS "count"
+        FROM
+            issue
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND DATE(UPDATED_TIME) <![CDATA[ <= ]]> #{date}
+        GROUP BY
+            ORG_ID, ISSUE_STATUS
+    </select>
+
+    <select id="selectProjectByGrids" resultType="java.lang.String">
+        SELECT DISTINCT
+        ipr.project_id
+        FROM
+        issue_project_relation ipr
+        INNER JOIN issue i ON ipr.issue_id = i.id
+        WHERE 1=1
+        <foreach collection="gridIds" item="id" open="AND (" separator=" OR " close=")">
+            i.grid_id = #{id}
+        </foreach>
+    </select>
+
 </mapper>

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

@@ -106,4 +106,24 @@
             csg.DEL_FLAG = '0'
           AND csg.CUSTOMER_ID = #{customerId}
     </select>
+    <select id="getDelGridList" resultType="java.lang.String">
+        select
+            ID
+        from
+            customer_grid
+        where
+            DEL_FLAG = '1'
+         and customer_id = #{customerId}
+    </select>
+
+    <select id="selectDelGridList" resultType="java.lang.String">
+        SELECT
+            id
+        FROM
+            customer_grid
+        WHERE
+            del_flag != '0'
+        AND customer_id = #{customerId}
+    </select>
+
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -29,6 +29,8 @@
         customer_id,
         month_id,
         org_id,
+        pid,
+        pids,
         org_name,
         meeting_code,
         type_code,
@@ -51,6 +53,8 @@
             #{monthId},
 
             #{item.orgId},
+            #{item.pid},
+            #{item.pids},
             #{item.orgName},
             #{item.meetingCode},
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@@ -25,16 +25,8 @@ import java.util.List;
 @RequestMapping("pacustomer")
 public class PaCustomerController {
 
-    @Autowired
-    private PaUserService paUserService;
     @Autowired
     private PaCustomerService paCustomerService;
-    @Autowired
-    private PaCustomerAgencyService paCustomerAgencyService;
-    @Autowired
-    private PaCustomerUserAgencyService paCustomerUserAgencyService;
-    @Autowired
-    private CustomerMpService customerMpService;
 
     @GetMapping("{id}")
     public Result<PaCustomerDTO> get(@PathVariable("id") String id){
@@ -130,7 +122,7 @@ public class PaCustomerController {
      * @Description 根据初始化状态获取公众号注册的客户列表
      **/
     @PostMapping(value = "registerbyauth")
-    public Result<List<RegisterByAuthResultDTO>> registerByAuth(@LoginUser TokenDto tokenDTO, @RequestBody RegisterByAuthFormDTO formDTO) {
+    public Result<List<RegisterByAuthResultDTO>> registerByAuth(@RequestBody RegisterByAuthFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<RegisterByAuthResultDTO>>().ok( paCustomerService.registerByAuth(formDTO));
     }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -439,6 +439,7 @@ public class AccessServiceImpl implements AccessService {
 
     @Override
     public Set<String> listOperationPermissions(String staffId, String currAgencyId) {
+        Set<String> filtedOps = new HashSet<>();
 
         LoginUserDetailsResultDTO userDetails = getLoginUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
         if (userDetails == null) {
@@ -476,7 +477,9 @@ public class AccessServiceImpl implements AccessService {
 
         CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
         if (currAgencyDto == null || currAgencyDto.getId() == null) {
-            throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
+            logger.warn(String.format("根据组织ID:{}未找到组织信息，返回空权限列表", currAgencyId));
+            return filtedOps;
+            //throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
         }
 
         // 获取机关单位中的角色
@@ -489,8 +492,6 @@ public class AccessServiceImpl implements AccessService {
         String currOrgIdPath = getOrgIdPath(currAgencyDto);
         String currOrgRelation = getCurrOrgRelation(belongOrgIdPath, currOrgIdPath);
 
-        Set<String> filtedOps = new HashSet<>();
-
         if (!CollectionUtils.isEmpty(roleList)) {
             roleList.forEach(role -> {
                 List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(role.getId());

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml

@@ -38,7 +38,7 @@
         hc.CONFIGURATION_DESCRIPTION,
         chd.REGION,
         chd.CONFIGURATION,
-        chd.DEMO_DATA,
+        hc.DEMO_DATA,
         chd.DISPLAY_ORDER
     FROM
         (

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -224,6 +224,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + NumConstant.FIFTY);
 		groupInvitationEntity.setValidEndTime(calendar.getTime());
 		groupInvitationEntity.setResiGroupId(formDTO.getGroupId());
+		groupInvitationEntity.setCustomerId(resiGroupDTO.getCustomerId());
 		insert(groupInvitationEntity);
 		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
 		resultDTO.setInvitationId(groupInvitationEntity.getId());

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml

@@ -22,6 +22,7 @@
         <if test='null != gridId and "" != gridId'>
             and rg.grid_id = #{gridId}
         </if>
+        order by rgc.CREATED_TIME desc limit 1
     </select>
 
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -290,6 +290,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 		//补充信息更新到党员基本信息表
 		PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO);
+		if (null == partyMemberInfo) {
+			log.warn("partymemberInfoService.getPartyMemberInfo return null,this partyMember maybe have audited,param:{}", JSON.toJSON(infoDTO));
+			return new Result();
+		}
 		infoDTO.setId(partyMemberInfo.getId());
 		partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class));
 		PartymemberConfirmManualDTO partymemberConfirmManualDTO =

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java

@@ -74,7 +74,7 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
      * @author wangc
      * @date 2020.07.27 00:58
     **/
-    List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds, @Param("realName")String realName);
+    List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("customerId") String customerId, @Param("realName")String realName);
 
     //临时用下in
     List<UserWechatDTO> selectNotInUserBaseInfoTemp();

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

@@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -190,23 +191,10 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      **/
     @Override
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
-        List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
-        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
-        if(null == userIds) userIds = new LinkedList<>();
-        CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO();
-        customerParam.setCustomerId(customerUserFormDTO.getCustomerId());
-        Result<List<String>> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam);
-        if(volunteer.success() && null != volunteer.getData() && !volunteer.getData().isEmpty()){
-            userIds.addAll(volunteer.getData());
-            userIds = userIds.stream().distinct().collect(Collectors.toList());
-        }
-        if(null == userIds || userIds.isEmpty()){
-            return allData;
-        }
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
-        allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
+        List<CustomerUser4PointResultDTO> allData = userWechatDao.selectResiAndStrangerInfo(customerUserFormDTO.getCustomerId(),customerUserFormDTO.getName());
-        if(null == allData || allData.isEmpty()){
+        if (CollectionUtils.isEmpty(allData)){
-            return allData;
+            return new ArrayList<>();
         }
         allData.forEach(info -> {
             if(StringUtils.isNotBlank(info.getUserId())){

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

@@ -311,6 +311,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}else{
 			log.error("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
+			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode());
 		}
 
 		return result;

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -22,7 +22,7 @@
                     pr.STAFF_ID = #{userId}
                 </foreach>
                 )
-        GROUP BY pr.STAFF_ID ORDER BY pr.CREATED_TIME DESC)t
+        ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID
     </select>
 
     <!-- 巡查记录查询 -->

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -125,9 +125,7 @@
             wechat.DEL_FLAG = '0'
             AND (wechat.NICKNAME IS NOT NULL OR wechat.NICKNAME <![CDATA[ <> ]]> '')
             AND (base.SURNAME IS NOT NULL OR base.SURNAME <![CDATA[ <> ]]> '')
-            <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
+            AND wechat.CUSTOMER_ID = #{customerId}
-                wechat.USER_ID = #{item}
-            </foreach>
             <if test='null != realName and "" != realName'>
                 AND (base.REAL_NAME LIKE concat('%',#{realName},'%') OR wechat.NICKNAME LIKE concat('%',#{realName},'%'))
             </if>