Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

epmet-gateway/pom.xml

@@ -317,6 +317,7 @@
 
                 <!--19.政府端-权限-服务-->
                 <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
+                <!--<gateway.routes.gov-access-server.uri>http://localhost:8099</gateway.routes.gov-access-server.uri>-->
 
                 <!--20.政府端-我的-服务-->
                 <!--                <gateway.routes.gov-mine-server.uri>http://localhost:8098</gateway.routes.gov-mine-server.uri>-->

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

@@ -24,6 +24,7 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
      * @date 2022/7/28 10:22
      */
     List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO);
 
     /**
      * Desc: 【资源】获取公共服务信息
@@ -32,6 +33,7 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
      * @date 2022/7/28 10:22
      */
     List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO);
 
     /**
      * Desc: 【资源】获取重点危化品企业信息
@@ -40,6 +42,7 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
      * @date 2022/7/28 10:22
      */
     List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO);
 
     /**
      * Desc: 【资源】获取优势资源信息
@@ -48,6 +51,7 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
      * @date 2022/7/28 10:22
      */
     List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO);
 
     /**
      * Desc: 【资源】获取企事业单位巡查信息
@@ -56,5 +60,6 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
      * @date 2022/7/28 10:22
      */
     List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
 
 }

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

@@ -244,17 +244,23 @@ public class CoverageServiceImpl implements CoverageService {
                 PageInfo<UserInfoResultDTO> allIcUserPageInfo = getIcUserPageInfo(formDTO);
                 result.setUserInfos(allIcUserPageInfo.getList());
                 result.setUserInfosTotal(allIcUserPageInfo.getTotal());
-            }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){
+            }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){
+
                 for (String resource : resources) {
-                    if (MenusEnums.IC_EVENT.getUrl().equals(resource)){
-                        PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO);
-                        result.setEventInfos(eventPageInfo.getList());
-                        result.setEventInfoTotal(eventPageInfo.getTotal());
-                        break;
+                    if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){
+                        
+                    }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){
+
+                    }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){
+
+                    }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){
+
+                    }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){
+
+                    }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){
+
                     }
                 }
-            }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){
-
             }
         }else {
             // 查询居民
@@ -263,59 +269,73 @@ public class CoverageServiceImpl implements CoverageService {
             result.setUserInfosTotal(allIcUserPageInfo.getTotal());
             List<ResourceInfoResultDTO> reInfos = new ArrayList<>();
             for (String table : tables) {
+                if (formDTO.getIsPage() && reInfos.size() == formDTO.getPageSize()){
+                    break;
+                }
+                Integer flag = formDTO.getPageSize() - reInfos.size();
                 switch (table){
                     case TableConstant.IC_SUPERIOR_RESOURCE:
-                        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO));
                         List<ResourceInfoResultDTO> superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO);
-                        if (!superiorResourceInfos.isEmpty()){
+                        if (formDTO.getIsPage() && superiorResourceInfos.size() > flag){
+                            reInfos.addAll(superiorResourceInfos.subList(NumConstant.ZERO, flag));
+                        }else {
                             reInfos.addAll(superiorResourceInfos);
                         }
                         break;
                     case TableConstant.IC_CITY_MANAGEMENT:
-                        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO));
                         List<ResourceInfoResultDTO> cityManageInfos = govOrgService.getCityManageInfos(formDTO);
-                        if (!cityManageInfos.isEmpty()){
+                        if (formDTO.getIsPage() && cityManageInfos.size() > flag){
+                            reInfos.addAll(cityManageInfos.subList(NumConstant.ZERO,flag));
+                        }else {
                             reInfos.addAll(cityManageInfos);
                         }
                         break;
                     case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION:
-                        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO));
                         List<ResourceInfoResultDTO> communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO);
-                        if (!communitySelOrgInfos.isEmpty()){
+                        if (formDTO.getIsPage() && communitySelOrgInfos.size() > flag){
+                            reInfos.addAll(communitySelOrgInfos.subList(NumConstant.ZERO,flag));
+                        }else {
                             reInfos.addAll(communitySelOrgInfos);
                         }
                         break;
                     case TableConstant.IC_DANGEROUS_CHEMICALS:
-                        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO));
                         List<ResourceInfoResultDTO> dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO);
