Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java

@@ -23,4 +23,14 @@ public class CategoryAnalysisResultDTO implements Serializable {
 	 * 项目总数
 	 */
 	private Integer projectTotal;
+
+	/**
+	 * 数据更新至
+	 */
+	private String dateId;
+
+	/**
+	 * 分类编码
+	 */
+	private String categoryCode;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDetailFormDTO.java

@@ -16,4 +16,7 @@ public class ScreenProjectDetailFormDTO implements Serializable {
 
     @NotBlank(message = "projectId不能为空")
     private String projectId;
+
+    @NotBlank(message = "customerId不能为空")
+    private String customerId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java

@@ -37,4 +37,8 @@ public class SubAgencyIndexRankResultDTO implements Serializable {
      * 服务能力
      */
     private Double serviceAbility = 0.0;
+
+    private String orgId;
+    private String orgType;
+    private String areaCode;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -74,7 +74,9 @@ public class ScreenProjectController {
      * @Date 2021/2/24 16:10
      */
     @PostMapping("projectdetailv2")
-    public Result projectDetail(@RequestBody ScreenProjectDetailFormDTO formDTO){
+    public Result projectDetail(@RequestHeader("CustomerId") String customerId,@RequestBody ScreenProjectDetailFormDTO formDTO){
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO);
         return screenProjectService.projectDistributionDetail(formDTO);
     }
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -150,6 +150,14 @@ public interface ScreenCustomerAgencyDao {
      **/
     List<GridNodeDTO> selectGridList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId);
 
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param areaCode
+     * @param agencyId
+     * @author yinzuomei
+     * @description 下一级组织+直属网格
+     * @Date 2021/5/10 14:02
+     **/
     List<String> getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);
 
     List<String> selectSubAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java

@@ -17,11 +17,16 @@ public interface ScreenProjectDataDao {
 
     List<String> selectIdsByAreaCode(@Param("areaCode") String areaCode);
 
-    List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId);
+    List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId,
+                                                                 @Param("customerId") String customerId);
 
-    List<String> selectProjectImgs(@Param("projectId") String projectId);
+    List<String> selectProjectImgs(@Param("projectId") String projectId,
+                                   @Param("customerId") String customerId);
 
-    List<ScreenProjectDetailResultDTO.processDTO> selectProjectProcess(@Param("projectId") String projectId);
+    List<ScreenProjectDetailResultDTO.processDTO> selectProjectProcess(@Param("projectId") String projectId,
+                                                                       @Param("customerId") String customerId);
 
-    List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> selectProjectProcessAttachments(@Param("processId") String processId);
+    List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> selectProjectProcessAttachments(@Param("processId") String processId,
+                                                                                                @Param("projectId") String projectId,
+                                                                                                @Param("customerId") String customerId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -303,7 +303,7 @@ public class AgencyServiceImpl implements AgencyService {
      * @param agencyId
      * @return java.util.List<java.lang.String>
      * @author yinzuomei
-     * @description 获取当前组织的下级组织集合
+     * @description 获取当前组织的下级组织集合:下一级组织+直属网格
      * @Date 2021/2/25 16:52
      **/
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -67,6 +67,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
         if(StringUtils.isNotBlank(param.getAreaCode())){
             logger.info(String.format("党员基本情况-饼状图概况按照areaCode查询：%s",param.getAreaCode()));
+            //下一级组织+直属网格
             List<String> ids=screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(),param.getAgencyId());
             if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(ids)){
                 PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercentByIds(ids);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -404,6 +404,7 @@ public class IndexServiceImpl implements IndexService {
             List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
             // 小数四舍五入
             streetList.forEach(indexRank -> {
+                indexRank.setOrgType("street");
                 indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
                 indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
                 indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
@@ -414,6 +415,7 @@ public class IndexServiceImpl implements IndexService {
         List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
         // 小数四舍五入
         gridList.forEach(indexRank -> {
+            indexRank.setOrgType("grid");
             indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
             indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
             indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java

@@ -119,11 +119,17 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) {
+        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
 
         List<String> subAgencyIdorGridIdList=screenCustomerAgencyService.getNextAgencyIds(contactMassLineChartFormDTO.getAreaCode(),contactMassLineChartFormDTO.getAgencyId());
         log.info("当前组织的下级id:"+JSON.toJSONString(subAgencyIdorGridIdList));
-
-        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
+        if(CollectionUtils.isEmpty(subAgencyIdorGridIdList)){
+            //如果没有下级组织或者直属网格
+            result.setXAxis(new ArrayList<>());
+            result.setGroupMemberData(new ArrayList<>());
+            result.setGroupData(new ArrayList<>());
+            return result;
+        }
         // List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
         //多客户版修改如下：
         List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChartByAgencyIds(subAgencyIdorGridIdList);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -74,29 +74,31 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         // 1：红色：为刚提交未做任何响应处理未结案的项目；
         // 2：黄色: 至少做过一次响应处理答复但未结案的项目；
         // 3：绿色：已经结案的项目。
-        List<String> areaIds = null;
+        List<String> orgIds = null;
         if (StringUtils.isNotBlank(formDTO.getAreaCode())){
-            areaIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode());
+            //所有组织+网格
+            orgIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode());
         }
         if (formDTO.getPageSize() == null){
             formDTO.setPageSize(NumConstant.TWO_HUNDRED);
         }
-        List<ScreenProjectDistributionResultDTO> resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel(),formDTO.getPageSize());
+        List<ScreenProjectDistributionResultDTO> resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),orgIds,formDTO.getLevel(),formDTO.getPageSize());
         return resultDTOS;
     }
 
     @Override
     public Result projectDistributionDetail(ScreenProjectDetailFormDTO formDTO) {
-        List<ScreenProjectDetailResultDTO> resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId());
+        List<ScreenProjectDetailResultDTO> resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId(),formDTO.getCustomerId());
         resultDTOS.forEach(item -> {
             //项目图片
-            List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId());
+            List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),formDTO.getCustomerId());
             item.setImgList(imgList);
             //项目处理流程
-            List<ScreenProjectDetailResultDTO.processDTO> processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId());
+            List<ScreenProjectDetailResultDTO.processDTO> processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId(),formDTO.getCustomerId());
                 //流程附件
             processDTOS.forEach(processDTO -> {
-                List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> attachmentDTOS = screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId());
+                List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> attachmentDTOS =
+                        screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId(),formDTO.getProjectId(),formDTO.getCustomerId());
                 processDTO.setAttachments(attachmentDTOS);
             });
             item.setProcessList(processDTOS);

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

