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

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -376,4 +376,13 @@ public interface GovIssueOpenFeignClient {
 	 */
 	@PostMapping("/gov/issue/issueprojectcategorydict/categoryMap/{customerId}")
 	Result<Map<String, String>> getCategoryMap(@PathVariable("customerId") String customerId);
+
+	/**
+	 * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/15 4:40 下午
+	 */
+	@PostMapping("audit-reset")
+	Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -319,4 +319,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<Map<String, String>> getCategoryMap(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryMap", customerId);
 	}
+
+    @Override
+    public Result<Boolean> issueAuditReset(String gridId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueAuditReset", gridId);
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -322,5 +322,16 @@ public class IssueController {
         return new Result<List<ProjectDistributionAnalysisRightDTO>>().ok(issueService.getProjectCountByGrid(formDTO));
     }
 
+    /**
+     * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:40 下午
+     */
+    @PostMapping("audit-reset")
+    public Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<Boolean>().ok(issueService.issueAuditReset(gridId));
+    }
+
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -292,4 +292,20 @@ public interface IssueDao extends BaseDao<IssueEntity> {
 
     List<ResiBuzzIssueCategoryDTO> selectCategoryNameByIssueList(List<ResiBuzzLeftPieChartResultDTO> issueIds,@Param("customerId")String customerId);
 
+    /**
+     * Desc: 查询网格中表决中的议题个数
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:44 下午
+     */
+    Integer selectVotingIssue(@Param("gridId")String gridId);
+
+    /**
+     * Desc: 查询网格中审核中的议题个数
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:44 下午
+     */
+    Integer selectAuditIssue(@Param("gridId")String gridId);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -378,4 +378,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      */
     List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO);
 
+    /**
+     * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:40 下午
+     */
+    Boolean issueAuditReset(String gridId);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1744,5 +1744,26 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return result;
     }
 
+    /**
+     * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:40 下午
+     */
+    @Override
+    public Boolean issueAuditReset(String gridId) {
+        // 表决中的议题个数
+        Integer votingCount = baseDao.selectVotingIssue(gridId);
+        if (votingCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            return true;
+        }
+        // 审核中的议题个数
+        Integer auditCount = baseDao.selectAuditIssue(gridId);
+        if (auditCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            return true;
+        }
+        return false;
+    }
+
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -750,4 +750,23 @@
             LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t1.categoryCode AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = #{customerId})
         </foreach>
     </select>
+
+    <!-- 查询网格中表决中的议题个数 -->
+    <select id="selectVotingIssue" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM issue
+        WHERE del_flag = 0
+          AND grid_id = #{gridId}
+    </select>
+
+    <!-- 查询网格中审核中的议题个数 -->
+    <select id="selectAuditIssue" resultType="java.lang.Integer">
+        SELECT
+            count( id )
+        FROM issue_application
+        WHERE DEL_FLAG = '0'
+          AND APPLY_STATUS = 'under_auditing'
+          AND GRID_ID = #{gridId}
+    </select>
 </mapper>

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -105,4 +105,13 @@ public interface ResiPartyMemberOpenFeignClient {
     @PostMapping(value = "/resi/partymember/partymemberinfo/getpartymemberinfobycustomerid")
     Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId);
 
+    /**
+     * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:19 下午
+     */
+    @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset")
+    Result<Boolean> partyMemberAuditReset(@RequestParam("gridId")String gridId);
+
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -69,4 +69,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberInfoByCustomerId", customerId);
     }
+
+    @Override
+    public Result<Boolean> partyMemberAuditReset(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberAuditReset", gridId);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java

@@ -91,4 +91,15 @@ public class PartymemberConfirmManualController {
         ExcelUtils.exportExcelToTarget(response, null, list, PartymemberConfirmManualExcel.class);
     }
 
+    /**
+     * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:19 下午
+     */
+    @PostMapping("audit-reset")
+    public Result<Boolean> partyMemberAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<Boolean>().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId));
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java

@@ -20,6 +20,7 @@ package com.epmet.modules.partymember.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 党员认证人工审核表 人工审核时要展示自动审核的结果，同事允许前台去修改党员认证信息表的数据
@@ -29,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartymemberConfirmManualDao extends BaseDao<PartymemberConfirmManualEntity> {
-	
+
+    /**
+     * Desc: 查询网格下存在党员审核个数
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:24 下午
+     */
+    Integer partyMemberAuditReset(@Param("gridId")String gridId);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java

@@ -100,4 +100,12 @@ public interface PartymemberConfirmManualService extends BaseService<Partymember
 	 * @return
 	 */
 	PartymemberConfirmManualDTO getInfoByPartyMemberInfoId(String partymemberInfoId);
+
+	/**
+	 * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/15 4:19 下午
+	 */
+	Boolean partyMemberAuditReset(String gridId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.PartyMemberConstant;
@@ -112,4 +113,19 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl<Partyme
         return ConvertUtils.sourceToTarget(entity, PartymemberConfirmManualDTO.class);
     }
 
+    /**
+     * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:19 下午
+     */
+    @Override
+    public Boolean partyMemberAuditReset(String gridId) {
+        Integer integer = baseDao.partyMemberAuditReset(gridId);
+        if (integer.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            return true;
+        }
+        return false;
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberConfirmManualDao.xml

@@ -3,21 +3,15 @@
 
 <mapper namespace="com.epmet.modules.partymember.dao.PartymemberConfirmManualDao">
 
-    <resultMap type="com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity" id="partymemberConfirmManualMap">
+    <!-- 查询网格下存在党员审核个数 -->
-        <result property="id" column="ID"/>
+    <select id="partyMemberAuditReset" resultType="java.lang.Integer">
-        <result property="customerId" column="CUSTOMER_ID"/>
+        SELECT
-        <result property="userId" column="USER_ID"/>
+            COUNT( ID )
-        <result property="gridId" column="GRID_ID"/>
+        FROM partymember_confirm_manual
-        <result property="partymemberInfoId" column="PARTYMEMBER_INFO_ID"/>
+        WHERE DEL_FLAG = 0
-        <result property="auditStatus" column="AUDIT_STATUS"/>
+          AND AUDIT_STATUS = 'under_auditting'
-        <result property="refuseReason" column="REFUSE_REASON"/>
+          AND GRID_ID = #{gridId}
-        <result property="delFlag" column="DEL_FLAG"/>
+    </select>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
 
 
 </mapper>