-                        if (!dangerousChemicalsInfos.isEmpty()){
+                        if (formDTO.getIsPage() && dangerousChemicalsInfos.size() > flag){
+                            reInfos.addAll(dangerousChemicalsInfos.subList(NumConstant.ZERO,flag));
+                        }else {
                             reInfos.addAll(dangerousChemicalsInfos);
                         }
                         break;
                     case TableConstant.IC_ENTERPRISE:
-                        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO));
                         List<ResourceInfoResultDTO> enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO);
-                        if (!enterpriseInfos.isEmpty()){
+                        if (formDTO.getIsPage() && enterpriseInfos.size() > flag){
+                            reInfos.addAll(enterpriseInfos.subList(NumConstant.ZERO,flag));
+                        }else {
                             reInfos.addAll(enterpriseInfos);
                         }
                         break;
                     case TableConstant.IC_PUBLIC_SERVICE:
-                        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO));
                         List<ResourceInfoResultDTO> publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO);
-                        if (!publicServiceInfos.isEmpty()){
+                        if (formDTO.getIsPage() && publicServiceInfos.size() > flag){
+                            reInfos.addAll(publicServiceInfos.subList(NumConstant.ZERO,flag));
+                        }else {
                             reInfos.addAll(publicServiceInfos);
                         }
                         break;
-                    case TableConstant.IC_EVENT:
-                        PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO);
-                        result.setEventInfos(eventPageInfo.getList());
-                        result.setEventInfoTotal(eventPageInfo.getTotal());
-                        break;
                     default:
                         break;
                 }
             }
             result.setResourceInfos(reInfos);
+            result.setResourceInfoTotal(Long.valueOf(String.valueOf(reInfos.size())));
+        }
+        for (String resource : resources) {
+            if (MenusEnums.IC_EVENT.getUrl().equals(resource)){
+                PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO);
+                result.setEventInfos(eventPageInfo.getList());
+                result.setEventInfoTotal(eventPageInfo.getTotal());
+                break;
+            }
         }
         return result;
     }

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

