Merge branch 'develop' into release_temp

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

@@ -53,7 +53,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
 
     /**
      * @Author sun
-     * @Description 根据组织Id查询当前组织下所有网格列表
+     * @Description 根据组织Id查询当前组织下所有网格列表(未弃用的网格)
      **/
     List<GridInfoResultDTO> selectGridListByAgencyId(@Param("agencyId") String agencyId);
 

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

@@ -53,6 +53,7 @@
         WHERE
             del_flag = '0'
         AND pid = #{agencyId}
+        and ABANDON_FLAG='0'
     </select>
 
     <select id="gridListByStaffId" resultType="com.epmet.dataaggre.dto.govorg.CustomerGridDTO">

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityListResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/21 15:11
+ * @DESC
+ */
+@Data
+public class CommunityListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4336149113821131764L;
+
+    private String orgId;
+
+    private String orgName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -596,4 +596,13 @@ public interface GovOrgOpenFeignClient {
      */
     @GetMapping("/gov/org/icbuildingunit/{id}")
     Result<IcBuildingUnitDTO> getUnitById(@PathVariable("id") String id);
+
+    /**
+     * Desc: 查询网格下所有的工作人员
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/21 16:02
+     */
+    @PostMapping("/gov/org/customerstaffgrid/getallstaffbygridid")
+    Result<List<String>> getAllStaffByGridId(@RequestParam("gridId")String gridId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -388,4 +388,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<IcBuildingUnitDTO> getUnitById(String id) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getUnitById", id);
     }
+
+    @Override
+    public Result<List<String>> getAllStaffByGridId(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAllStaffByGridId", gridId);
+    }
 }

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

@@ -442,6 +442,14 @@ public class AgencyController {
         }
     }
 
-
-
+    /**
+     * Desc: 查询工作人员所属组织下的所有社区
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/21 15:13
+     */
+    @PostMapping("community-list")
+    public Result<List<CommunityListResultDTO>> getCommunityList(@LoginUser TokenDto tokenDto){
+        return new Result<List<CommunityListResultDTO>>().ok(agencyService.getCommunityList(tokenDto));
+    }
 }

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

@@ -145,4 +145,15 @@ public class CustomerStaffGridController {
     public Result<List<EventTitleOrgResultDTO>> eventOrg(@LoginUser TokenDto tokenDto){
         return new Result<List<EventTitleOrgResultDTO>>().ok(customerStaffGridService.eventOrg(tokenDto.getUserId()));
     }
+
+    /**
+     * Desc: 查询网格下所有的工作人员
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/21 16:02
+     */
+    @PostMapping("getallstaffbygridid")
+    public Result<List<String>> getAllStaffByGridId(@RequestParam("gridId")String gridId){
+        return new Result<List<String>>().ok(customerStaffGridService.getAllStaffByGridId(gridId));
+    }
 }

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

@@ -306,5 +306,15 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId);
 
     int updateSubAgencyAreaCodeById(@Param("customerId")String customerId, @Param("agencyId")String agencyId, @Param("operateUserId") String operateUserId);
+
+    /**
+     * Desc: 查询组织下的社区
+     * @param customerId
+     * @param agencyId
+     * @author zxc
+     * @date 2022/3/21 15:23
+     */
+    List<CommunityListResultDTO> getCommunityList(@Param("customerId")String customerId, @Param("agencyId")String agencyId);
+
 }
 

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

@@ -172,7 +172,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
 
     /**
-     * @Description 根据组织机关Id查询机关下网格列表
+     * @Description 根据组织机关Id查询机关下网格列表:未废弃的
      * @author sun
      */
     List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId);

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

@@ -88,7 +88,7 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 * @return com.epmet.dto.result.ActSponsorResultDTO
 	 * @param staffId
 	 * @author yinzuomei
-	 * @description 根据staffId查询我所在的网格信息
+	 * @description 根据staffId查询我所在的网格信息，限制网格是未废弃的网格
 	 * @Date 2020/7/23 21:04 
 	 **/
 	List<ActSponsorGridInfo>  selectActSponsorGrid(String staffId);

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

