热心居民审核

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/15 8:00 下午
+ * @DESC
+ */
+@Data
+public class WarnAndPartyAuditResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6971169159679812283L;
+
+    /**
+     * 是否存在党员审核
+     */
+    private Boolean partyMemberStatus;
+
+    /**
+     * 是否存在热心居民审核
+     */
+    private Boolean warnStatus;
+
+    public WarnAndPartyAuditResultDTO() {
+        this.partyMemberStatus = false;
+        this.warnStatus = false;
+    }
+}

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

@@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFor
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
 import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
 import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -112,6 +113,6 @@ public interface ResiPartyMemberOpenFeignClient {
      * @date 2022/3/15 4:19 下午
      */
     @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset")
-    Result<Boolean> partyMemberAuditReset(@RequestParam("gridId")String gridId);
+    Result<WarnAndPartyAuditResultDTO> partyMemberAuditReset(@RequestParam("gridId")String gridId);
 
 }

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

@@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFor
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -71,7 +72,7 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     }
 
     @Override
-    public Result<Boolean> partyMemberAuditReset(String gridId) {
+    public Result<WarnAndPartyAuditResultDTO> 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

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partymember.excel.PartymemberConfirmManualExcel;
 import com.epmet.modules.partymember.service.PartymemberConfirmManualService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
+import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -98,8 +99,8 @@ public class PartymemberConfirmManualController {
      * @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));
+    public Result<WarnAndPartyAuditResultDTO> partyMemberAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<WarnAndPartyAuditResultDTO>().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId));
     }
 
 }

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

@@ -39,4 +39,12 @@ public interface PartymemberConfirmManualDao extends BaseDao<PartymemberConfirmM
      */
     Integer partyMemberAuditReset(@Param("gridId")String gridId);
 
+    /**
+     * Desc: 查询网格下热心居民审核个数
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 8:11 下午
+     */
+    Integer warnAuditReset(@Param("gridId")String gridId);
+
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
+import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -107,5 +108,5 @@ public interface PartymemberConfirmManualService extends BaseService<Partymember
 	 * @author zxc
 	 * @date 2022/3/15 4:19 下午
 	 */
-	Boolean partyMemberAuditReset(String gridId);
+	WarnAndPartyAuditResultDTO partyMemberAuditReset(String gridId);
 }

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

@@ -30,6 +30,7 @@ import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity;
 import com.epmet.modules.partymember.redis.PartymemberConfirmManualRedis;
 import com.epmet.modules.partymember.service.PartymemberConfirmManualService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
+import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -120,12 +121,19 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl<Partyme
      * @date 2022/3/15 4:19 下午
      */
     @Override
-    public Boolean partyMemberAuditReset(String gridId) {
+    public WarnAndPartyAuditResultDTO partyMemberAuditReset(String gridId) {
+        WarnAndPartyAuditResultDTO result = new WarnAndPartyAuditResultDTO();
+        // 查询网格下是否存在党员审核
         Integer integer = baseDao.partyMemberAuditReset(gridId);
         if (integer.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
-            return true;
+            result.setPartyMemberStatus(true);
         }
-        return false;
+        // 网格下是否存在热心居民审核
+        Integer warnCount = baseDao.warnAuditReset(gridId);
+        if (warnCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            result.setWarnStatus(true);
+        }
+        return result;
     }
 
 }

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

@@ -13,5 +13,15 @@
           AND GRID_ID = #{gridId}
     </select>
 
+    <!-- 查询网格下热心居民审核个数 -->
+    <select id="warnAuditReset" resultType="java.lang.Integer">
+        SELECT
+            COUNT(ID)
+        FROM resi_warmhearted_apply
+        WHERE DEL_FLAG = '0'
+          AND AUDIT_STATUS = 'under_auditting'
+          AND GRID_ID = #{gridId}
+    </select>
+
 
 </mapper>