Browse Source

CHILD_SHOW_FLAG

master
yinzuomei 3 years ago
parent
commit
d4d5473498
  1. 2
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
  2. 2
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
  3. 2
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
  4. 1
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
  5. 9
      epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.69__itemgroup_child.sql

2
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; private Integer sort;
/** /**
* 1展示0不展示默认1 * 1展示0不展示默认1像党员点击是追加党员信息这种分组默认0不展示
*/ */
private Boolean display; private Boolean display;

2
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; private Integer sort;
/** /**
* 1展示0不展示默认1 * 1展示0不展示默认1像党员点击是追加党员信息这种分组默认0不展示
*/ */
private Boolean display; private Boolean display;

2
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) { if (null == resultDTO) {
throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(), EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg()); 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); String itemGroupId=formDto.getCustomerId().concat(StrConstant.UNDER_LINE).concat(NumConstant.ZERO_STR);
//查询的是基础信息这个分组下的组件
List<FormItemResult> itemList = baseDao.selectItemList(itemGroupId,resultDTO.getFormId(), formDto.getDynamic()); List<FormItemResult> itemList = baseDao.selectItemList(itemGroupId,resultDTO.getFormId(), formDto.getDynamic());
List<FormGroupDTO> groupList = baseDao.selectListGroup(resultDTO.getFormId()); List<FormGroupDTO> groupList = baseDao.selectListGroup(resultDTO.getFormId());
resultDTO.setItemList(itemList); resultDTO.setItemList(itemList);

1
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml

@ -71,6 +71,7 @@
ic_form_item_group g ic_form_item_group g
WHERE WHERE
g.DEL_FLAG = '0' g.DEL_FLAG = '0'
and g.CHILD_SHOW_FLAG='1'
AND g.id =( AND g.id =(
SELECT DISTINCT SELECT DISTINCT
i.ITEM_GROUP_ID i.ITEM_GROUP_ID

9
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 !='基础信息';
Loading…
Cancel
Save