@@ -121,4 +121,13 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      * @return
      */
     List<StaffOrgRelationDTO> getGridStaffList(String gridId);
+
+    /**
+     * Desc: 查询网格下所有的工作人员
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/21 16:02
+     */
+    List<String> getAllStaffByGridId(String gridId);
+
 }

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

@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -156,4 +139,12 @@ public interface AgencyService {
      */
     List<SonOrgResultDTO> getSonAgencyId(String orgId,String type);
 
+    /**
+     * Desc: 查询工作人员所属组织下的所有社区
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/21 15:13
+     */
+    List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto);
+
 }

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

@@ -135,4 +135,13 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      * @date 2021/8/5 5:36 下午
      */
     List<EventTitleOrgResultDTO> eventOrg(String userId);
+
+    /**
+     * Desc: 查询网格下所有的工作人员
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/21 16:02
+     */
+    List<String> getAllStaffByGridId(String gridId);
+
 }

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

@@ -798,6 +798,22 @@ public class AgencyServiceImpl implements AgencyService {
         return new ArrayList<>();
     }
 
+    /**
+     * Desc: 查询工作人员所属组织下的所有社区
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/21 15:13
+     */
+    @Override
+    public List<CommunityListResultDTO> getCommunityList(TokenDto tokenDto) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询到工作人员信息"+staffInfo.getStaffId());
+        }
+        String agencyId = staffInfo.getAgencyId();
+        return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
+    }
+
     private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
         CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         insertEntity.setOrganizationName(formDTO.getAgencyName());

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

@@ -439,7 +439,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             });
         }
         //3:根据组织Id查询该组织下网格、人员列表
-        //3.1:查询组织下网格列表
+        //3.1:查询组织下网格列表:未废弃的
         List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId());
         List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>();
         if (null != gridList && gridList.size() > NumConstant.ZERO) {
@@ -872,6 +872,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             resultDTO.setAgencyId(customerAgency.getId());
             resultDTO.setAgencyName(customerAgency.getOrganizationName());
         }
+        //限制网格是未废弃的网格
         List<ActSponsorGridInfo> list=customerStaffAgencyDao.selectActSponsorGrid(staffId);
         resultDTO.setAgencyGridList(list);
         return resultDTO;

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

@@ -970,17 +970,20 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     public void abandonGrid(AbandonGridFormDTO formDTO) {
         //未处理的事件
-        Result<Boolean> eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId());
+        Result<ProjectAuditResetResultDTO> projectDb = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId());
         //表决中的议题
         Result<Boolean> issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId());
-        if (!eventRes.success() || !issueAuditReset.success()) {
+        if (!projectDb.success() || !issueAuditReset.success()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "校验数据异常", "服务器开小差了...");
         }
-        if (eventRes.getData()) {
+        if (projectDb.getData().getResiEventStatus()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未处理的事件", "该网格存在未办结的群众直报事件，请先将事件办结后再操作");
         }
+        if (projectDb.getData().getProjectStatus()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未办结的项目", "该网格工作人员名下存在未结案的项目，请先将项目结案或转其它科室部门后再操作");
+        }
         if (issueAuditReset.getData()) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题，请处理完再操作");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题，请先将议题关闭后再操作");
         }
 
         //可以弃用、处理数据(网格工作人员所属关系(网格工作人员人数), 删除正在审核中的徽章认证)

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

@@ -191,4 +191,15 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
     public List<EventTitleOrgResultDTO> eventOrg(String userId) {
         return baseDao.eventOrg(userId);
     }
+
+    /**
+     * Desc: 查询网格下所有的工作人员
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/21 16:02
+     */
+    @Override
+    public List<String> getAllStaffByGridId(String gridId) {
+        return baseDao.getAllStaffByGridId(gridId);
+    }
 }

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

