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 1/3] 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 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> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true); Map result = new HashMap<>(); result.put("total",maps.getPages()); 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 2/3] 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 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 itemList = baseDao.selectItemList(itemGroupId,resultDTO.getFormId(), formDto.getDynamic()); List 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 3/3] =?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