From 4a501622b3caba40b06cffdb398273854bb47036 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 09:36:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=B3=E4=BE=A7item?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcExportTemplateDTO.java | 31 --------- ...java => IcExportTemplateQueryFormDTO.java} | 2 +- .../dto/form/IcExportTemplateSaveFormDTO.java | 65 +++++++++++++++++++ .../com/epmet/dto/result/FormItemResult.java | 2 +- .../feign/OperCustomizeOpenFeignClient.java | 2 +- .../OperCustomizeOpenFeignClientFallback.java | 2 +- .../IcExportTemplateController.java | 10 +-- .../controller/IcFormItemController.java | 11 ++++ .../com/epmet/dao/IcExportTemplateDao.java | 4 +- .../java/com/epmet/dao/IcFormItemDao.java | 10 +++ .../entity/IcExportTemplateConfigEntity.java | 2 +- .../service/IcExportTemplateService.java | 17 ++--- .../com/epmet/service/IcFormItemService.java | 8 +++ .../impl/IcExportTemplateServiceImpl.java | 17 ++--- .../service/impl/IcFormItemServiceImpl.java | 5 ++ .../mapper/IcExportTemplateConfigDao.xml | 4 +- .../main/resources/mapper/IcFormItemDao.xml | 11 ++++ .../impl/IcResiUserExportServiceImpl.java | 4 +- 18 files changed, 136 insertions(+), 71 deletions(-) rename epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/{IcExportTemplateFormDTO.java => IcExportTemplateQueryFormDTO.java} (91%) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java index 95805207fd..b17950a528 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** @@ -52,34 +51,4 @@ public class IcExportTemplateDTO implements Serializable { */ private Integer sort; - /** - * 0未删除，1已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java similarity index 91% rename from epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java rename to epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java index a7d52bf75b..9c97e6a75b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; * @since v1.0.0 2022-04-21 */ @Data -public class IcExportTemplateFormDTO implements Serializable { +public class IcExportTemplateQueryFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java new file mode 100644 index 0000000000..9f872327d9 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 自定义表单导出模板 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportTemplateSaveFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 表单CODE，从字典获取 + */ + private String formCode; + + /** + * 模板名称 + */ + @NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + private String name; + + /** + * 0:动态；1:文件 + */ + private Integer type; + + /** + * 父id + */ + private String pid; + + /** + * ic_form_item.id + */ + @NotBlank(message = "itemId不能为空",groups = AddGroup.class) + private String itemId; + + /** + * 表头宽度 + */ + private Integer width; + + /** + * 项标签 + */ + @NotBlank(message = "名称不能为空",groups = AddGroup.class) + private String label; + + /** + * 排序 + */ + private Integer sort; + + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java index dfe0b85ffa..2aad76f805 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java @@ -16,7 +16,7 @@ public class FormItemResult implements Serializable { private static final long serialVersionUID = 7443085469505238040L; /** - * 父项ID + * ID */ private String itemId; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 7c6922e69c..fbf479ac9a 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -168,5 +168,5 @@ public interface OperCustomizeOpenFeignClient { * @return */ @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport") - Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param); + Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index 19a01082cc..e55eb3bb92 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -126,7 +126,7 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe } @Override - public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateFormDTO param) { + public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateQueryFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param); } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java index 7804e07bb8..e9343b87af 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java @@ -6,10 +6,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.ExportGroup; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.service.IcExportTemplateService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,9 +45,9 @@ public class IcExportTemplateController { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcExportTemplateDTO dto) { + public Result save(@RequestBody IcExportTemplateSaveFormDTO dto) { //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, AddGroup.class); icExportTemplateService.save(dto); return new Result(); } @@ -68,7 +68,7 @@ public class IcExportTemplateController { * @return */ @PostMapping("getExcelHeaderAndSqlColumnForExport") - public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param) { + public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param) { ValidatorUtils.validateEntity(param, ExportGroup.class); return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param)); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java index 49c54f3d21..80d6f47037 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.EditIFormItemFormDTO; import com.epmet.dto.result.ColumnTableNameResultDTO; +import com.epmet.dto.result.FormItemResult; import com.epmet.dto.result.ResiCategoryItemResultDTO; import com.epmet.service.IcFormItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,4 +89,14 @@ public class IcFormItemController { icFormItemService.initQueryBuilder(customerId); return new Result(); } + + /** + * 根据分组id 获取分组下的item + * @return + */ + @PostMapping("getItemList/{groupId}") + public Result> getItemListByGroupId(@RequestHeader String customerId, @PathVariable("groupId") String groupId){ + List list = icFormItemService.getItemListByGroupId(customerId,groupId); + return new Result().ok(list); + } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java index 8cf3df7aa5..32eaa6d723 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java @@ -1,7 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import org.apache.ibatis.annotations.Mapper; @@ -17,5 +17,5 @@ import java.util.List; @Mapper public interface IcExportTemplateDao extends BaseDao { - List getTemplateConfigForExport(IcExportTemplateFormDTO param); + List getTemplateConfigForExport(IcExportTemplateQueryFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index bb02a5425c..2647805d6f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -91,8 +91,18 @@ public interface IcFormItemDao extends BaseDao { /** * desc:根据Id获取item对应的表名和item属性 + * * @param itemId * @return */ ConditionResultDTO getConditionItem(@Param("itemId") String itemId); + + /** + * desc:根据客户Id 和groupId 获取item配置项 + * + * @param customerId + * @param groupId + * @return + */ + List getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java index 338164da26..60a8094221 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java @@ -41,7 +41,7 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { /** * ic_form_item.id */ - private String formItemId; + private String itemId; /** * 表头宽度 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java index cc6e7fdd1c..1d2f22c0de 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java @@ -3,7 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; @@ -56,17 +57,7 @@ public interface IcExportTemplateService extends BaseService { * @param customerId */ void initQueryBuilder(String customerId); + + /** + * desc:根据groupId 获取itemlist + * @param customerId + * @param groupId + * @return + */ + List getItemListByGroupId(String customerId, String groupId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index d5bdca582f..df4303fe3e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -11,7 +11,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcExportTemplateDao; import com.epmet.dao.IcFormItemDao; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.ConditionResultDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; @@ -75,18 +76,12 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl list = icExportTemplateDao.getTemplateConfigForExport(param); if (CollectionUtils.isEmpty(list)) { return null; 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 0fee230ef5..c8f91539e2 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 @@ -256,6 +256,11 @@ public class IcFormItemServiceImpl extends BaseServiceImpl getItemListByGroupId(String customerId, String groupId) { + return baseDao.getItemListByGroupId(customerId,groupId); + } + private String queryType(String itemType) { String queryType; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml index 7d3e620e9d..0c92cd18e0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml @@ -8,7 +8,7 @@ - + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index f8d80c96ac..876f98f972 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -252,4 +252,15 @@ and ifi.DEL_FLAG = '0' AND ifig.DEL_FLAG = '0' + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 561f654358..2e0383ccd4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -12,7 +12,7 @@ import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.constant.IcResiUserConstant; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcResiUserPageFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -62,7 +62,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { ExcelWriter excelWriter = null; try { //获取模板条件 - IcExportTemplateFormDTO param = new IcExportTemplateFormDTO(); + IcExportTemplateQueryFormDTO param = new IcExportTemplateQueryFormDTO(); param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); param.setCustomerId("default"); param.setTempId(pageFormDTO.getTemplateId()); From 92869c8d5f481a3661f9d6fae5d4386468e0e9be Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 25 Apr 2022 10:11:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=B3=E4=BE=A7item?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java index 9f872327d9..91d2a31918 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -21,6 +21,7 @@ public class IcExportTemplateSaveFormDTO implements Serializable { /** * 表单CODE，从字典获取 */ + @NotBlank(message = "表单CODE不能为空",groups = AddGroup.class) private String formCode; /** @@ -62,4 +63,5 @@ public class IcExportTemplateSaveFormDTO implements Serializable { private Integer sort; + } From 8871d547dffae8b52046ceed4205edaefef9d2dc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:30:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BAdto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcExportItemListFormDTO.java | 54 +++++++++++++++++++ .../dto/form/IcExportTemplateSaveFormDTO.java | 34 +++++------- 2 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java new file mode 100644 index 0000000000..b1b340a34a --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java @@ -0,0 +1,54 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + + +/** + * 自定义表单导出模板 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportItemListFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "请至少添加一个导出项") + private List subItemList; + + /** + * 父id + */ + private String pid; + + /** + * ic_form_item.id + */ + @NotBlank(message = "itemId不能为空",groups = AddGroup.class) + private String itemId; + + /** + * 表头宽度 + */ + private Integer width; + + /** + * 项标签 + */ + @NotBlank(message = "名称不能为空",groups = AddGroup.class) + private String label; + + /** + * 排序 + */ + private Integer sort; + + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java index 91d2a31918..b32ce0435f 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -4,7 +4,9 @@ import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import java.util.List; /** @@ -18,6 +20,11 @@ public class IcExportTemplateSaveFormDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 是否保存为模板 是:true 否:false + */ + private Boolean isTemp = false; + /** * 表单CODE，从字典获取 */ @@ -35,33 +42,16 @@ public class IcExportTemplateSaveFormDTO implements Serializable { */ private Integer type; - /** - * 父id - */ - private String pid; - - /** - * ic_form_item.id - */ - @NotBlank(message = "itemId不能为空",groups = AddGroup.class) - private String itemId; - - /** - * 表头宽度 - */ - private Integer width; - - /** - * 项标签 - */ - @NotBlank(message = "名称不能为空",groups = AddGroup.class) - private String label; - /** * 排序 */ private Integer sort; + /** + * 父id + */ + @NotEmpty(message = "请至少添加一个导出项") + private List itemList; } From 340000eac1ae91d75a01d373b8cea5c900cb6c2a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:32:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BAdto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java index b32ce0435f..0f34fc2141 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; @@ -34,7 +35,8 @@ public class IcExportTemplateSaveFormDTO implements Serializable { /** * 模板名称 */ - @NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + //@NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + @Length(max = 20, message = "模板名称最多为20个字", groups = { AddGroup.class }) private String name; /** From 015809342a8bb0ec8e53f2edd1b37a66306fb5b8 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 25 Apr 2022 10:43:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5=E3=80=91=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=AD=E5=B0=86=E5=A4=A7=E7=97=85=EF=BC=8C=E6=85=A2=E7=97=85?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E4=BD=8F=E6=83=85=E5=86=B5=E7=AD=89=E7=94=B1?= =?UTF-8?q?input=E6=94=B9=E4=B8=BAselect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 73728 -> 73728 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index b93a66e9afffe9a42b0f93c9bc4e62b45f114b23..99f2034351177d40c553dab992e44674f7f7da71 100644 GIT binary patch delta 4905 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

dO%VF(F^nT?C=-ew~I zQlb+p!ckUg$C|DytcmY$u8D?O{E##$!dxUtgb5R2cOp!2ff&w3n2WVNElce7hR2Ei z@g&i>&2aOLmipLo75^=4UR@t`5kwTdDzQwGaIsvHaIr#?aIsR7sKmpPL?s@PBr4G= zDGBr_NE|o?ucj5mv_Gyn=uryWwYK(AicukV4i-ji+#Ec1JFmYwEm53{z80cQ&k=3^ z34}k>GurcPgUTM`mYuyb`jPY}indCU$Y`}Bk#ciXoBi5LL|^T}@8~NC_bV;_#nXywU09v4^=kQrp0Uxzh{sy> zT8yW(;*KJw{p}Y|TbW0z-&+zXP?rAM%5YTCOF)5U+p}ILYC1}E;4Qr{8(-^I*m~Y{ zKosWf1M}GiKJehQ85_g)75J{9O_E%o&63=przORMwn$00!G4{=dyD0L(l}KP5)Ri zPTXbX^NU*Gl2qt>ML&{1-}^~KUh!E}zLr;CUF4|vlIYa8L{Bir*R}sk``xwE3fs=N z-w=mWlye8K_+m`)v$7CQnoK{Iw$3NeS_6JjIu%dVl-)A@**)vAx1MO0rOI&NV@kwfRdt?YC4Rhuz* z#m>qxcqre=&aln|7whS8vlL5*nmPTc6Dtp8x>=FhneAcL&MFTp?p) From aaf8ca493b22ae2eae49c60b2f8cdc538bb6a901 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 25 Apr 2022 10:44:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BAdto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcExportItemListFormDTO.java | 15 +++++++++++++++ .../IcExportTemplateForExportResultDTO.java | 9 +++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java index b1b340a34a..e004da0b48 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportItemListFormDTO.java @@ -50,5 +50,20 @@ public class IcExportItemListFormDTO implements Serializable { */ private Integer sort; + /** + * 表名 + */ + private String tableName; + + /** + * 列名 + */ + private String columnName; + + /** + * 只有远程获取的才有值 + */ + private String optionSourceValue; + } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java index a40407d03b..d58189084b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcExportTemplateForExportResultDTO.java @@ -17,14 +17,15 @@ public class IcExportTemplateForExportResultDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 + * 模板主键id */ - private String id; + private String tempId; /** - * 模板主键id + * 主键 */ - private String tempId; + private String id; + /** * 父id