@@ -733,6 +733,18 @@
           AND PID = #{orgId}
     </select>
 
+    <!-- 查询组织下的社区 -->
+    <select id="getCommunityList" resultType="com.epmet.dto.result.CommunityListResultDTO">
+        SELECT
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName
+        FROM customer_agency
+        WHERE DEL_FLAG = '0'
+          AND `LEVEL` = 'community'
+          AND CUSTOMER_ID = #{customerId}
+          AND CONCAT(PIDS,':',ID) LIKE CONCAT('%',#{agencyId},'%')
+    </select>
+
     <update id="updateSubAgencyAreaCodeById" parameterType="map">
         UPDATE customer_agency
         SET AREA_CODE = '',

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

@@ -369,6 +369,7 @@
             <!-- AND cg.del_flag = 0 --><!-- 网格被删除时，首次在该网格注册的居民就找不到了所属网格，暂时关闭这个查询条件，避免缓存中user的showname和组成员member的usershowname出现空值 -->
     </select>
 
+    <!--    根据组织机关Id查询机关下网格列表:未废弃的 -->
     <select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">
         SELECT
             id AS "gridId",

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

@@ -125,7 +125,7 @@
         </if>
     </select>
 
-    <!--   根据staffId查询我所在的网格信息 -->
+    <!--   根据staffId查询我所在的网格信息，限制网格是未废弃的网格 -->
     <select id="selectActSponsorGrid" resultType="com.epmet.dto.result.ActSponsorGridInfo" parameterType="java.lang.String">
         SELECT
             csg.GRID_ID,
@@ -136,6 +136,7 @@
             LEFT JOIN customer_agency ca ON ( cg.PID = ca.ID AND ca.DEL_FLAG = '0' )
         WHERE
             csg.DEL_FLAG = '0'
+            and cg.ABANDON_FLAG='0'
             AND csg.USER_ID =#{staffId}
     </select>
     <!--    根据staffId，查询我所属的组织信息 -->

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

@@ -187,4 +187,13 @@
             csg.del_flag = '0'
             AND csg.GRID_ID = #{gridId}
     </select>
+
+    <!-- 查询网格下所有的工作人员 -->
+    <select id="getAllStaffByGridId" resultType="java.lang.String">
+        SELECT
+            USER_ID
+        FROM customer_staff_grid
+        WHERE DEL_FLAG = '0'
+          AND GRID_ID = #{gridId}
+    </select>
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectAuditResetResultDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/21 15:48
+ * @DESC
+ */
+@Data
+public class ProjectAuditResetResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4523314881244005376L;
+
+    private Boolean projectStatus;
+
+    private Boolean resiEventStatus;
+
+    public ProjectAuditResetResultDTO() {
+        this.projectStatus = false;
+        this.resiEventStatus = false;
+    }
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -157,5 +157,5 @@ public interface GovProjectOpenFeignClient {
 	 * @date 2022/3/15 5:05 下午
 	 */
 	@PostMapping("gov/project/project/audit-reset")
-	Result<Boolean> eventAuditReset(@RequestParam("gridId")String gridId);
+	Result<ProjectAuditResetResultDTO> eventAuditReset(@RequestParam("gridId")String gridId);
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -156,7 +156,7 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	}
 
     @Override
-    public Result<Boolean> eventAuditReset(String gridId) {
+    public Result<ProjectAuditResetResultDTO> eventAuditReset(String gridId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "eventAuditReset",gridId);
     }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -333,7 +333,7 @@ public class ProjectController {
      * @date 2022/3/15 5:05 下午
      */
     @PostMapping("audit-reset")
-    public Result<Boolean> eventAuditReset(@RequestParam("gridId")String gridId){
-        return new Result<Boolean>().ok(projectService.eventAuditReset(gridId));
+    public Result<ProjectAuditResetResultDTO> eventAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<ProjectAuditResetResultDTO>().ok(projectService.eventAuditReset(gridId));
     }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.EventProjectInfoDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.ProjectStaffDTO;
-import com.epmet.dto.form.LatestListFormDTO;
-import com.epmet.dto.form.PatrolProjectFormDTO;
-import com.epmet.dto.form.ProjectListFromDTO;
-import com.epmet.dto.form.ShiftProjectsFromDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -50,6 +47,14 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 **/
 	List<ProjectDTO> selectPendList(ProjectListFromDTO fromDTO);
 
+	/**
+	 * Desc: 待处理项目列表
+	 * @param userIds
+	 * @author zxc
+	 * @date 2022/3/21 14:12
+	 */
+	List<ProjectDTO> selectPendListByUserIds(@Param("userIds")List<String> userIds);
+
 	/**
 	 * 我发起的项目列表
 	 *

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -383,6 +383,6 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @author zxc
 	 * @date 2022/3/15 5:05 下午
 	 */
-	Boolean eventAuditReset(String gridId);
+	ProjectAuditResetResultDTO eventAuditReset(String gridId);
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java

@@ -112,8 +112,10 @@ public class MemoAttrServiceImpl extends BaseServiceImpl<MemoAttrDao, MemoAttrEn
      **/
     @Override
     public void setReaded(String memoId) {
-        MemoAttrEntity entity = new MemoAttrEntity();
-        entity.setId(memoId);
+        MemoAttrEntity entity = baseDao.selectById(memoId);
+        if (null == entity) {
+            log.warn(String.format("书记日志-提醒列表-修改阅读状态失败，提醒记录不存在，提醒记录Id", memoId));
+        }
         entity.setReadFlag(NumConstant.ONE);
         if (baseDao.updateById(entity) < NumConstant.ONE) {
             log.warn(String.format("书记日志-提醒列表-修改阅读状态失败，提醒记录Id", memoId));

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java

@@ -71,9 +71,9 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
         }
         //更新阅读状态
         if (NumConstant.ONE_STR.equals(formDTO.getReadFlag())) {
-            MemoAttrDTO memoAttrDTO = new MemoAttrDTO();
-            memoAttrDTO.setId(formDTO.getId());
+            MemoAttrDTO memoAttrDTO = memoAttrService.get(formDTO.getId());
             memoAttrDTO.setReadFlag(NumConstant.ONE);
+            memoAttrDTO.setUpdatedTime(null);
             memoAttrService.update(memoAttrDTO);
         }
         return dto;

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java

@@ -129,6 +129,7 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
         MemoAttrDTO memoAttr = new MemoAttrDTO();
         memoAttr.setId(dto.getId());
         memoAttr.setRemindTime(dto.getRemindTime());
+        memoAttr.setReadFlag(NumConstant.ZERO);
         memoAttrService.update(memoAttr);
     }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java

@@ -71,9 +71,9 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
         }
         //更新阅读状态
         if (NumConstant.ONE_STR.equals(formDTO.getReadFlag())) {
-            MemoAttrDTO memoAttrDTO = new MemoAttrDTO();
-            memoAttrDTO.setId(formDTO.getId());
+            MemoAttrDTO memoAttrDTO = memoAttrService.get(formDTO.getId());
             memoAttrDTO.setReadFlag(NumConstant.ONE);
+            memoAttrDTO.setUpdatedTime(null);
             memoAttrService.update(memoAttrDTO);
         }
         return dto;

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -234,14 +234,28 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return list;
 	}
 
