From e2088fa933e293761426c0f4a6d2b0e29ec6592d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Jul 2021 21:44:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E9=87=8F=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E4=B8=BA=20eq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/toscreen/impl/PublicPartExtractServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
index 9bae1a2869..c8080039cb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
@@ -286,13 +286,13 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
 
         entity.setJoinTotal(0);
         entity.setJoinTotalUpRate(new BigDecimal("0"));
-        entity.setJoinTotalUpFlag("");
+        entity.setJoinTotalUpFlag(GovernConstant.EQ);
         entity.setAvgIssue(new BigDecimal(0));
         entity.setAvgIssueUpRate(new BigDecimal("0"));
-        entity.setAvgIssueUpFlag("");
+        entity.setAvgIssueUpFlag(GovernConstant.EQ);
         entity.setAvgJoin(new BigDecimal(0));
         entity.setAgvgJoinUpRate(new BigDecimal("0"));
-        entity.setAgvgJoinUpFlag("");
+        entity.setAgvgJoinUpFlag(GovernConstant.EQ);
         entity.setAvgIssueFz(NumConstant.ZERO);
         entity.setAvgIssueFm(NumConstant.ZERO);
         entity.setAvgJoinFz(NumConstant.ZERO);

From 3445fe4debc6b26cf7b4a2cdad7a3a778245adf2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 12 Jul 2021 10:16:04 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=88=A0=E9=99=A4=E6=94=B9=E4=B8=BA=E7=89=A9?=
 =?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/evaluationindex/screen/ScreenProjectDataDao.java   | 4 ++--
 .../evaluationindex/screen/ScreenProjectImgDataDao.java    | 2 +-
 .../screen/impl/ScreenProjectDataServiceImpl.java          | 4 ++--
 .../mapper/evaluationindex/screen/ScreenProjectDataDao.xml | 7 ++++---
 .../evaluationindex/screen/ScreenProjectImgDataDao.xml     | 1 +
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
index 5410417202..4afa322825 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -54,7 +54,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
      * @param projectId
      * @return int
      */
-    int deleteByProjectId(@Param("projectId") String projectId);
+    int deleteByProjectId(@Param("customerId") String customerId, @Param("projectId") String projectId);
 
     /**
      * 根据项目ID删除数据
@@ -63,5 +63,5 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
      * @param list
      * @return int
      */
-    void deleteByProjectIds(@Param("list") List<String> list);
+    void deleteByProjectIds(@Param("customerId") String customerId, @Param("list") List<String> list);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
index 9335e8aa61..ff563a9f6e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectImgDataDao.java
@@ -38,5 +38,5 @@ public interface ScreenProjectImgDataDao extends BaseDao<ScreenProjectImgDataEnt
 
 	void insertBatch(@Param("list") List<ScreenProjectImgDataDTO> list);
 
-	int deleteByProjectId(@Param("projectId") String projectId);
+	int deleteByProjectId(@Param("customerId") String customerId, @Param("projectId") String projectId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index 8ac534876c..4db3552a39 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -173,8 +173,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 }
             }
             //先删除该projectId对应的旧数据
-            baseDao.deleteByProjectId(item.getProjectId());
-            screenProjectImgDataDao.deleteByProjectId(item.getProjectId());
+            baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
+            screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
 
             //如果orgType未知，获取一下
 //            if ("unknown".equals(item.getOrgType())){
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 2a123547f4..420f459034 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -49,15 +49,16 @@
     <delete id="deleteByProjectId">
         delete from screen_project_data
         where PROJECT_ID = #{projectId}
+        AND customer_id = #{customerId}
     </delete>
 
     <delete id="deleteByProjectIds">
         delete from screen_project_data
-        <where>
-            <foreach collection="list" item="projectId" separator=" or ">
+            where 1=1
+            AND customer_id = #{customerId}
+            <foreach collection="list" item="projectId" open="AND (" separator=" OR " close=" )">
                 PROJECT_ID = #{projectId}
             </foreach>
