Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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">

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;
 }

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查询所有事件 -->

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;
 

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;
 

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);

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.39__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 !='基础信息';

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

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;
 }

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());

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)) {

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}