From 414b68908c613cf9620fd0640cce29ad36f5397f Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 15 Sep 2022 09:08:31 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=9B=BE=E8=B0=B1-?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AF=A6=E6=83=85=E9=87=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E7=94=B1=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=AC=E4=BA=BA=E6=98=AF=E6=88=BF=E4=B8=9C=E7=9A=84?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E4=BA=BA=E5=91=98=E5=B1=85=E4=BD=8F?=
 =?UTF-8?q?=E7=9A=84=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/PersonDataResultDTO.java    |  3 +++
 .../service/impl/IcResiUserServiceImpl.java      | 16 +++++++++++++++-
 .../src/main/resources/mapper/IcResiUserDao.xml  |  4 +++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
index 5e739016b3..e9873965b7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
@@ -95,4 +95,7 @@ public class PersonDataResultDTO implements Serializable {
 
     @JsonIgnore
     private String gridId;
+
+    @JsonIgnore
+    private String homeId;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 5b1fd7f8f1..ec9bf3043c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1143,11 +1143,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         personData.setIcResiUserId(formDTO.getUserId());
 
         // 房屋信息查询
-        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId());
+        //2022.9.14 应产品要求之前返的是这个人是房东的房屋信息，现在改成返回这个人当前居住的房屋信息  syc
+        /*Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId());
         if (!listResult.success()) {
             throw new RenException("查询房屋信息失败");
         }
         personData.setHouseInfo(listResult.getData());
+        */
+        Set<String> houseIds = new HashSet<>();
+        houseIds.add(personData.getHomeId());
+        Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+        if (!houseInfoRes.success()) {
+            throw new RenException("查询房屋信息失败");
+        }
+        List<String> houseInfo = new ArrayList<>();
+        if(null!=houseInfoRes.getData()&& !CollectionUtils.isEmpty(houseInfoRes.getData())){
+            houseInfo.add(houseInfoRes.getData().get(0).getAllName());
+        }
+        //2022.9.14  end
+        personData.setHouseInfo(houseInfo);
 
         // 志愿者处理
         if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)) {
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index fe17400279..4674e07b37 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -300,6 +300,7 @@
         <result column="isTenant" property="isTenant"/>
         <result column="CUSTOMER_ID" property="customerId"/>
         <result column="GRID_ID" property="gridId"/>
+        <result column="HOME_ID" property="homeId"/>
         <collection property="financialSituation" ofType="com.epmet.dto.FinancialSituationDTO">
             <result column="YSR" property="monthlyIncome"/>
             <result column="TXJE" property="retirementAmount"/>
@@ -316,7 +317,8 @@
             IS_TENANT as isTenant,
             IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
             CUSTOMER_ID,
-            GRID_ID
+            GRID_ID,
+            HOME_ID
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND ID = #{userId}

From 0c8cc30db7d56c18563b12494262d2dbed5b9f71 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 15 Sep 2022 09:24:14 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/IcEventResultDTO.java   | 1 +
 .../src/main/resources/mapper/IcEventDao.xml                   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
index 0408211603..24f8e387d0 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
@@ -16,4 +16,5 @@ public class IcEventResultDTO {
     private String reportUserName;
     private String mobile;
     private String address;
+    private String happenTime;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index ec9ff0745f..578e1073c0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -43,7 +43,8 @@
                e.REPORT_USER_ID reportUserId,
                e.NAME reportUserName,
                e.MOBILE mobile,
-               e.STATUS processStatus
+               e.STATUS processStatus,
+               e.happen_time happenTime
         from ic_event e
             <choose>
             <!-- 如果是事件分类分析，那么用inner join；如果是处理分析，那么leftjoin查询所有事件 -->

From 6594e67d486b28d07d592edfa6960292456ff2df Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Sep 2022 09:32:18 +0800
Subject: [PATCH 3/8] try

---
 .../java/com/epmet/controller/IcResiUserController.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index c25d1ff604..fb6a0c9f69 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -584,9 +584,9 @@ public class IcResiUserController implements ResultDataResolver {
     @RequestMapping(value = "/exportExcelCustomData")
     public Map<String, Object> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,
                                                      @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception {
-        log.warn("templateId=【"+templateId+"】");
         log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】");
-        pageFormDTO.setTemplateId(templateId);
+        // pageFormDTO.setTemplateId(templateId);
+        pageFormDTO.setTemplateId(tokenDto.getCustomerId().concat("_").concat(templateId));
         if (null == pageFormDTO.getSearchForm()) {
             IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO();
             searchForm.setFormCode("resi_base_info");
@@ -613,7 +613,8 @@ public class IcResiUserController implements ResultDataResolver {
             pageFormDTO.setExportConfig(exportTemplateSaveFormDTO);
         }
         //固定通用客户Id
-        pageFormDTO.setCustomerId("jmreport_resi_default");
+        // pageFormDTO.setCustomerId("jmreport_resi_default");
+        pageFormDTO.setCustomerId(tokenDto.getCustomerId());
         Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true);
         Map<String,Object> result = new HashMap<>();
         result.put("total",maps.getPages());

From db54ff9e470630d1c98aad9e311a2104f52dd578 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 16 Sep 2022 10:58:52 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=BA=94=E9=A1=BA=E5=BE=B7=E5=B1=85?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82=E9=83=A8=E5=88=86=E5=8D=81=E5=85=AB=E7=B1=BB?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=A1=A8=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9DISPLAY=E4=B8=BA=E5=B1=95=E7=A4=BA=EF=BC=8Csq?=
 =?UTF-8?q?l=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
index 3fd2eae45e..75cd379f88 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
@@ -80,6 +80,7 @@
                 i.DEL_FLAG = '0'
               AND i.PARENT_ITEM_ID = #{itemId}
         )
+         AND g.DYNAMIC = '1'
     </select>
 
     <select id="selectItemList" parameterType="map" resultMap="FormItemMap1">

From f3f02deeebb23e8a92866ce040829b698964b893 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 16 Sep 2022 11:18:29 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcFormDao.xml                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
index 75cd379f88..3fd2eae45e 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
@@ -80,7 +80,6 @@
                 i.DEL_FLAG = '0'
               AND i.PARENT_ITEM_ID = #{itemId}
         )
-         AND g.DYNAMIC = '1'
     </select>
 
     <select id="selectItemList" parameterType="map" resultMap="FormItemMap1">

From d4d5473498017a267d5196de1fd965c9fd06a664 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Sep 2022 11:58:34 +0800
Subject: [PATCH 6/8] CHILD_SHOW_FLAG

---
 .../src/main/java/com/epmet/dto/IcFormItemGroupDTO.java  | 2 +-
 .../java/com/epmet/entity/IcFormItemGroupEntity.java     | 2 +-
 .../java/com/epmet/service/impl/IcFormServiceImpl.java   | 2 ++
 .../src/main/resources/mapper/IcFormDao.xml              | 1 +
 .../resources/db/migration/V0.0.69__itemgroup_child.sql  | 9 +++++++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
index e9d4a34b8c..660171fce0 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
@@ -74,7 +74,7 @@ public class IcFormItemGroupDTO implements Serializable {
 	private Integer sort;
 
     /**
-     * 1展示，0不展示，默认1
+     * 1展示，0不展示，默认1；像党员点击是，追加党员信息这种分组，默认0不展示
      */
 	private Boolean display;
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
index af11e9b05c..0ce8f42320 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
@@ -71,7 +71,7 @@ public class IcFormItemGroupEntity extends BaseEpmetEntity {
 	private Integer sort;
 
     /**
-     * 1展示，0不展示，默认1
+     * 1展示，0不展示，默认1；像党员点击是，追加党员信息这种分组，默认0不展示
      */
 	private Boolean display;
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
index bb75b51fc4..2871ac9a3e 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
@@ -105,7 +105,9 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         if (null == resultDTO) {
             throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(), EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg());
         }
+        //基础信息这个分组对应的id:客户id_0
         String itemGroupId=formDto.getCustomerId().concat(StrConstant.UNDER_LINE).concat(NumConstant.ZERO_STR);
+        //查询的是基础信息这个分组下的组件
         List<FormItemResult> itemList = baseDao.selectItemList(itemGroupId,resultDTO.getFormId(), formDto.getDynamic());
         List<FormGroupDTO> groupList = baseDao.selectListGroup(resultDTO.getFormId());
         resultDTO.setItemList(itemList);
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
index 3fd2eae45e..32e4de0c1e 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
@@ -71,6 +71,7 @@
             ic_form_item_group g
         WHERE
             g.DEL_FLAG = '0'
+          and g.CHILD_SHOW_FLAG='1'
           AND g.id =(
             SELECT DISTINCT
                 i.ITEM_GROUP_ID
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql
new file mode 100644
index 0000000000..39c51d745e
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql
@@ -0,0 +1,9 @@
+ALTER TABLE ic_form_item_group MODIFY COLUMN `DISPLAY` TINYINT ( 1 ) NOT NULL DEFAULT '1' COMMENT '1展示，0不展示，默认1；像党员点击是，追加党员信息这种分组，默认0不展示';
+
+ALTER TABLE ic_form_item_group ADD COLUMN `CHILD_SHOW_FLAG`
+    TINYINT ( 1 ) NOT NULL DEFAULT '0' COMMENT '1展示，0不展示，默认0' AFTER POLICY_FLAG;
+
+
+UPDATE ic_form_item_group g
+set g.CHILD_SHOW_FLAG='1'
+where g.DISPLAY='0' and g.LABEL !='基础信息';
\ No newline at end of file

From 61bbb177273e3bb4df3f10b55580d8f841992ca5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Sep 2022 12:20:35 +0800
Subject: [PATCH 7/8] =?UTF-8?q?CHILD=5FSHOW=5FFLAG=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=94=BE=E9=94=99=E4=BD=8D=E7=BD=AE=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V0.0.39__itemgroup_child.sql  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql => epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.39__itemgroup_child.sql (100%)

diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.39__itemgroup_child.sql
similarity index 100%
rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql
rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.39__itemgroup_child.sql

From b50dbb588311befddf21c835963bf4f585ce886c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Sep 2022 16:50:20 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBuildingDao.xml             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 1512e7b23e..aaebe3cf78 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -235,6 +235,12 @@
         LEFT JOIN ic_neighbor_hood nh ON (nh.ID = b.NEIGHBOR_HOOD_ID AND nh.DEL_FLAG = '0')
         WHERE b.DEL_FLAG  = '0'
           AND b.NEIGHBOR_HOOD_ID = #{neighborHoodId}
+        ORDER BY
+            b.SORT ASC,
+            CAST( nh.NEIGHBOR_HOOD_NAME AS SIGNED ),
+            CONVERT ( nh.NEIGHBOR_HOOD_NAME USING gbk ),
+            CAST( b.BUILDING_NAME AS SIGNED ),
+            CONVERT ( b.BUILDING_NAME USING gbk)
     </select>
 
     <select id="checkBuildName" parameterType="map" resultType="java.lang.Integer">