Merge branches 'dev_renwu700_syc' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_renwu700_syc

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