+	/**
+	 * Desc: 复制楼上方法略做修改
+	 * @param userIds
+	 * @author zxc
+	 * @date 2022/3/21 15:33
+	 */
+	public boolean getPendProjectListByUserIds(List<String> userIds) {
+		if (CollectionUtils.isNotEmpty(userIds)){
+			List<ProjectDTO> projectList = baseDao.selectPendListByUserIds(userIds);
+			if (projectList.size() == 0){
+				return false;
+			}else {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public List<CreatedListResultDTO> getCreatedList(ProjectListFromDTO fromDTO) {
 		List<CreatedListResultDTO> list = new ArrayList<>();
 
-		//查询条件
-		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
-		fromDTO.setPageNo(pageIndex);
-
 		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -3140,12 +3154,20 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @date 2022/3/15 5:05 下午
 	 */
     @Override
-    public Boolean eventAuditReset(String gridId) {
+    public ProjectAuditResetResultDTO eventAuditReset(String gridId) {
+		ProjectAuditResetResultDTO result = new ProjectAuditResetResultDTO();
 		Integer processingCount = baseDao.selectEventStatus(gridId);
 		if (processingCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
-			return true;
+			result.setResiEventStatus(true);
 		}
-		return false;
+		Result<List<String>> allStaffByGridId = govOrgOpenFeignClient.getAllStaffByGridId(gridId);
+		if (!allStaffByGridId.success()){
+			throw new EpmetException("查询网格下的工作人员失败");
+		}
+		if (CollectionUtils.isNotEmpty(allStaffByGridId.getData())){
+			result.setProjectStatus(getPendProjectListByUserIds(allStaffByGridId.getData()));
+		}
+		return result;
     }
 
     /**

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -41,6 +41,8 @@
         ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序（带奇峰修改） -->
         LIMIT #{pageNo}, #{pageSize}
     </select>
+
+
     <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
         SELECT distinct
             p.ID,
@@ -539,4 +541,27 @@
           AND audit_status  = 'auto_passed'
           AND GRID_ID = #{gridId}
     </select>
+    <select id="selectPendListByUserIds" resultType="com.epmet.dto.ProjectDTO">
+        SELECT distinct
+        p.ID,
+        p.TITLE,
+        p.CREATED_TIME,
+        psp.CREATED_TIME AS UPDATED_TIME
+        FROM project p
+        INNER JOIN (SELECT
+        ps.PROJECT_ID,
+        MAX(ps.CREATED_TIME) AS CREATED_TIME
+        FROM project_staff ps
+        WHERE ps.DEL_FLAG = '0'
+        AND ps.IS_HANDLE = 'unhandled'
+        AND ps.STAFF_ID IN (
+        <foreach collection="userIds" item="userId" separator=",">
+            #{userId}
+        </foreach>
+        )
+        GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+        AND p.status = 'pending'
+        ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序 -->
+    </select>
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java

@@ -1,28 +1,20 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
 /**
  * @Author zxc
  * @DateTime 2022/3/18 19:00
  * @DESC
  */
 @Data
-public class CollectListFormDTO implements Serializable {
+public class CollectListFormDTO extends PageFormDTO {
 
     private static final long serialVersionUID = 2106773724057183577L;
 
     public interface CollectListForm{}
 
-    @NotNull(message = "pageNo不能为空", groups = CollectListForm.class)
-    private Integer pageNo;
-
-    @NotNull(message = "pageSize不能为空", groups = CollectListForm.class)
-    private Integer pageSize;
-
     private String orgId;
 
     private String address;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/18 19:00
+ * @DESC
+ */
+@Data
+public class CollectListExcelResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5659769436514116680L;
+    /**
+     * 户主姓名
+     */
+    @Excel(name = "户主姓名",width = 30, needMerge = true)
+    private String houseHolderName;
+
+    /**
+     * 居住地址
+     */
+    @Excel(name = "居住地址",width = 40, needMerge = true)
+    private String address;
+
+    /**
+     * 房屋类型，1:自有, 0:租住
+     */
+    @Excel(name = "房屋类型",replace = { "自有_1", "租住_2"}, width = 30, needMerge = true)
+    private String houseType;
+
+    /**
+     * 居住人数
+     */
+    @Excel(name = "居住成员人数",width = 30, needMerge = true)
+    private Integer totalResi;
+
+    @ExcelCollection(name="家庭成员")
+    private List<CollectListMemberExcelResultDTO> listP = new ArrayList<>();
+
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2022/3/21 5:09 下午
+ * @version: 1.0
+ */
+@Data
+public class CollectListMemberExcelResultDTO implements Serializable {
+    private static final long serialVersionUID = -4290962585956172531L;
+    /**
+     * 成员名字
+     */
+    @Excel(name = "成员姓名", width = 30)
+    private String memberName;
+
+    /**
+     * 成员身份证
+     */
+    @Excel(name = "成员身份证号", width = 30)
+    private String memberIdNum;
+
+    /**
+     * 成员电话
+     */
+    @Excel(name = "成员手机号", width = 30)
+    private String memberMobile;
+
+    /**
+     * 核酸检测次数
+     */
+    @Excel(name = "参加几轮核酸检测", width = 30)
+    private String heSuanCount = "0";
+
+    /**
+     * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种
+     */
+    @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_3" }, width = 30)
+    private String ymjz;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,13 +41,6 @@ public class CollectListResultDTO implements Serializable {
 
     private List<CollectListMemberResultDTO> list;
 
-    public CollectListResultDTO() {
-        this.houseHolderName = "";
-        this.address = "";
-        this.houseType = "0";
-        this.totalResi = 0;
-        this.list = new ArrayList<>();
-    }
 
     @Data
     public static class CollectListMemberResultDTO{
@@ -77,12 +69,6 @@ public class CollectListResultDTO implements Serializable {
          */
         private Integer ymjz;
 
-        public CollectListMemberResultDTO() {
-            this.memberName = "";
-            this.memberIdNum = "";
-            this.memberMobile = "";
-            this.heSuanCount = "0";
-            this.ymjz = 0;
-        }
+
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@@ -2,12 +2,17 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.CollectListFormDTO;
 import com.epmet.dto.form.IcResiCollectFormDTO;
+import com.epmet.dto.result.CollectListExcelResultDTO;
+import com.epmet.dto.result.CollectListMemberExcelResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.service.IcResiCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -68,4 +75,37 @@ public class IcResiCollectController {
         return new Result<PageData<CollectListResultDTO>>().ok(icResiCollectService.getCollectList(formDTO));
     }
 
+    /**
+     * Desc: 查询采集居民信息
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/18 19:23
+     */
+    @PostMapping("export")
+    public void export(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception {
+        //ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class);
+        //tokenDto.setUserId("73ae6280e46a6653a5605d51d5462725");
+        //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setPage(false);
+        PageData<CollectListResultDTO> collectList = icResiCollectService.getCollectList(formDTO);
+        List<CollectListExcelResultDTO> list = ConvertUtils.sourceToTarget(collectList.getList(),CollectListExcelResultDTO.class);
+
+        collectList.getList().forEach(o->{
+            List<CollectListMemberExcelResultDTO> children = new ArrayList<>();
+            o.getList().forEach(item->{
+                CollectListMemberExcelResultDTO resultDTO = ConvertUtils.sourceToTarget(item, CollectListMemberExcelResultDTO.class);
+                resultDTO.setYmjz(item.getYmjz() == null? StrConstant.EPMETY_STR:String.valueOf(item.getYmjz()));
+                children.add(resultDTO);
+            });
+            CollectListExcelResultDTO resultDTO = ConvertUtils.sourceToTarget(o, CollectListExcelResultDTO.class);
+            resultDTO.setListP(children);
+            list.add(resultDTO);
+        });
+
+        ExcelUtils.exportExcelToTarget(response, null, list, CollectListExcelResultDTO.class);
+    }
+
 }

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

@@ -95,9 +95,14 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             }
             formDTO.setOrgId(staffInfo.getAgencyId());
         }
+        if (formDTO.isPage()){
             PageInfo<CollectListResultDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
             result.setList(pageList.getList());
-        result.setTotal(Integer.valueOf(String.valueOf(pageList.getTotal())));
+            result.setTotal(Integer.parseInt(String.valueOf(pageList.getTotal())));
+        }else {
+            List<CollectListResultDTO> collectList = baseDao.getCollectList(formDTO);
+            result.setList(collectList);
+        }
         return result;
     }