Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -535,9 +535,9 @@ public class CustomerAgencyController {
      * @Author: lichao
      * @Date: 2023/4/7 14:48
      */
-    @GetMapping("getAgencyCountList")
+    @PostMapping("getAgencyCountList")
-    public Result<List<AgencyCountCensusResultDTO>> getAgencyCountList(@RequestParam String agencyId){
+    public Result<List<AgencyCountCensusResultDTO>> getAgencyCountList(@RequestBody CommunityCountCensusFormDTO dto){
-        return new Result<List<AgencyCountCensusResultDTO>>().ok(customerAgencyService.getAgencyCountList(agencyId));
+        return new Result<List<AgencyCountCensusResultDTO>>().ok(customerAgencyService.getAgencyCountList(dto));
     }
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -434,11 +434,11 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     List<AgencyResultDTO> getAllCommunity(String customerId);
 
-    List<AgencyCountCensusResultDTO> agencyCount(@Param("pids") String pids);
+    List<AgencyCountCensusResultDTO> agencyCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
-    Integer agencyGridCount(@Param("pids") String pids);
+    Integer agencyGridCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
-    Integer agencyStaffCount(@Param("pids") String pids);
+    Integer agencyStaffCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
     Integer getCommunityCount(@Param("pids")String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 

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

@@ -368,10 +368,10 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
 
     /**
      * 返回下级数量
-     * @param agencyId
+     * @param dto
      * @return
      */
-    List<AgencyCountCensusResultDTO> getAgencyCountList(String agencyId);
+    List<AgencyCountCensusResultDTO> getAgencyCountList(CommunityCountCensusFormDTO dto);
 
     /**
      * @Description: 获取下级组织的社区数量

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

@@ -1662,29 +1662,29 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
     /**
      * @Description:
-     * @param agencyId:
+     * @param dto:
      * @Return java.util.List<com.epmet.dto.result.AgencyCountCensusResultDTO>
      * @Author: lichao
      * @Date: 2023/4/7 14:17
      */
     @Override
-    public List<AgencyCountCensusResultDTO> getAgencyCountList(String agencyId) {
+    public List<AgencyCountCensusResultDTO> getAgencyCountList(CommunityCountCensusFormDTO dto) {
 
         List<AgencyCountCensusResultDTO> agencyCountCensusResultDTOS = new ArrayList<>();
 
-        CustomerAgencyEntity customerAgency = baseDao.selectById(agencyId);
+        CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId());
         if (customerAgency != null){
             String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids());
 
-            agencyCountCensusResultDTOS = baseDao.agencyCount(pids);
+            agencyCountCensusResultDTOS = baseDao.agencyCount(pids,dto.getTimeStart(),dto.getTimeEnd());
             AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO();
             agencyCountCensusResultDTOGrid.setLevel("grid");
-            agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids));
+            agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
             agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOGrid);
 
             AgencyCountCensusResultDTO agencyCountCensusResultDTOStaff = new AgencyCountCensusResultDTO();
             agencyCountCensusResultDTOStaff.setLevel("staff");
-            agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids));
+            agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
             agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff);
 
         }else{

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

@@ -889,6 +889,12 @@
         from customer_agency
         where DEL_FLAG = 0
             and PIDS like concat(#{pids},'%')
+        <if test="timeStart != null">
+            and agency.UPDATED_TIME &gt;= #{timeStart}
+        </if>
+        <if test="timeEnd != null">
+            and agency.UPDATED_TIME &lt;= #{timeEnd}
+        </if>
             group by level
 
     </select>
@@ -899,6 +905,12 @@
         from customer_grid
         where DEL_FLAG = 0
           and PIDS like concat(#{pids},'%')
+        <if test="timeStart != null">
+            and UPDATED_TIME &gt;= #{timeStart}
+        </if>
+        <if test="timeEnd != null">
+            and UPDATED_TIME &lt;= #{timeEnd}
+        </if>
 
     </select>
 
@@ -911,6 +923,12 @@
           and
               staff.DEL_FLAG = 0
           and agency.PIDS like concat(#{pids},'%')
+        <if test="timeStart != null">
+            and agency.UPDATED_TIME &gt;= #{timeStart}
+        </if>
+        <if test="timeEnd != null">
+            and agency.UPDATED_TIME &lt;= #{timeEnd}
+        </if>
 
     </select>
 
@@ -1212,10 +1230,10 @@
           and agency.LEVEL = 'community'
           and agency.PIDS like concat(#{pids},'%')
         <if test="timeStart != null">
-            and agency.CREATED_TIME &gt;= #{timeStart}
+            and agency.UPDATED_TIME &gt;= #{timeStart}
         </if>
         <if test="timeEnd != null">
-            and agency.CREATED_TIME &lt;= #{timeEnd}
+            and agency.UPDATED_TIME &lt;= #{timeEnd}
         </if>
     </select>
     <select id="getCommunityByPidList" resultType="com.epmet.dto.result.CommunityListByAgencyIdResultDTO">