From 29c31edb8daa7138bc33354c62667ade8bd3a3f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 Apr 2022 17:43:50 +0800 Subject: [PATCH] =?UTF-8?q?/icform/getcustomerform=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcFormDao.java | 2 +- .../com/epmet/dao/IcFormItemOptionsDao.java | 1 + .../service/impl/IcFormItemServiceImpl.java | 42 +++++++++++-------- .../epmet/service/impl/IcFormServiceImpl.java | 3 +- .../src/main/resources/mapper/IcFormDao.xml | 2 +- .../resources/mapper/IcFormItemOptionsDao.xml | 7 ++++ 6 files changed, 37 insertions(+), 20 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java index 41928a94ce..3c98b74b98 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java @@ -47,7 +47,7 @@ public interface IcFormDao extends BaseDao { */ CustomerFormResultDTO selectByCode(@Param("customerId") String customerId, @Param("formCode") String formCode); - List selectItemList(@Param("formId") String formId, @Param("dynamic") Boolean dynamic); + List selectItemList(@Param("itemGroupId")String itemGroupId,@Param("formId") String formId, @Param("dynamic") Boolean dynamic); List selectItemListByGroupId(String groupId); List selectListOption(String itemId); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java index d731505e3d..8bd6c3412b 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java @@ -41,4 +41,5 @@ public interface IcFormItemOptionsDao extends BaseDao { */ List volunteerLabelByValues(@Param("volunteers") List volunteers,@Param("customerId")String customerId); + int deleteByItemId(@Param("itemId") String itemId, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index 9ad0956dc7..15f0f70dfb 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.dto.form.CustomerFormQueryDTO; import com.epmet.dto.form.EditIFormItemFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcFormItemEntity; +import com.epmet.entity.IcFormItemOptionsEntity; import com.epmet.service.IcFormItemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -175,29 +176,36 @@ public class IcFormItemServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper().lambda() - .eq(StringUtils.isNotBlank(formDTO.getCustomerId()),IcFormItemEntity::getCustomerId, formDTO.getCustomerId()) - .eq(StringUtils.isNotBlank(formDTO.getFormItemId()),IcFormItemEntity::getId,formDTO.getFormItemId()) - .eq(IcFormItemEntity::getLabel,formDTO.getLabel()); - List list=baseDao.selectList(queryWrapper); - if(CollectionUtils.isEmpty(list)){ + .eq(StringUtils.isNotBlank(formDTO.getCustomerId()), IcFormItemEntity::getCustomerId, formDTO.getCustomerId()) + .eq(StringUtils.isNotBlank(formDTO.getFormItemId()), IcFormItemEntity::getId, formDTO.getFormItemId()) + .eq(IcFormItemEntity::getLabel, formDTO.getLabel()); + List list = baseDao.selectList(queryWrapper); + if (CollectionUtils.isEmpty(list)) { return; } - for(IcFormItemEntity entity:list){ + for (IcFormItemEntity entity : list) { //修改组件类型 entity.setItemType(formDTO.getItemType()); baseDao.updateById(entity); - if(!CollectionUtils.isEmpty(formDTO.getOptions())){ - //todo - // 先删除后新增 - /*int sort=1; - for(OptionDTO optionDTO:formDTO.getOptions()){ - IcFormItemOptionsEntity optionsEntity=new IcFormItemOptionsEntity(); - optionsEntity.setCustomerId(); - - }*/ + if (!CollectionUtils.isEmpty(formDTO.getOptions())) { + icFormItemOptionsDao.deleteByItemId(entity.getId(), entity.getCustomerId()); + int sort = 1; + for (OptionDTO optionDTO : formDTO.getOptions()) { + IcFormItemOptionsEntity optionsEntity = new IcFormItemOptionsEntity(); + optionsEntity.setCustomerId(entity.getCustomerId()); + optionsEntity.setFormCode(entity.getFormCode()); + optionsEntity.setFormId(entity.getFormId()); + optionsEntity.setItemId(entity.getId()); + optionsEntity.setOptionLabel(optionDTO.getLabel()); + optionsEntity.setOptionValue(optionDTO.getValue()); + optionsEntity.setSort(sort); + icFormItemOptionsDao.insert(optionsEntity); + sort++; + } } - } - } + + + } 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 3e88b05f7b..6002398fbd 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 @@ -99,7 +99,8 @@ public class IcFormServiceImpl extends BaseServiceImpl if (null == resultDTO) { throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(), EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg()); } - List itemList = baseDao.selectItemList(resultDTO.getFormId(), formDto.getDynamic()); + 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); resultDTO.setGroupList(groupList); 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 d3c2c0261e..8c4d55e2a5 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 @@ -111,7 +111,7 @@ AND fi.DYNAMIC = #{dynamic} - AND fi.ITEM_GROUP_ID = '0' + AND fi.ITEM_GROUP_ID = #{itemGroupId} ORDER BY fi.SORT ASC diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml index 36daa2158d..df920c1b33 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml @@ -16,4 +16,11 @@ ) + + + delete from ic_form_item_options + where DEL_FLAG = 0 + and ITEM_ID = #{itemId} + AND CUSTOMER_ID = #{customerId} + \ No newline at end of file