From 4d79d1c676e9967e886cbdead1fcd4417674025d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Mon, 29 Sep 2025 11:07:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmapper=E7=9A=84xml?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/base/service/tmpltp/TemplateInstanceServiceImpl.java | 2 +- .../main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml | 2 +- .../main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java index c7f9d2f8..668aeb15 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java @@ -273,7 +273,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { newTpInstanceDO.setId(null); newTpInstanceDO.setVer(incrementVersion(templateInstanceDO.getVer())); newTpInstanceDO.setPublishTime(LocalDateTime.now()); - newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt()); + newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt()!=null?templateInstanceDO.getCntt():templateInstanceDO.getOrigCntt());//模板实例内容,默认为上一个版本的当前文件内容 newTpInstanceDO.setCreateTime(null); newTpInstanceDO.setUpdateTime(null); templateInstanceMapper.insert(newTpInstanceDO); diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml index 2f2e0b87..21372a74 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceDataMapper.xml @@ -13,7 +13,7 @@ update BSE_TMPL_INSC_DAT set deleted = 1 WHERE INSC_ID in - + #{id} diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml index 8d986206..ba5b2ece 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TemplateInstanceItemMapper.xml @@ -17,7 +17,7 @@ update BSE_TMPL_INSC_ITM set deleted = 1 WHERE INSC_ID in - + #{id} From d1fa34f8e1c97435bebec6a2c99b936e48f0e840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Mon, 29 Sep 2025 11:27:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DErrorCodeConstants?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java index 8e168935..48b65458 100644 --- a/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java +++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java @@ -5,6 +5,7 @@ import com.zt.plat.framework.common.exception.ErrorCode; public interface ErrorCodeConstants { // ========== 示例模块 1-001-000-000 ========== + //模块 base 错误码区间[1-027-000-000 ~1-028-000-000) ErrorCode TMPL_TP_NOT_EXISTS = new ErrorCode(1_027_000_500, "模板分类不存在"); ErrorCode TMPL_FLD_NOT_EXISTS = new ErrorCode(1_027_000_501, "模板字段不存在"); ErrorCode TMPL_FLD_CODE_EXISTS = new ErrorCode(1_027_000_502, "字段编码已存在"); From 9cdd7db87a650c9d5cde7b19d485a0c6f73aa872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Mon, 29 Sep 2025 11:40:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tmpltp/TemplateInstanceDataService.java | 6 +++ .../tmpltp/TemplateInstanceItemService.java | 6 +++ .../tmpltp/TemplateInstanceService.java | 50 ++++++++++++++++++- .../base/service/tmpltp/TmplItmService.java | 30 ++++++++++- .../base/service/tmpltp/TmplTpFldService.java | 32 +++++++++++- 5 files changed, 120 insertions(+), 4 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceDataService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceDataService.java index e02703a6..49fd5c54 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceDataService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceDataService.java @@ -80,6 +80,12 @@ public interface TemplateInstanceDataService { */ boolean clearTemplateInstanceData(String instanceId,List valIds); + /** + * 批量创建实例字段值 + * + * @param createReqVOS 创建参数 + * @return 实例字段值 + */ List createBatchTemplateInstanceData(List createReqVOS); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceItemService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceItemService.java index 190af06d..e180c86a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceItemService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceItemService.java @@ -63,5 +63,11 @@ public interface TemplateInstanceItemService { */ PageResult getTemplateInstanceItemPage(@Valid TemplateInstanceItemPageReqVO pageReqVO); + /** + * 批量创建实例条款值 + * + * @param createReqVOS 创建信息 + * @return 批量创建结果 + */ List createBatchTemplateInstanceItem(@Valid List createReqVOS); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java index bc4395b0..34d27dd3 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java @@ -61,10 +61,26 @@ public interface TemplateInstanceService { */ PageResult getTemplateInstancePage(TemplateInstancePageReqVO pageReqVO); + /** + * 通过实例id获得部门 + * + * @param instanId + * @return 获取部门 + */ List getDeptByInstanId(Long instanId); + /** + * 发布模板实例 + * + * @param publishReqVOS 发布参数 + */ void publishTemplateInstance(List publishReqVOS); + /** + * 获取模板实例详情 + * + * @param templateInstanceRespVO 模板实例详情 + */ void getDetailedInfo(TemplateInstanceRespVO templateInstanceRespVO); /** * 获得模板实例分页排除停用状态的 @@ -74,17 +90,49 @@ public interface TemplateInstanceService { */ PageResult listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO); + /** + * 停用启用 + * + * @param reqVO 停用启用参数 + */ void setDisableOrEnable(@Valid DisableEnableReqVO reqVO); + /** + * 创建版本 + * + * @param id 模版实例id + * @return 创建结果 + */ TemplateInstanceRespVO createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id); + /** + * 获取版本 + * + * @param id 模版实例id + * @return 获取结果 + */ Map getVersion(String id); + /** + * 通过模版编码获取模版实例 + * + * @param cdg 模版编码 + * @return 获取结果 + */ List listByCdg(String cdg); // // Map saveFile(MultipartFile file, String id); + /** + * 通过实例id，更新文件对象 + * @param id params + * + */ void updateTemplateInstanceFileUrlByInstanceId(@Valid @NotEmpty(message = "模版实例id不能为空") String id, @Valid @NotEmpty(message = "文件参数不能为空") String params); - + /** + * 获取字段和条款详情 + * @param id 模版实例id + * @return 获取结果 + */ FieldAndClauseRespVO getFieldAndClauseDetail(@Valid @NotEmpty(message = "模版实例id不能为空") String id); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplItmService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplItmService.java index 7ac4db75..65f21796 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplItmService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplItmService.java @@ -13,11 +13,37 @@ import jakarta.validation.constraints.NotEmpty; import java.util.List; public interface TmplItmService extends IService { - + /** + * 创建模板条目 + * + * @param tmplItmSaveReqVO 创建信息 + * @return 编号 + */ TmplItmRespVO createTmplItm(TmplItmSaveReqVO tmplItmSaveReqVO) ; + /** + * 更新模板条目 + * + * @param tmplItmSaveReqVO 更新信息 + */ void updateTmplItm(TmplItmSaveReqVO tmplItmSaveReqVO) ; + /** + * 删除模板条目 + * + * @param ids 编号 + */ boolean deleteTmplItm(List ids); - + /** + * 获得模板条目 + * + * @param pageReqVO 分页请求 + * @return 模板条目 + */ PageResult pageTmplItm(TmpItmPageReqVO pageReqVO); + /** + * 获得模板条目 + * + * @param ids 编号 + * @return 模板条目 + */ List listTmplItmByIds(@Valid @NotEmpty(message = "ids不能为空") List ids); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpFldService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpFldService.java index d36d8f97..66286f04 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpFldService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpFldService.java @@ -13,12 +13,42 @@ import java.util.List; import java.util.Map; public interface TmplTpFldService extends IService { + /** + * 创建模板字段 + * + * @param tmplTpFldSaveReqVO 创建信息 + * @return 编号 + */ TmplFldRespVO createTmplFld(@Valid TmplTpFldSaveReqVO tmplTpFldSaveReqVO); + /** + * 更新模板字段 + * + * @param tmplTpFldSaveReqVO 更新信息 + */ void updateTmplFld(@Valid TmplTpFldSaveReqVO tmplTpFldSaveReqVO); + /** + * 获取字段分页 + * + * @param pageReqVO 编号 + */ PageResult tmplTpFldPage(TmplFldPageReqVO pageReqVO); + /** + * 删除模板字段 + * + * @param ids 编号 + */ void deleteTmplTpByIds(List< Long> ids); + /** + * 获取字段列表 + * + * @param clazz **VO类 + */ List>getTmplTpListByClass(String clazz); - + /** + * 获取字段列表 + * + * @param valNames 字段名称 + */ List getTmplTpListByValKeys(List< String> valNames); From e7a499fa017dc75e89674bfcffcf44d6402b32e4 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Mon, 29 Sep 2025 12:00:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/admin/base/vo/AccountPageReqVO.java | 8 ++++++++ .../base/controller/admin/base/vo/AccountRespVO.java | 8 ++++++++ .../base/controller/admin/base/vo/AccountSaveReqVO.java | 7 ++++++- .../admin/base/vo/CompanyRelativityPageReqVO.java | 2 +- .../plat/module/base/dal/dataobject/base/AccountDO.java | 7 +++++++ .../zt/plat/module/base/dal/mysql/base/AccountMapper.java | 2 ++ 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java index bea67e24..3ac1d8b6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java @@ -1,7 +1,9 @@ package com.zt.plat.module.base.controller.admin.base.vo; +import com.alibaba.excel.annotation.ExcelProperty; import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -41,4 +43,10 @@ public class AccountPageReqVO extends PageParam { @Schema(description = "客商公司名称") private String customerName; + @Schema(description = "地址") + private String address; + + @Schema(description = "电话") + private String phone; + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java index 2a18a627..67640d11 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java @@ -52,4 +52,12 @@ public class AccountRespVO { @ExcelProperty("客商公司名称") private String customerName; + @Schema(description = "地址") + @ExcelProperty("地址") + private String address; + + @Schema(description = "电话") + @ExcelProperty("电话") + private String phone; + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java index c0065ed2..f1ab15ca 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java @@ -33,7 +33,6 @@ public class AccountSaveReqVO { private String taxNumber; @Schema(description = "是否启用") - @ExcelProperty("是否启用") private String isEnable; @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) @@ -43,4 +42,10 @@ public class AccountSaveReqVO { @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "客商公司名称不能为空") private String customerName; + + @Schema(description = "地址") + private String address; + + @Schema(description = "电话") + private String phone; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java index c6520966..e7fe4d2b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java @@ -32,7 +32,7 @@ public class CompanyRelativityPageReqVO extends PageParam { @Schema(description = "负责人") private String manager; - @Schema(description = "部门来源") + @Schema(description = "部门来源(字典编码：sply_cpn_rel_sts)(1:外部部门;2:同步部门;)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String departmentSource; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java index d52b76ef..f6c59544 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; /** * 账户条款 DO @@ -102,4 +103,10 @@ public class AccountDO extends BusinessBaseDO { @TableField("UPDATER_NAME") private String updaterName; + @TableField("ADDRESS") + private String address; + + @TableField("PHONE") + private String phone; + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java index 70cb4804..efe89ced 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java @@ -19,6 +19,8 @@ public interface AccountMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(AccountDO::getType, reqVO.getType()) .likeIfPresent(AccountDO::getAccountName, reqVO.getAccountName()) + .likeIfPresent(AccountDO::getAddress, reqVO.getAddress()) + .likeIfPresent(AccountDO::getPhone, reqVO.getPhone()) .eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount()) .eqIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName()) .eqIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber())