From 645b0a3101ffa0c8fdeb6bb6f5978190f3c1b055 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 21 Jul 2022 09:53:53 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E6=94=BF=E7=AD=96=E4=BE=9D=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/policy/IcPolicyPageFormDTO.java     |  1 +
 .../com/epmet/controller/IcPolicyController.java | 16 ++++++++++++++--
 .../java/com/epmet/service/IcPolicyService.java  |  8 ++++++++
 .../epmet/service/impl/IcPolicyServiceImpl.java  | 10 ++++++++++
 .../resources/mapper/IcServiceRecordV2Dao.xml    |  2 +-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java
index 0db60d639a..01cf09cfbf 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java
@@ -32,6 +32,7 @@ public class IcPolicyPageFormDTO extends PageFormDTO implements Serializable {
      * 是否过期；1：已过期；0：未过期
      */
     private String expiredFlag;
+    private String agencyId;
 
 }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
index ad21eb16e4..7b604b4ba8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
@@ -10,7 +10,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
-import com.epmet.dto.form.resi.HeartResisByPolicyRulesFormDTO;
 import com.epmet.dto.IcPolicyRuleDTO;
 import com.epmet.dto.form.policy.IcPolicyFormDTO;
 import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
@@ -18,7 +17,6 @@ import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO;
 import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO;
 import com.epmet.entity.IcPolicyRuleDetailEntity;
 import com.epmet.service.IcPolicyService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -145,6 +143,20 @@ public class IcPolicyController {
         return new Result<PageData<IcPolicyDTO>>().ok(page);
     }
 
+    /**
+     * Desc: 政策列表下拉选
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/21 09:48
+     */
+    @PostMapping("policyListSelect")
+    public Result<List<IcPolicyDTO>> policyListSelect(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        return new Result<List<IcPolicyDTO>>().ok(icPolicyService.policyListSelect(formDTO));
+    }
+
     /**
      * 细则列表
      * @param customerId
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
index e9e71b24af..a392aced64 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
@@ -45,6 +45,14 @@ public interface IcPolicyService extends BaseService<IcPolicyEntity> {
      */
     PageData<IcPolicyDTO> policyList(IcPolicyPageFormDTO formDTO);
 
+    /**
+     * Desc: 政策列表下拉选
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/21 09:48
+     */
+    List<IcPolicyDTO> policyListSelect(IcPolicyPageFormDTO formDTO);
+
     List<IcPolicyRuleDTO> ruleList(String customerId,String policyId);
 
     IcPolicyDTO policyDetail(String customerId,String policyId);
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
index 31b7ccb20e..65824d663b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
@@ -246,6 +246,16 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
         return new PageData<>(list, pageInfo.getTotal());
     }
 
+    @Override
+    public List<IcPolicyDTO> policyListSelect(IcPolicyPageFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常");
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+        return baseDao.policyList(formDTO.getCustomerId(), formDTO.getAgencyId(), null,null,null);
+    }
+
     @Override
     public List<IcPolicyRuleDTO> ruleList(String customerId, String policyId) {
         LambdaQueryWrapper<IcPolicyRuleEntity> wrapper = new LambdaQueryWrapper<>();
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
index 7c8a86b911..1eae34fe2e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
@@ -16,7 +16,7 @@
             sr.SERVICE_STATUS,
             IFNULL(sf.SERVICE_PEOPLE_NUMBER,0) AS servicePeopleNumber
         FROM ic_service_record_v2 sr
-        INNER JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0
+        left JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0
         INNER JOIN ic_service_scope_v2 ss ON ss.SERVICE_RECORD_ID = sr.ID AND ss.DEL_FLAG = '0'
         WHERE sr.DEL_FLAG = '0'
             AND ss.OBJECT_ID_PATH LIKE concat('%',#{orgId},'%')

From 433b8c9194ba40cd43161c1f5cd6fda82b906c69 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 21 Jul 2022 10:01:01 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/IcPolicyController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
index 7b604b4ba8..31003e4e31 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
@@ -1,11 +1,10 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IcPolicyDTO;
@@ -17,6 +16,7 @@ import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO;
 import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO;
 import com.epmet.entity.IcPolicyRuleDetailEntity;
 import com.epmet.service.IcPolicyService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

From bca00f802799728f7e917a465999673808e638b3 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 21 Jul 2022 10:11:46 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/IcPolicyController.java | 6 ++----
 .../src/main/java/com/epmet/service/IcPolicyService.java   | 2 +-
 .../java/com/epmet/service/impl/IcPolicyServiceImpl.java   | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
index 31003e4e31..f27d291844 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
@@ -151,10 +151,8 @@ public class IcPolicyController {
      * @date 2022/7/21 09:48
      */
     @PostMapping("policyListSelect")
-    public Result<List<IcPolicyDTO>> policyListSelect(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){
-        formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setStaffId(tokenDto.getUserId());
-        return new Result<List<IcPolicyDTO>>().ok(icPolicyService.policyListSelect(formDTO));
+    public Result<List<IcPolicyDTO>> policyListSelect(@LoginUser TokenDto tokenDto){
+        return new Result<List<IcPolicyDTO>>().ok(icPolicyService.policyListSelect(tokenDto.getUserId(),tokenDto.getCustomerId()));
     }
 
     /**
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
index a392aced64..d57a6ca886 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
@@ -51,7 +51,7 @@ public interface IcPolicyService extends BaseService<IcPolicyEntity> {
      * @author zxc
      * @date 2022/7/21 09:48
      */
-    List<IcPolicyDTO> policyListSelect(IcPolicyPageFormDTO formDTO);
+    List<IcPolicyDTO> policyListSelect(String userId,String customerId);
 
     List<IcPolicyRuleDTO> ruleList(String customerId,String policyId);
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
index 65824d663b..77900d2519 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
@@ -247,13 +247,12 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
     }
 
     @Override
-    public List<IcPolicyDTO> policyListSelect(IcPolicyPageFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+    public List<IcPolicyDTO> policyListSelect(String userId,String customerId) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
         if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常");
         }
-        formDTO.setAgencyId(staffInfo.getAgencyId());
-        return baseDao.policyList(formDTO.getCustomerId(), formDTO.getAgencyId(), null,null,null);
+        return baseDao.policyList(customerId, staffInfo.getAgencyId(), null,null,null);
     }
 
     @Override

From 6462848d98cff2a2f2945064a54a16f2aa24400c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 21 Jul 2022 10:15:23 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcServiceRecordV2Dao.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
index 1eae34fe2e..15696d8d2b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
@@ -6,7 +6,7 @@
     <!-- 【服务管理】列表 -->
     <select id="serviceRecordV2List" resultType="com.epmet.dto.result.ServiceRecordV2ListResultDTO">
         SELECT
-            sr.ID AS serviceRecordId,
+            DISTINCT sr.ID AS serviceRecordId,
             sr.POLICY_ID,
             sr.SERVICE_NAME,
             sr.SERVICE_ORG_TYPE,

From b71fdd3399049ee0b9ad356b44888681ed6e525b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 21 Jul 2022 10:19:02 +0800
Subject: [PATCH 05/15] =?UTF-8?q?warn=E5=88=A0=E9=99=A4=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/grid/service/impl/ResiMineGridServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
index 11f20c2f0c..771bbdf2ed 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
@@ -167,7 +167,7 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 			if (null == gridInfoCache || (null != gridInfoCache.getAbandonFlag() && NumConstant.ONE == gridInfoCache.getAbandonFlag())) {
 				result.setGridId(StrConstant.EPMETY_STR);
 				result.setCustomerId(StrConstant.EPMETY_STR);
-				logger.error(String.format("获取用户最近访问网格异常，网格可能被删除或者被弃用，参数%s",JSON.toJSONString(formDTO)));
+				logger.warn(String.format("获取用户最近访问网格异常，网格可能被删除或者被弃用，参数%s",JSON.toJSONString(formDTO)));
 				return result;
 			}
 			result.setGridId(userResult.getData().getGridId());

From b4aadc930763e0bf4d319bbbe47656862159c462 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 21 Jul 2022 10:39:58 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=A7=88=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E7=A9=BA=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dataaggre/controller/IcUserController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java
index 23b6e5f4ec..5659dca060 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java
@@ -79,7 +79,7 @@ public class IcUserController {
         if (CollectionUtils.isEmpty(resiRule)
             && CollectionUtils.isEmpty(houseRule)
             && CollectionUtils.isEmpty(statRule)) {
-            return new Result().ok(new ArrayList<>());
+            return new Result().ok(new PageData<>(new ArrayList<>(), 0));
         }
 
         PageData<ResiByPolicyInfoResultDTO> page = icResiService.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId,

From efa62b99bcdb8a558c5ace18e0be94bbccc9db67 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 21 Jul 2022 10:39:59 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=8D=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java
index 536e292c70..f77d349ccb 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java
@@ -5,7 +5,6 @@ import com.epmet.dto.IcServiceScopeV2DTO;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,6 +20,7 @@ public class ServiceRecordV2DetailResultDTO implements Serializable {
     private String serviceRecordId;
 
     private String serviceName;
+    private String policyId;
 
     /**
      * 服务组织类型

From 25740aa87d20af3725dd676b427f684297598a38 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 21 Jul 2022 10:58:04 +0800
Subject: [PATCH 08/15] 1

---
 .../mapper/epmetuser/IcResiUserDao.xml        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
index f0c98c7732..8fa83ca190 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
@@ -71,7 +71,9 @@
 
     <sql id="segmentForPolicyRules">
         <where>
-            ic_resi_user.CUSTOMER_ID=#{customerId}
+            ic_resi_user.status='0'
+            and ic_resi_user.CUSTOMER_ID=#{customerId}
+            and ic_resi_user.del_flag='0'
             <!--组织过滤-->
             <if test="orgId != null and orgId != '' and orgType != null and orgType != ''">
                 <choose>
@@ -84,23 +86,23 @@
                 </choose>
             </if>
             <!--   小区等条件  -->
-            <if test="neighborHoodId != null">
+            <if test="neighborHoodId != null and neighborHoodId!=''">
                 and ic_resi_user.VILLAGE_ID=#{neighborHoodId}
             </if>
-            <if test="buildingId != null">
+            <if test="buildingId != null and buildingId!=''">
                 and ic_resi_user.BUILD_ID=#{buildingId}
             </if>
-            <if test="unitId != null">
+            <if test="unitId != null and unitId!=''">
                 and ic_resi_user.UNIT_ID=#{unitId}
             </if>
-            <if test="houseId != null">
+            <if test="houseId != null and houseId!=''">
                 and ic_resi_user.HOME_ID=#{houseId}
             </if>
-            <if test="idCard != null">
-                and ic_resi_user.ID_CARD like CONCAT('%'#{idCard}, '%')
+            <if test="idCard != null and idCard!=''">
+                and ic_resi_user.ID_CARD like CONCAT('%',#{idCard}, '%')
             </if>
-            <if test="name != null">
-                and ic_resi_user.NAME like CONCAT('%'#{name}, '%')
+            <if test="name != null  and name!=''">
+                and ic_resi_user.NAME like CONCAT('%',#{name}, '%')
             </if>
             <!--    房屋id列表      -->
             <if test="houseIds != null and houseIds.size() > 0">

From 7df7bdd003853770082969686d314e740ecb568d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 21 Jul 2022 10:59:31 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcServiceRecordV2ServiceImpl.java      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
index 62f1d9a433..69cebbad20 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -16,6 +17,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dao.IcServiceFeedbackV2Dao;
 import com.epmet.dao.IcServiceRecordV2Dao;
 import com.epmet.dao.IcServiceScopeDao;
+import com.epmet.dao.IcServiceScopeV2Dao;
 import com.epmet.dto.IcServiceFeedbackV2DTO;
 import com.epmet.dto.IcServiceRecordV2DTO;
 import com.epmet.dto.IcServiceScopeV2DTO;
@@ -67,11 +69,12 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
     private IcServiceFeedbackV2Service icServiceFeedbackV2Service;
     @Autowired
     private HeartAttachmentService heartAttachmentService;
-
     @Autowired
     private IcServiceScopeDao serviceScopeDao;
     @Autowired
     private IcServiceFeedbackV2Dao serviceFeedbackV2Dao;
+    @Autowired
+    private IcServiceScopeV2Dao icServiceScopeV2Dao;
 
     @Override
     public PageData<IcServiceRecordV2DTO> page(Map<String, Object> params) {
@@ -177,8 +180,16 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
             log.error(String.format("取消服务记录失败，未查询到服务记录，服务记录Id->%s", formDTO.getServiceRecordId()));
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "取消服务记录失败，未查询到服务记录");
         }
-        entity.setServiceStatus("cancel");
-        baseDao.updateById(entity);
+        if (!"in_service".equals(entity.getServiceStatus())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("服务状态：%s", entity.getServiceStatus()), "只有服务中的记录可以取消");
+        }
+        //2.删除主表、字表数据【进行中数据不存在反馈记录】
+        baseDao.deleteById(entity);
+
+        LambdaQueryWrapper<IcServiceScopeV2Entity> tWrapper = new LambdaQueryWrapper<>();
+        tWrapper.eq(IcServiceScopeV2Entity::getServiceRecordId, formDTO.getServiceRecordId());
+        icServiceScopeV2Dao.delete(tWrapper);
+
     }
 
     @Override

From 18a66541275a15a0926e33b51e1c34d95b9b4ae0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 21 Jul 2022 13:58:49 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcServiceRecordV2Dao.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
index 15696d8d2b..7a7b4f1a68 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
@@ -11,8 +11,8 @@
             sr.SERVICE_NAME,
             sr.SERVICE_ORG_TYPE,
             sr.SERVICE_ORG_ID,
-            sr.SERVICE_TIME_START,
-            sr.SERVICE_TIME_END,
+            date_format(sr.SERVICE_TIME_START,'%Y-%m-%d') AS serviceTimeStart,
+            date_format(sr.SERVICE_TIME_END,'%Y-%m-%d') AS serviceTimeEnd,
             sr.SERVICE_STATUS,
             IFNULL(sf.SERVICE_PEOPLE_NUMBER,0) AS servicePeopleNumber
         FROM ic_service_record_v2 sr

From 0169ee2bad0929cf7cffa8e0d035698bcf710ae0 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 21 Jul 2022 14:13:03 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=94=A8aggre=E4=B8=BA=E4=B8=BB=E6=9D=A5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ResisByPolicyRulesFormDTO.java       |  6 +--
 .../controller/IcUserController.java          | 37 +++++++++++++++----
 .../service/impl/ResiServiceImpl.java         |  6 +--
 .../resi/HeartResisByPolicyRulesFormDTO.java  | 14 +++++--
 .../form/resi/ResisByPolicyRulesFormDTO.java  |  6 +--
 .../epmet/controller/IcPolicyController.java  |  8 ++--
 .../service/impl/IcPolicyServiceImpl.java     |  6 +--
 7 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java
index e89f1131cf..974172a7e4 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java
@@ -32,9 +32,9 @@ public class ResisByPolicyRulesFormDTO {
     @AllArgsConstructor
     public static class RuleList {
         private String ruleName;
-        private List<ResiRule> resiRule;
-        private List<HouseRule> houseRule;
-        private List<StatRule> statRule;
+        private List<ResiRule> resiRuleList;
+        private List<HouseRule> houseRuleList;
+        private List<StatRule> statRuleList;
     }
 
     @Data
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java
index 5659dca060..1216c2b193 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java
@@ -2,10 +2,13 @@ package com.epmet.dataaggre.controller;
 
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
 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.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.epmetuser.form.IcUserCategoryFormDTO;
@@ -14,7 +17,9 @@ import com.epmet.dataaggre.dto.epmetuser.result.IcUserCategoryResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO;
 import com.epmet.dataaggre.service.ResiService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,7 +35,7 @@ import java.util.Set;
 
 @RestController
 @RequestMapping("icuser")
-public class IcUserController {
+public class IcUserController implements ResultDataResolver {
 
     @Autowired
     private EpmetUserService epmetUserService;
@@ -38,6 +43,9 @@ public class IcUserController {
     @Autowired
     private ResiService icResiService;
 
+    @Autowired
+    private EpmetHeartOpenFeignClient heartOpenFeignClient;
+
     /**
      * 【人员类别分析】-各类别人数
      *
@@ -59,13 +67,14 @@ public class IcUserController {
      */
     @PostMapping("listByPolicyRules")
     public Result<PageData<ResiByPolicyInfoResultDTO>> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) {
+
+        List<ResisByPolicyRulesFormDTO.ResiRule> resiRule = input.getRuleList().getResiRuleList();
+        List<ResisByPolicyRulesFormDTO.HouseRule> houseRule = input.getRuleList().getHouseRuleList();
+        List<ResisByPolicyRulesFormDTO.StatRule> statRule = input.getRuleList().getStatRuleList();
+
         Integer pageNo = input.getPageNo();
         Integer pageSize = input.getPageSize();
 
-        List<ResisByPolicyRulesFormDTO.ResiRule> resiRule = input.getRuleList().getResiRule();
-        List<ResisByPolicyRulesFormDTO.HouseRule> houseRule = input.getRuleList().getHouseRule();
-        List<ResisByPolicyRulesFormDTO.StatRule> statRule = input.getRuleList().getStatRule();
-
         String orgId = input.getOrgId();
         String orgType = input.getOrgType();
         String neighborHoodId = input.getNeighborHoodId();
@@ -74,8 +83,22 @@ public class IcUserController {
         String houseId = input.getHouseId();
         String idCard = input.getIdCard();
         String name = input.getName();
+        String ruleId = input.getRuleId();
+
+        if (StringUtils.isNotBlank(ruleId)) {
+            // 从heart取，覆盖形参
+            com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO.RuleList ruleList = getResultDataOrThrowsException(
+                    heartOpenFeignClient.listPolicyRules4QueryAndExport(ruleId),
+                    ServiceConstant.EPMET_HEART_SERVER,
+                    EpmetErrorCode.SERVER_ERROR.getCode(),
+                    null, null);
+
+            resiRule = ConvertUtils.sourceToTarget(ruleList.getResiRuleList(), ResisByPolicyRulesFormDTO.ResiRule.class);
+            houseRule = ConvertUtils.sourceToTarget(ruleList.getHouseRuleList(), ResisByPolicyRulesFormDTO.HouseRule.class);
+            statRule = ConvertUtils.sourceToTarget(ruleList.getStatRuleList(), ResisByPolicyRulesFormDTO.StatRule.class);
+        }
 
-        // 全都为空，则返回空
+        // 全都为空，则返回空ç
         if (CollectionUtils.isEmpty(resiRule)
             && CollectionUtils.isEmpty(houseRule)
             && CollectionUtils.isEmpty(statRule)) {
@@ -97,7 +120,7 @@ public class IcUserController {
             icResiService.exportResisByPolicy(
                     input.getOrgId(), input.getOrgType(), input.getNeighborHoodId(), input.getBuildingId(), input.getUnitId(),
                     input.getHouseId(), input.getIdCard(), input.getName(), input.getPageNo(), input.getPageSize(),
-                    input.getRuleId(), input.getRuleList().getResiRule(), input.getRuleList().getHouseRule(), input.getRuleList().getStatRule(), response);
+                    input.getRuleId(), input.getRuleList().getResiRuleList(), input.getRuleList().getHouseRuleList(), input.getRuleList().getStatRuleList(), response);
         } catch (IOException e) {
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "导出Excel文件失败", "导出Excel文件失败");
         }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
index b0de4560f1..44a522eaa7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
@@ -167,9 +167,9 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
                     EpmetErrorCode.SERVER_ERROR.getCode(),
                     null, null);
 
-            resiRule = ConvertUtils.sourceToTarget(ruleList.getResiRule(), ResisByPolicyRulesFormDTO.ResiRule.class);
-            houseRule = ConvertUtils.sourceToTarget(ruleList.getHouseRule(), ResisByPolicyRulesFormDTO.HouseRule.class);
-            statRule = ConvertUtils.sourceToTarget(ruleList.getStatRule(), ResisByPolicyRulesFormDTO.StatRule.class);
+            resiRule = ConvertUtils.sourceToTarget(ruleList.getResiRuleList(), ResisByPolicyRulesFormDTO.ResiRule.class);
+            houseRule = ConvertUtils.sourceToTarget(ruleList.getHouseRuleList(), ResisByPolicyRulesFormDTO.HouseRule.class);
+            statRule = ConvertUtils.sourceToTarget(ruleList.getStatRuleList(), ResisByPolicyRulesFormDTO.StatRule.class);
         }
 
         ServletOutputStream ostream = response.getOutputStream();
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java
index 11ff13ac65..b02273a16c 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java
@@ -28,14 +28,18 @@ public class HeartResisByPolicyRulesFormDTO {
     private Integer pageSize;
 
     @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class RuleList {
         private String ruleName;
-        private List<ResisByPolicyRulesFormDTO.ResiRule> resiRule;
-        private List<ResisByPolicyRulesFormDTO.HouseRule> houseRule;
-        private List<ResisByPolicyRulesFormDTO.StatRule> statRule;
+        private List<ResisByPolicyRulesFormDTO.ResiRule> resiRuleList;
+        private List<ResisByPolicyRulesFormDTO.HouseRule> houseRuleList;
+        private List<ResisByPolicyRulesFormDTO.StatRule> statRuleList;
     }
 
     @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class ResiRule {
         private String ruleDesc;
         private String nextLogicalRel;
@@ -48,6 +52,8 @@ public class HeartResisByPolicyRulesFormDTO {
     }
 
     @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class HouseRule {
         private String colTable;
         private String colKey;
@@ -58,6 +64,8 @@ public class HeartResisByPolicyRulesFormDTO {
     }
 
     @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class StatRule {
         private String colKey;
         private String colVal;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java
index 9522159e12..b65e138cdc 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java
@@ -28,9 +28,9 @@ public class ResisByPolicyRulesFormDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class RuleList {
-        private List<ResiRule> resiRule;
-        private List<HouseRule> houseRule;
-        private List<StatRule> statRule;
+        private List<ResiRule> resiRuleList;
+        private List<HouseRule> houseRuleList;
+        private List<StatRule> statRuleList;
     }
 
     @Data
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
index f27d291844..7b73ce9894 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
@@ -55,6 +55,7 @@ public class IcPolicyController {
      * @param input
      * @return
      */
+    @Deprecated
     @PostMapping("resiuserlist")
     public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) {
         // 调整错位的逻辑符号位置
@@ -146,7 +147,6 @@ public class IcPolicyController {
     /**
      * Desc: 政策列表下拉选
      * @param tokenDto
-     * @param formDTO
      * @author zxc
      * @date 2022/7/21 09:48
      */
@@ -199,7 +199,7 @@ public class IcPolicyController {
                             r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal()))
                     .collect(Collectors.toList());
 
-            data.setResiRule(resiRules);
+            data.setResiRuleList(resiRules);
         }
 
         // house规则
@@ -210,7 +210,7 @@ public class IcPolicyController {
                     .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(),
                             r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType()))
                     .collect(Collectors.toList());
-            data.setHouseRule(houseRules);
+            data.setHouseRuleList(houseRules);
         }
 
         // stat规则
@@ -222,7 +222,7 @@ public class IcPolicyController {
                             r.getRuleDesc(), r.getQueryType(), r.getColTable()))
                     .collect(Collectors.toList());
 
-            data.setStatRule(statRules);
+            data.setStatRuleList(statRules);
         }
 
         return new Result<ResisByPolicyRulesFormDTO.RuleList>().ok(data);
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
index 77900d2519..30d6b265ef 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
@@ -340,7 +340,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
                                 r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal()))
                         .collect(Collectors.toList());
 
-                aggForm.getRuleList().setResiRule(resiRules);
+                aggForm.getRuleList().setResiRuleList(resiRules);
             }
 
             // house规则
@@ -351,7 +351,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
                         .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(),
                                 r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType()))
                         .collect(Collectors.toList());
-                aggForm.getRuleList().setHouseRule(houseRules);
+                aggForm.getRuleList().setHouseRuleList(houseRules);
             }
 
             // stat规则
@@ -363,7 +363,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
                                 r.getRuleDesc(), r.getQueryType(), r.getColTable()))
                         .collect(Collectors.toList());
 
-                aggForm.getRuleList().setStatRule(statRules);
+                aggForm.getRuleList().setStatRuleList(statRules);
             }
         }
 

From 04573f808af7c9d826557acfb127678d776feb7f Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 21 Jul 2022 14:19:16 +0800
Subject: [PATCH 12/15] -

---
 .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 267af969ea..7c710b9e03 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -45,6 +45,7 @@ import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.result.StaffRoleResultDTO;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -848,7 +849,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     public List<ResiByPolicyInfoResultDTO> listByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
                                                              String houseId, String idCard, String name, Integer pageNo, Integer pageSize,
                                                              List<ResisByPolicyRulesFormDTO.ResiRule> resiRule, List<String> houseIds) {
-
+        PageHelper.startPage(pageNo, pageSize);
         return icResiUserDao.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds);
     }
 

From 9e1be9537c494f36d18a9cf82214d06f84a016ee Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 21 Jul 2022 15:00:46 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0orgIdPath=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/epmetuser/IcResiUserDao.java          |  2 ++
 .../service/epmetuser/EpmetUserService.java   |  4 ++--
 .../epmetuser/impl/EpmetUserServiceImpl.java  |  8 +++----
 .../service/govorg/GovOrgService.java         |  2 +-
 .../govorg/impl/GovOrgServiceImpl.java        |  8 ++++---
 .../service/impl/ResiServiceImpl.java         | 24 +++++++++++++++----
 .../mapper/epmetuser/IcResiUserDao.xml        |  1 +
 7 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java
index 5dd78f714c..8705014852 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java
@@ -69,6 +69,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @return
      */
     List<ResiByPolicyInfoResultDTO> listByPolicyRules(@Param("customerId") String customerId,
+                                                      @Param("orgIdPath") String orgIdPath,
                                                       @Param("orgId") String orgId,
                                                       @Param("orgType") String orgType,
                                                       @Param("neighborHoodId") String neighborHoodId,
@@ -86,6 +87,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @return
      */
     Integer getTotalByPolicyRules(@Param("customerId") String customerId,
+                                  @Param("orgIdPath") String orgIdPath,
                                                       @Param("orgId") String orgId,
                                                       @Param("orgType") String orgType,
                                                       @Param("neighborHoodId") String neighborHoodId,
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
index ca91cd86e7..01b9dae907 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -201,11 +201,11 @@ public interface EpmetUserService {
      */
     List<StaffSelectResDTO> staffSelectList(List<String> staffIds);
 
-    List<ResiByPolicyInfoResultDTO> listByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
+    List<ResiByPolicyInfoResultDTO> listByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
                                                       String houseId, String idCard, String name, Integer pageNo, Integer pageSize,
                                                       List<ResisByPolicyRulesFormDTO.ResiRule> resiRule, List<String> houseIds);
 
-    Integer getTotalByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
+    Integer getTotalByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
                                                       String houseId, String idCard, String name,
                                                       List<ResisByPolicyRulesFormDTO.ResiRule> resiRule, List<String> houseIds);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 7c710b9e03..000affa6ff 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -846,15 +846,15 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     }
 
     @Override
-    public List<ResiByPolicyInfoResultDTO> listByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
+    public List<ResiByPolicyInfoResultDTO> listByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
                                                              String houseId, String idCard, String name, Integer pageNo, Integer pageSize,
                                                              List<ResisByPolicyRulesFormDTO.ResiRule> resiRule, List<String> houseIds) {
         PageHelper.startPage(pageNo, pageSize);
-        return icResiUserDao.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds);
+        return icResiUserDao.listByPolicyRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds);
     }
 
     @Override
-    public Integer getTotalByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List<ResisByPolicyRulesFormDTO.ResiRule> resiRule, List<String> houseIds) {
-        return icResiUserDao.getTotalByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds);
+    public Integer getTotalByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List<ResisByPolicyRulesFormDTO.ResiRule> resiRule, List<String> houseIds) {
+        return icResiUserDao.getTotalByPolicyRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds);
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 237a0cf6f2..c3908fad04 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -218,7 +218,7 @@ public interface GovOrgService {
      */
     CustomerAgencyEntity getRootAgencyByCustomerId(String customerId);
 
-    List<IcHouseEntity> listHousesByRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId,
+    List<IcHouseEntity> listHousesByRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId,
                                           String unitId, String houseId, List<ResisByPolicyRulesFormDTO.HouseRule> houseRule,
                                           List<ResisByPolicyRulesFormDTO.StatRule> statRule, Integer pageNo, Integer pageSize);
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 945cb2ab59..a57f014463 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -1110,7 +1110,7 @@ public class GovOrgServiceImpl implements GovOrgService {
     }
 
     @Override
-    public List<IcHouseEntity> listHousesByRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId,
+    public List<IcHouseEntity> listHousesByRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId,
                                                  String unitId, String houseId, List<ResisByPolicyRulesFormDTO.HouseRule> houseRule,
                                                  List<ResisByPolicyRulesFormDTO.StatRule> statRule, Integer pageNo, Integer pageSize) {
 
@@ -1120,11 +1120,13 @@ public class GovOrgServiceImpl implements GovOrgService {
 
         QueryWrapper<IcHouseEntity> query = new QueryWrapper<>();
 
+        // 如果参数里面选了，就用参数选择的来查询，没有选择的话，就查询当前工作人员所属组织的本级及下级
         if (StringUtils.isNotBlank(orgId) && StringUtils.isNotBlank(orgType)) {
-            String orgIdPath = getOrgIdPath(orgId, orgType);
-            query.likeRight(StringUtils.isNotBlank(orgIdPath), "ORG_ID_PATH", orgIdPath);
+            orgIdPath = getOrgIdPath(orgId, orgType);
         }
 
+        query.likeRight(StringUtils.isNotBlank(orgIdPath), "ORG_ID_PATH", orgIdPath);
+
         if (StringUtils.isNotBlank(customerId)) {
             query.eq("CUSTOMER_ID", customerId);
         }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
index 44a522eaa7..428d87ed3e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
@@ -22,7 +22,10 @@ import com.epmet.dataaggre.service.ResiService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -48,21 +51,34 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
     @Autowired
     private EpmetHeartOpenFeignClient heartOpenFeignClient;
 
+    @Autowired
+    private EpmetUserOpenFeignClient userOpenFeignClient;
+
     @Override
     public PageData<ResiByPolicyInfoResultDTO> listByPolicyRules(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId,
                                                              String houseId, String idCard, String name, Integer pageNo, Integer pageSize,
                                                              List<ResisByPolicyRulesFormDTO.ResiRule> resiRule,
                                                              List<ResisByPolicyRulesFormDTO.HouseRule> houseRule,
                                                              List<ResisByPolicyRulesFormDTO.StatRule> statRule) {
+        String userId = EpmetRequestHolder.getLoginUserId();
+        String app = EpmetRequestHolder.getLoginUserApp();
+        String client = EpmetRequestHolder.getLoginUserClient();
         String customerId = EpmetRequestHolder.getLoginUserCustomerId();
 
+        // 查询当前组织及下级id路径
+        LoginUserDetailsResultDTO userDetail = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO(app, client, userId)),
+                ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
+
+        String orgIdPath = userDetail.getOrgIdPath();
+
         // 结果集
         List<ResiByPolicyInfoResultDTO> resultResis = new ArrayList<>();
 
         // 1.用户没配置house和stat规则，直接按照居民规则查询
         if (CollectionUtils.isEmpty(houseRule) && CollectionUtils.isEmpty(statRule)) {
-            List<ResiByPolicyInfoResultDTO> resis = epmetUserService.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId,
+            List<ResiByPolicyInfoResultDTO> resis = epmetUserService.listByPolicyRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId,
                     houseId, idCard, name, pageNo, pageSize, resiRule, null);
+            fillResisExtraInfoForPolicy(resis);
             return new PageData<>(resis, new PageInfo(resis).getTotal());
         }
 
@@ -71,7 +87,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
         int total = 0;
         do {
             // 拿到房屋id列表，去查询居民列表
-            List<IcHouseEntity> houseEntities = govOrgService.listHousesByRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId,
+            List<IcHouseEntity> houseEntities = govOrgService.listHousesByRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId,
                     houseId, houseRule, statRule, housePageNo, 50);
             List<String> houseIds = houseEntities.stream().map(icHouseEntity -> icHouseEntity.getId()).collect(Collectors.toList());
 
@@ -83,7 +99,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
             // 查询居民，满了20个，不再查询数据,只查询数量
             if (resultResis.size() < pageSize) {
                 List<ResiByPolicyInfoResultDTO> resis = epmetUserService.listByPolicyRules(
-                        customerId, orgId, orgType, neighborHoodId, buildingId, unitId,
+                        customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId,
                         houseId, idCard, name, pageNo, pageSize, resiRule, houseIds);
 
                 resultResis.addAll(resis);
@@ -91,7 +107,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
 
             // 查询数量
             Integer count = epmetUserService.getTotalByPolicyRules(
-                    customerId, orgId, orgType, neighborHoodId, buildingId, unitId,
+                    customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId,
                     houseId, idCard, name, resiRule, houseIds);
 
             total += count;
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
index 8fa83ca190..ffb7246583 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
@@ -73,6 +73,7 @@
         <where>
             ic_resi_user.status='0'
             and ic_resi_user.CUSTOMER_ID=#{customerId}
+            and ic_resi_user.PIDS LIKE CONCAT(#{orgIdPath},'%')
             and ic_resi_user.del_flag='0'
             <!--组织过滤-->
             <if test="orgId != null and orgId != '' and orgType != null and orgType != ''">

From 0226eda45026586cb0e1479851eb073e17c924dc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 21 Jul 2022 15:11:34 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E5=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/policy/IcPolicyRuleDetailDTO.java    | 24 +++++++++++++++++++
 .../entity/IcPolicyRuleDetailEntity.java      | 23 ++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
index 79be9a25ff..d9f15f9637 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
@@ -66,5 +66,29 @@ public class IcPolicyRuleDetailDTO {
      */
     @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
     private String colVal;
+
+    /**
+     * 用于前端展示：基础信息、教育信息、房屋类型.....
+     */
+    private String itemGroupName;
+    /**
+     * 用于前端展示：姓名、手机号、......
+     */
+    private String itemLabel;
+
+    /**
+     * 用于前端展示：等于、不等于、大于、小于....
+     */
+    private String queryTypeName;
+
+    /**
+     * 用于前端展示：参数值显示值eg:男女
+     */
+    private String colValLabel;
+
+    /**
+     * 用于前端展示：逻辑：并且、或者
+     */
+    private String nextLogicalRelName;
 }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java
index 7516f2aca6..9a29c03d1b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java
@@ -84,4 +84,27 @@ public class IcPolicyRuleDetailEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 用于前端展示：基础信息、教育信息、房屋类型.....
+	 */
+	private String itemGroupName;
+	/**
+	 * 用于前端展示：姓名、手机号、......
+	 */
+	private String itemLabel;
+
+	/**
+	 * 用于前端展示：等于、不等于、大于、小于....
+	 */
+	private String queryTypeName;
+
+	/**
+	 * 用于前端展示：参数值显示值eg:男女
+	 */
+	private String colValLabel;
+
+	/**
+	 * 用于前端展示：逻辑：并且、或者
+	 */
+	private String nextLogicalRelName;
 }

From 9d0aadedacc26e5375e9b4f7bf58128d4772362b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 21 Jul 2022 16:24:59 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E5=8F=82=E6=88=98=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V0.0.32__policy_flag.sql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql
index 59bb1f75d5..452d0df446 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql
@@ -14,4 +14,4 @@ where  i.DEL_FLAG='0'
   and  i.COLUMN_NAME is not null
   and  i.COLUMN_NAME !=''
   and  i.ITEM_TYPE not in('cascader')
-  and  i.label not in ('分割线','出生日期');
\ No newline at end of file
+  and  i.label not in ('分割线','出生日期','参战时间');
\ No newline at end of file