@@ -272,6 +272,7 @@
             and grid.PARENT_AGENCY_ID=#{agencyId}
     </select>
 
+    <!--     下一级组织+直属网格 -->
     <select id="getNextAgencyIds" parameterType="map" resultType="java.lang.String">
         SELECT
             sca.AGENCY_ID as   orgId

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

@@ -289,7 +289,9 @@
             sca.AGENCY_NAME AS NAME,
             sy.govern_ablity AS governAbility,
             sy.party_dev_ablity AS partyDevAbility,
-            sy.service_ablity AS serviceAbility
+            sy.service_ablity AS serviceAbility,
+            sy.ORG_ID as orgId,
+            sca.area_code as areaCode
         FROM screen_customer_agency sca
         left join screen_index_data_yearly sy
         on(sca.AGENCY_ID=sy.ORG_ID
@@ -310,7 +312,9 @@
             scg.GRID_NAME AS NAME,
             sy.govern_ablity AS governAbility,
             sy.party_dev_ablity AS partyDevAbility,
-            sy.service_ablity AS serviceAbility
+            sy.service_ablity AS serviceAbility,
+            sy.ORG_ID as orgId,
+            scg.area_code as areaCode
         FROM screen_customer_grid  scg
         left join screen_index_data_yearly sy
             on(scg.GRID_ID=sy.ORG_ID

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

@@ -6,28 +6,31 @@
 
     <select id="selectCategoryAnalysis" resultType="com.epmet.dto.result.screen.CategoryAnalysisResultDTO">
         SELECT D.CATEGORY_NAME AS categoryName,
-			 M.PROJECT_TOTAL  AS projectTotal
+			 M.PROJECT_TOTAL  AS projectTotal,
+			 m.DATE_ID as dateId,
+             m.CATEGORY_CODE as categoryCode
         FROM screen_project_category_org_daily m
         left join customer_project_category_dict d
          on(m.CATEGORY_CODE=D.CATEGORY_CODE
                 AND D.DEL_FLAG='0'
                 and d.CUSTOMER_ID=#{customerId})
         WHERE M.DEL_FLAG = '0'
-                    AND M.ORG_ID = #{agencyId}
-                    AND M.DATE_ID = (
-                                    select
-                                            date_id
-                                    from
-                                            screen_project_category_org_daily
-                                    where
-                                            del_flag = '0'
-                                    and ORG_ID = #{agencyId}
-                                    and CUSTOMER_ID=#{customerId}
-                                    order by
-                                            date_id desc,
-                                            created_time desc
-                                    limit 1
-                    )
+        AND M.ORG_ID = #{agencyId}
+        and M.CUSTOMER_ID=#{customerId}
+        AND M.DATE_ID = (
+                        select
+                                date_id
+                        from
+                                screen_project_category_org_daily
+                        where
+                                del_flag = '0'
+                        and ORG_ID = #{agencyId}
+                        and CUSTOMER_ID=#{customerId}
+                        order by
+                                date_id desc,
+                                created_time desc
+                        limit 1
+        )
         ORDER BY M.PROJECT_TOTAL desc,D.CATEGORY_NAME asc
         limit 20
     </select>

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

@@ -72,11 +72,13 @@
         WHERE
             del_flag = '0'
             AND project_id = #{projectId}
+            and CUSTOMER_ID= #{customerId}
     </select>
     <select id="selectProjectImgs" resultType="java.lang.String">
         select PROJECT_IMG_URL from screen_project_img_data
         where del_flag = '0'
           and project_id = #{projectId}
+          and CUSTOMER_ID= #{customerId}
         order by sort asc
     </select>
     <select id="selectProjectProcess" resultType="com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO$processDTO">
@@ -90,6 +92,7 @@
         from screen_project_process
         where del_flag = '0'
           and project_id = #{projectId}
+          and CUSTOMER_ID= #{customerId}
         order by process_time asc
     </select>
     <select id="selectProjectProcessAttachments" resultType="com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO$processDTO$AttachmentDTO">
@@ -106,6 +109,8 @@
       where del_flag = '0'
        and file_place = 'public'
        AND PROCESS_ID=#{processId}
+       and project_id = #{projectId}
+       and CUSTOMER_ID= #{customerId}
       order by sort asc
     </select>
 </mapper>

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

@@ -232,7 +232,6 @@ public class ExitGroupServiceImpl implements ExitGroupService {
         }
         //3.修改组成员出入群记录表数据状态、删除组成员关系表数据、新增退群记录表数据
         //3.1.修改组成员出入群记录表数据状态 group_memeber_operation
-        // TODO ???
         GroupMemeberOperationDTO lastRec=groupMemeberOperationService.selectLatestRecord(formDTO.getGroupId(),formDTO.getUserId());
         GroupMemeberOperationDTO operationDTO = new GroupMemeberOperationDTO();
         operationDTO.setCustomerId(formDTO.getCustomerId());

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

@@ -97,20 +97,18 @@
 
     <select id="getMembersCountInGrid" resultType="integer">
         SELECT
-        COUNT(
-        DISTINCT
-        CUSTOMER_USER_ID
-        )
-        FROM
+        COUNT( DISTINCT member.CUSTOMER_USER_ID )
+    FROM
         RESI_GROUP groupp
-        INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND member.STATUS <![CDATA[<>]]> 'removed'
-        WHERE
+        INNER JOIN RESI_GROUP_MEMBER member
+        ON (member.RESI_GROUP_ID = groupp.ID
+            AND member.DEL_FLAG = '0'
+            AND member.STATUS not in( 'removed','exit')
+        )
+    WHERE
         groupp.DEL_FLAG = '0'
-        AND
-        groupp.GRID_ID = #{gridId}
-        AND
-        groupp.STATE = 'approved'
-
+        AND groupp.GRID_ID = #{gridId}
+        AND groupp.STATE = 'approved'
     </select>
 
     <select id="getMembersCountInGrids" resultType="com.epmet.resi.group.dto.member.result.VotableCountResultDTO">