@@ -20,7 +20,9 @@
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
           AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+          <if test=' name != null and name != "" '>
               AND `NAME` LIKE CONCAT('%',#{name},'%')
+          </if>
     </select>
 
     <select id="getPublicServiceInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
@@ -40,7 +42,9 @@
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
           AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+          <if test=' name != null and name != "" '>
               AND `NAME` LIKE CONCAT('%',#{name},'%')
+          </if>
     </select>
 
     <select id="getDangerousChemicalsInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
@@ -58,7 +62,9 @@
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
           AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+          <if test=' name != null and name != "" '>
               AND `NAME` LIKE CONCAT('%',#{name},'%')
+          </if>
     </select>
 
     <select id="getSuperiorResourceInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
@@ -76,7 +82,9 @@
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
           AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+          <if test=' name != null and name != "" '>
               AND `NAME` LIKE CONCAT('%',#{name},'%')
+          </if>
     </select>
 
     <select id="getEnterpriseInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
@@ -93,6 +101,58 @@
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
           AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
+          <if test=' name != null and name != "" '>
               AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%')
+          </if>
+    </select>
+    <select id="getCityManageInfosCount" resultType="java.lang.Integer">
+        select count(id)
+        FROM ic_city_management
+        WHERE DEL_FLAG = 0
+        AND CUSTOMER_ID = #{customerId}
+        AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+        <if test=' name != null and name != "" '>
+            AND `NAME` LIKE CONCAT('%',#{name},'%')
+        </if>
+    </select>
+    <select id="getPublicServiceInfosCount" resultType="java.lang.Integer">
+        select count(id)
+        FROM ic_public_service
+        WHERE DEL_FLAG = 0
+        AND CUSTOMER_ID = #{customerId}
+        AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+        <if test=' name != null and name != "" '>
+            AND `NAME` LIKE CONCAT('%',#{name},'%')
+        </if>
+    </select>
+    <select id="getDangerousChemicalsInfosCount" resultType="java.lang.Integer">
+        select count(id)
+        FROM ic_dangerous_chemicals
+        WHERE DEL_FLAG = 0
+        AND CUSTOMER_ID = #{customerId}
+        AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+        <if test=' name != null and name != "" '>
+            AND `NAME` LIKE CONCAT('%',#{name},'%')
+        </if>
+    </select>
+    <select id="getSuperiorResourceInfosCount" resultType="java.lang.Integer">
+        select count(id)
+        FROM ic_superior_resource
+        WHERE DEL_FLAG = 0
+        AND CUSTOMER_ID = #{customerId}
+        AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+        <if test=' name != null and name != "" '>
+            AND `NAME` LIKE CONCAT('%',#{name},'%')
+        </if>
+    </select>
+    <select id="getEnterpriseInfosCount" resultType="java.lang.Integer">
+        select count(id)
+        FROM ic_enterprise
+        WHERE DEL_FLAG = 0
+        AND CUSTOMER_ID = #{customerId}
+        AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
+        <if test=' name != null and name != "" '>
+            AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%')
+        </if>
     </select>
 </mapper>

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

@@ -16,6 +16,8 @@
           AND customer_id = #{customerId}
           AND DIFFICULT_POINT = '1'
           AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%')
+          <if test=' name != null and name != "" '>
               AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%')
+          </if>
     </select>
 </mapper>

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

@@ -328,6 +328,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         }
         //查不到工作人员就直接返回
         if (null == userResult.getData()) {
+            resultDTO.setType(true);
             return resultDTO;
         }
 
@@ -497,13 +498,14 @@ public class DepartmentServiceImpl implements DepartmentService {
         if (!projectResult.success()) {
             throw new RenException("获取工作人员代办项目数据失败" + projectResult.getMsg());
         }
-        if(projectResult.getData().size()>NumConstant.ZERO){
-            String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作",("party_unit".equals(formDTO.getDeptType())?"联建单位":"社会自组织"));
+        if (projectResult.getData().size() > NumConstant.ZERO) {
+            String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作", ("party_unit".equals(formDTO.getDeptType()) ? "联建单位" : "社会自组织"));
             resultDTO.setMsg(msg);
+            return resultDTO;
         }
         //2.无代办项目的则删除部门、工作人员信息、修改联建单位/社会自组织业务数据
         //2-1.删除部门
-        customerDepartmentDao.deleteById(formDTO.getId());
+        customerDepartmentDao.deleteById(formDTO.getDeptId());
         //2-2.删除部门人员关系数据
         LambdaQueryWrapper<CustomerStaffDepartmentEntity> query = new LambdaQueryWrapper<>();
         query.eq(CustomerStaffDepartmentEntity::getDepartmentId, formDTO.getDeptId());
@@ -511,7 +513,6 @@ public class DepartmentServiceImpl implements DepartmentService {
         customerStaffDepartmentDao.delete(query);
         //2-3.删除人员注册关系数据
         LambdaQueryWrapper<StaffOrgRelationEntity> StaffOrgRelation = new LambdaQueryWrapper<>();
-        StaffOrgRelation.eq(StaffOrgRelationEntity::getOrgId, formDTO.getDeptId());
         StaffOrgRelation.eq(StaffOrgRelationEntity::getStaffId, formDTO.getDeptStaffId());
         staffOrgRelationDao.delete(StaffOrgRelation);
         //2-4.删除工作人员数据

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

@@ -886,9 +886,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
         //2.查询客户管理平台对应角色【联建单位负责人、社区自组织负责人】
         GovRoleListDTO roleDTO = new GovRoleListDTO();
-        roleDTO.setName("party_unit".equals(fromDTO.getDeptType())?"联建单位负责人":"社区自组织负责人");
+        roleDTO.setCustomerId(fromDTO.getCustomerId());
+        roleDTO.setName("party_unit".equals(fromDTO.getDeptType()) ? "联建单位负责人" : "社区自组织负责人");
         Result<GovRoleDTO> resultRole = govAccessFeignClient.getGovRole(roleDTO);
-        if (!resultRole.success()) {
+        if (!resultRole.success() || null == resultRole.getData()) {
             throw new RenException("人员添加失败" + resultRole.getMsg());
         }
         List<String> newRoles = new ArrayList<>();