-        </where>
     </delete>
 
     <select id="checkIfExisted" resultType="int">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
index fc0dc48b34..b27cd6f405 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectImgDataDao.xml
@@ -29,6 +29,7 @@
     <delete id="deleteByProjectId">
         delete from screen_project_img_data
         where PROJECT_ID = #{projectId}
+        and customer_id = #{customerId}
     </delete>
 
 

From 5c3443ff9717c9d17939c1310b27221e18e1e1d0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 12 Jul 2021 15:07:09 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=BB=99=E5=89=8D=E7=AB=AF=E7=9A=84=E6=97=A5=E5=BF=97=E9=99=8D?=
 =?UTF-8?q?=E7=BA=A7=E4=BB=A5=E5=85=8D=E8=B4=B9=E7=9C=BC,=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=9A=E5=91=98=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/SsoServiceImpl.java    |  2 +-
 .../service/impl/ThirdLoginServiceImpl.java   |  2 +-
 .../controller/ResiPartyMemberController.java |  5 ++--
 .../impl/ResiPartyMemberServiceImpl.java      | 15 +++++-------
 .../form/AuditingDetailFromDTO.java           |  3 +++
 .../impl/PartyMemberConfirmServiceImpl.java   | 24 +++++++++----------
 .../partymember/PartymemberBaseInfoDao.xml    |  4 ++--
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
index 41f9469ec2..29283f6b01 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
@@ -290,7 +290,7 @@ public class SsoServiceImpl implements SsoService {
         //3.根据华为openId查询用户是否存在历史登陆信息
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserOpenFeignClient.getLatestStaffWechatLoginRecord(userInfo.getOpenId());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
-            logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
+            logger.warn(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
             throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index 4d848f2dcf..aae5697447 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -164,7 +164,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         //2.根据openid查询用户是否存在历史登陆信息
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserOpenFeignClient.getLatestStaffWechatLoginRecord(userWechatDTO.getWxOpenId());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
-            logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
+            logger.warn(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
             throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
index 5b7fbdf89f..3e1f982716 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
@@ -10,10 +10,10 @@ import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
 import com.epmet.dto.form.CertifiedDetailFormDTO;
 import com.epmet.dto.form.CertifiedFormDTO;
-import com.epmet.dto.result.CertifiedDetailResultDTO;
-import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.dto.result.AuditedPartyMemberResultDTO;
 import com.epmet.dto.result.AuditingPartyMemberResultDTO;
+import com.epmet.dto.result.CertifiedDetailResultDTO;
+import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO;
 import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO;
@@ -122,6 +122,7 @@ public class ResiPartyMemberController {
     @PostMapping("auditingdetail")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITING_DETAIL)
     public Result<AuditingDetailResultDTO> auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) {
+        ValidatorUtils.validateEntity(fromDTO);
         return resiPartyMemberService.auditingDetail(fromDTO);
     }
 
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
index d2f4ccc899..8f7c751f19 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
@@ -9,11 +9,10 @@ import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
 import com.epmet.dto.form.CertifiedDetailFormDTO;
 import com.epmet.dto.form.CertifiedFormDTO;
-import com.epmet.dto.result.CertifiedDetailResultDTO;
-import com.epmet.dto.result.CertifiedResultDTO;
-import com.epmet.feign.ResiPartymemberFeignClient;
 import com.epmet.dto.result.AuditedPartyMemberResultDTO;
 import com.epmet.dto.result.AuditingPartyMemberResultDTO;
+import com.epmet.dto.result.CertifiedDetailResultDTO;
+import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.feign.ResiPartymemberFeignClient;
 import com.epmet.resi.partymember.dto.partymember.form.*;
 import com.epmet.resi.partymember.dto.partymember.result.*;
@@ -23,8 +22,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,11 +42,11 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
         UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
         Result<List<UnderReviewParyMemberResultDTO>> result = resiPartymemberFeignClient.auditingPartyMember(underReviewParyMemberFormDTO);
         if (!result.success()) {
-            logger.error(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
+            logger.warn(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
         if (null == result.getData() || result.getData().isEmpty()) {
-            logger.info(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
+            logger.warn(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
             return list;
         }
         list = ConvertUtils.sourceToTarget(result.getData(), AuditingPartyMemberResultDTO.class);
@@ -62,11 +59,11 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
         ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
         Result<List<ReviewedParyMemberResultDTO>> result = resiPartymemberFeignClient.auditedPartyMember(reviewedParyMemberFormDTO);
         if (!result.success()) {
-            logger.error(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
+            logger.warn(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
         if (null == result.getData() || result.getData().isEmpty()) {
-            logger.info(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
+            logger.warn(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
             return list;
         }
         list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java
index 387c68772c..2a6ab054fb 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java
@@ -2,6 +2,7 @@ package com.epmet.resi.partymember.dto.partymember.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -12,9 +13,11 @@ import java.io.Serializable;
 @Data
 public class AuditingDetailFromDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
+	public interface AddUserInternalGroup {}
 	/**
 	 * 党员认证信息表ID
 	 */
+	@NotBlank(message = "党员认证信息表ID",groups =AddUserInternalGroup.class)
 	private String partyMemberId;
 
 	/**
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 1b52c7e1cc..ac4ac14ff4 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -374,17 +374,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setAutoId(fromDTO.getAutoId());
 		resultDTO.setManualId(fromDTO.getManualId());
 
-		//获取人工审核信息
-		PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId());
-		if(null!=manualEntity){
-			//人工审核信息设为已读
-			manualEntity.setReadFlag(PartyMemberConstant.READ);
-			partymemberConfirmManualService.updateById(manualEntity);
-		}else{
-			log.error(String.format("入参%s,查询partymember_confirm_manual为空", JSON.toJSONString(fromDTO)));
-			throw new RenException("数据异常,根据manualId查询partymember_confirm_manual为空");
-		}
-
 		//获取党员认证信息
 		PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId());
 		resultDTO.setUserId(partyMemberInfoEntity.getUserId());
@@ -392,8 +381,19 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setIdCard(partyMemberInfoEntity.getIdCard());
 		resultDTO.setMobile(partyMemberInfoEntity.getMobile());
 		resultDTO.setAddress(partyMemberInfoEntity.getStreet() + partyMemberInfoEntity.getEstate() + partyMemberInfoEntity.getBuilding());
-		resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()/1000);
+		resultDTO.setCertifyTime(partyMemberInfoEntity.getCreatedTime().getTime() / 1000);
 
+		//获取人工审核信息
+		PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId());
+		if(null!=manualEntity){
+			//人工审核信息设为已读
+			manualEntity.setReadFlag(PartyMemberConstant.READ);
+			resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()/1000);
+			partymemberConfirmManualService.updateById(manualEntity);
+		}else{
+			log.warn(String.format("入参%s,查询partymember_confirm_manual为空", JSON.toJSONString(fromDTO)));
+			// throw new RenException("数据异常,根据manualId("+fromDTO.getManualId()+")查询partymember_confirm_manual为空");
+		}
 		//获取党员自动认证信息
 		List<String> failedReason = new ArrayList<>();
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 1b2ea4f5ee..0741bc989d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -82,10 +82,10 @@
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
             unix_timestamp(pi.CREATED_TIME) AS applyTime,
-            pcm.READ_FLAG AS readFlag,
+            IFNULL(pcm.READ_FLAG,'') AS readFlag,
             pi.id as partyMemberId,
             pca.id as autoId,
-            pcm.id as manualId
+            IFNULL(pcm.id,'') as manualId
         FROM
             partymember_info pi
             LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.DEL_FLAG = '0'and pcm.AUDIT_STATUS='under_auditting')

From 96122d5b7673149ed050c858d4f2cf34e7d51455 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 12 Jul 2021 15:10:51 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=BE=A4=E9=87=8C=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E8=AF=A2=E5=85=9A=E5=91=98=E5=BE=85=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=EF=BC=8Csql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/partymember/PartymemberBaseInfoDao.xml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 0741bc989d..b14b3fefe6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -88,11 +88,12 @@
             IFNULL(pcm.id,'') as manualId
         FROM
             partymember_info pi
-            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.DEL_FLAG = '0'and pcm.AUDIT_STATUS='under_auditting')
+            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.DEL_FLAG = '0')
             LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID AND pca.del_flag='0')
         WHERE
             pi.DEL_FLAG = '0'
             AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
+            AND pcm.AUDIT_STATUS='under_auditting'
             AND pi.EXTRA_ORGANIZATION IS NOT NULL
             AND pi.GRID_ID = #{gridId}
         ORDER BY

From 8c7e7d90c6102c767aa7b30cdbcd3edde2971c8e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 12 Jul 2021 15:49:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?"dataclient/subagencyindexrank",=E5=AD=94?=
 =?UTF-8?q?=E6=9D=91=E9=95=87=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenIndexDataMonthlyDao.java     |  2 +
 .../screen/ScreenIndexDataYearlyDao.java      |  3 +
 .../screen/impl/IndexServiceImpl.java         | 14 +++-
 .../screen/ScreenIndexDataMonthlyDao.xml      | 69 +++++++++++++++++++
 .../screen/ScreenIndexDataYearlyDao.xml       | 67 ++++++++++++++++++
 5 files changed, 153 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
index 976c3c85b4..18a3795b05 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
@@ -127,4 +127,6 @@ public interface ScreenIndexDataMonthlyDao{
                                                               @Param("yearId") String yearId,
                                                               @Param("areaCode") String areaCode,
                                                               @Param("topNum") int topNum);
+
+    List<AnNingSubAgencyIndexRankResultDTO> selectKczSubAgencyOrGridIndexMonthlyRank(SubAgencyIndexRankYMFormDTO formDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
index 6735487317..2fb33f60d5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
@@ -51,4 +51,7 @@ public interface ScreenIndexDataYearlyDao{
      * @Date 09:38 2020-09-08
      **/
     List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO);
+
+
+    List<AnNingSubAgencyIndexRankResultDTO> selectKczSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index 993c590f05..643b27b4fd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
@@ -260,13 +260,23 @@ public class IndexServiceImpl implements IndexService {
         List<AnNingSubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
         if (ScreenConstant.YEAR_ID.equals(formDTO.getType())) {
             // 年 指数排行
-            subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
+            if("1234085031077498881".equals(formDTO.getAgencyId())){
+                // 孔村单独处理，查询下下级
+                subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectKczSubAgencyIndexYearlyRank(formDTO);
+            }else{
+                subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
+            }
         } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())) {
             // 月(上一个月) 指数排行
             if (StringUtils.isBlank(formDTO.getMonthId())) {
                 formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
             }
-            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
+            if("1234085031077498881".equals(formDTO.getAgencyId())){
+                // 孔村单独处理，查询下下级
+                subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectKczSubAgencyOrGridIndexMonthlyRank(formDTO);
+            }else{
+                subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
+            }
             subAgencyIndexRankResultDTOS.forEach(rank -> {
                 rank.setPartyDevAbility(getRound(rank.getPartyDevAbility()));
                 rank.setGovernAbility(getRound(rank.getGovernAbility()));
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index f00cc4c23e..6c9eda9be7 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -385,4 +385,73 @@
         ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC
                 LIMIT #{topNum}
     </select>
+
+    <select id="selectKczSubAgencyOrGridIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
+                    resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
+        SELECT
+            score.org_name AS `NAME`,
+            score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility,
+            score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility,
+            score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility,
+            score.PARTY_DEV_WEIGHT AS partyWeight,
+            score.GOVERN_ABLITY_WEIGHT AS governWeight,
+            score.SERVICE_ABLITY_WEIGHT AS serviceWeight,
+            score.ORG_ID orgId,
+            score.ORG_TYPE orgType
+        FROM
+            screen_index_data_monthly score
+        WHERE score.del_flag = '0'
+        AND score.month_id = #{monthId,jdbcType=VARCHAR}
+        <if test="customerId != null and customerId != ''">
+            AND  score.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="orgType != null and orgType != ''">
+            <choose>
+                <when test="orgType == 'grid'">
+                    and score.ORG_ID in(
+                        SELECT
+                            scg.GRID_ID
+                        FROM
+                            screen_customer_grid scg
+                        WHERE
+                            scg.DEL_FLAG = '0'
+                            AND scg.PARENT_AGENCY_ID = #{agencyId}
+                    )
+                </when>
+                <when test="orgType == 'agency'">
+                    and score.ORG_ID in(
+                        SELECT
+                            sca.AGENCY_ID
+                        FROM
+                            screen_customer_agency sca
+                        WHERE
+                            sca.DEL_FLAG = '0'
+                            AND sca.PIDS LIKE concat(#{agencyId},'%')
+                            AND sca.`LEVEL` = 'community'
+                    )
+                </when>
+                <when test="orgType == 'department'">
+                    and score.ORG_ID in(
+                        SELECT
+                            scd.DEPT_ID
+                        FROM
+                            screen_customer_dept scd
+                        WHERE
+                            scd.DEL_FLAG = '0'
+                            AND scd.PARENT_AGENCY_ID = #{agencyId}
+                    )
+                </when>
+            </choose>
+        </if>
+        <choose>
+            <when test="orgType != null and orgType != ''">
+                AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND score.ORG_TYPE != 'department'
+            </otherwise>
+        </choose>
+        ORDER BY score.index_total ${sort}
+        LIMIT #{topNum}
+    </select>
 </mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index ad0132dd85..65af0e5f12 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -65,4 +65,71 @@
         ORDER BY index_total ${sort}
         LIMIT #{topNum}
     </select>
+
+    <select id="selectKczSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
+            resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
+        SELECT
+            score.org_name AS `NAME`,
+            score.govern_ablity AS governAbility,
+            score.party_dev_ablity AS partyDevAbility,
+            score.service_ablity AS serviceAbility,
+            score.ORG_ID orgId,
+            score.ORG_TYPE orgType
+        FROM
+            screen_index_data_yearly score
+        WHERE
+            score.del_flag = '0'
+            AND score.year_id = YEAR(CURDATE())
+            <if test="customerId != null and customerId != ''">
+                AND  score.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test="orgType != null and orgType != ''">
+                <choose>
+                    <when test="orgType == 'grid'">
+                        and score.ORG_ID in(
+                            SELECT
+                            scg.GRID_ID
+                            FROM
+                            screen_customer_grid scg
+                            WHERE
+                            scg.DEL_FLAG = '0'
+                            AND scg.PARENT_AGENCY_ID = #{agencyId}
+                        )
+                    </when>
+                    <when test="orgType == 'agency'">
+                        and score.ORG_ID in(
+                            SELECT
+                            sca.AGENCY_ID
+                            FROM
+                            screen_customer_agency sca
+                            WHERE
+                            sca.DEL_FLAG = '0'
+                            AND sca.PIDS LIKE concat(#{agencyId},'%')
+                            AND sca.`LEVEL` = 'community'
+                        )
+                    </when>
+                    <when test="orgType == 'department'">
+                        and score.ORG_ID in(
+                            SELECT
+                            scd.DEPT_ID
+                            FROM
+                            screen_customer_dept scd
+                            WHERE
+                            scd.DEL_FLAG = '0'
+                            AND scd.PARENT_AGENCY_ID = #{agencyId}
+                        )
+                    </when>
+                </choose>
+            </if>
+            <choose>
+                <when test="orgType != null and orgType != ''">
+                    AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+                </when>
+                <otherwise>
+                    AND score.ORG_TYPE != 'department'
+                </otherwise>
+            </choose>
+            ORDER BY index_total ${sort}
+            LIMIT #{topNum}
+    </select>
 </mapper>