Merge remote-tracking branch 'origin/dev'

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

@@ -620,7 +620,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         formDTO.setPageNo((formDTO.getPageNo() - 1) * formDTO.getPageSize());
 
         //地区编码如何是00结尾的则查询当前地区数据（实际业务不会存在，因为地区必须选到区县级）
-        if (areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)) {
+        if (StringUtils.isNotBlank(areaCode) && areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)) {
             //城市 - 查全部
             formDTO.setAreaCode(areaCode.substring(0, areaCode.length() - 2));
             List<PublicCustomerGridForStrangerResultDTO> gridList = baseDao.selectThirdGridByCityLike(formDTO);
@@ -631,13 +631,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             //行政区 - 指定行政区在前，所属城市下其余行政区在后
             Map<String, Object> map = new HashMap<>();
             map.put("customerId", formDTO.getCustomerId());
-            //地区码格式 六位 [abcxyz]
+            /*//地区码格式 六位 [abcxyz]
             //ab代表省
             map.put("areaCode", areaCode);
             //cx代表市
             map.put("cityCode", areaCode.substring(NumConstant.ZERO, areaCode.length() - NumConstant.TWO));
             //yz代表区
-            map.put("provinceCode", areaCode.substring(NumConstant.ZERO, areaCode.length() - NumConstant.FOUR));
+            map.put("provinceCode", areaCode.substring(NumConstant.ZERO, areaCode.length() - NumConstant.FOUR));*/
             map.put("pageSize", formDTO.getPageSize());
             map.put("pageNo", formDTO.getPageNo());
 

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

@@ -233,7 +233,7 @@ public class StaffServiceImpl implements StaffService {
 		customerAgencyService.update(oldAgencyDTO);
 		//新组织总人数加一
 		CustomerAgencyDTO newAgencyDTO = customerAgencyService.get(fromDTO.getAgencyId());
-		newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() - NumConstant.ONE);
+		newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() + NumConstant.ONE);
 		customerAgencyService.update(newAgencyDTO);
 		//5.逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1
 		customerDepartmentService.updateDepartment(fromDTO.getStaffId());

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

@@ -428,10 +428,10 @@
         ) agency ON grid.PID = agency.ID
        WHERE
            grid.del_flag = 0
-       AND
-           grid.area_code LIKE CONCAT(#{areaCode},'%')
-       AND
-           grid.customer_id = #{customerId}
+            <if test='areaCode != "" and areaCode != null'>
+               AND grid.area_code LIKE CONCAT(#{areaCode},'%')
+            </if>
+            AND grid.customer_id = #{customerId}
        ORDER BY
            grid.customer_id,
            CONVERT ( gridName USING gbk ) ASC
@@ -443,7 +443,6 @@
         SELECT
             c.*
         FROM
-        (
             (
                 SELECT
                     a.id AS grid_id,
@@ -468,45 +467,9 @@
                 ) agency ON a.PID = agency.ID
                 WHERE
                     a.del_flag = 0
-                AND a.area_code = #{areaCode}
-                AND a.customer_id = #{customerId}
-                ORDER BY
-                  CONVERT ( gridName USING gbk ) ASC
-                LIMIT 0,999999999999
-            )
-            UNION
-            (
-                SELECT
-                b.id AS grid_id,
-                b.customer_id,
-                concat(agency.fullname , '-' ,b.grid_name) as gridName
-                FROM
-                CUSTOMER_GRID b
-                LEFT JOIN (
-                    SELECT
-                        a1.id,
-                        CASE
-                        WHEN a2.ORGANIZATION_NAME IS NULL THEN
-                        a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
-                        END AS fullname
-                    FROM
-                        customer_agency a1
-                    LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
-                        AND a1.del_flag = '0'
-                    WHERE
-                        a1.del_flag = '0'
-                    AND a1.customer_id = #{customerId}
-                ) agency ON b.PID = agency.ID
-                WHERE
-                    b.del_flag = 0
-                AND b.customer_id = #{customerId}
-                AND b.area_code LIKE CONCAT(#{cityCode},'%')
-                AND  <![CDATA[ b.area_code <> #{areaCode}]]>
-                ORDER BY
-                    b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
-                LIMIT 0,999999999999
-            )
-        ) AS c
+                    AND a.customer_id = #{customerId}
+            ) AS c
+         ORDER BY  CONVERT ( gridName USING gbk ) ASC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@@ -24,14 +24,12 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
 import com.epmet.dto.result.PublicCustomerGridForStrangerResultDTO;
-import com.epmet.dto.result.PublicCustomerResultDTO;
 import com.epmet.entity.StrangerAccessRecordEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.service.StrangerAccessRecordService;
 import com.epmet.utils.ModuleConstant;
-import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -267,8 +265,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
                 formDTO.getSelectedAreaCode() : formDTO.getAreaCode());
         //分页参数设置
         third.setPageNo(null == formDTO.getPageNo() ? ModuleConstant.MIN_CURRENT_PAGE_NO : formDTO.getPageNo());
-        //third.setPageSize(formDTO.getPageSize());
-        third.setPageSize(200);
+        third.setPageSize(formDTO.getPageSize());
+        // third.setPageSize(200);
 
         //2.调用gov-org服务，查询客户网格列表数据
         Result<List<PublicCustomerGridForStrangerResultDTO>> queryResult = govOrgFeignClient.queryCustomerGridList(third);