diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java index 8eafe4c7..40169ebc 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java @@ -60,6 +60,15 @@ public class DocTemplateInstanceRespVO { @Schema(description = "版本号", example = "v1.0") private String version; + @Schema(description = "模板名称", example = "采购合同模板") + private String templateName; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + @Schema(description = "更新人", example = "admin") + private String updater; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java index 0fec83f8..6f45d4f9 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java @@ -37,4 +37,8 @@ public class TemplateInstanceItemRespVO { @ExcelProperty("条款名") private String itmName; + @Schema(description = "条款编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("条款编码") + private String itmNum; + } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java index 55824e59..461674e4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java @@ -149,19 +149,56 @@ public class DocTemplateInstanceServiceImpl implements DocTemplateInstanceServic @Override public DocTemplateInstanceRespVO getTemplateInstance(Long id) { DocTemplateInstanceDO templateInstance = docTemplateInstanceMapper.selectById(id); - return DocTemplateInstanceConvert.INSTANCE.convert(templateInstance); + DocTemplateInstanceRespVO respVO = DocTemplateInstanceConvert.INSTANCE.convert(templateInstance); + + // 填充模板名称 + if (respVO != null && respVO.getTemplateId() != null) { + DocTemplateDO template = docTemplateMapper.selectById(respVO.getTemplateId()); + if (template != null) { + respVO.setTemplateName(template.getTmplName()); + } + } + + return respVO; } @Override public PageResult getTemplateInstancePage(DocTemplateInstancePageReqVO pageReqVO) { PageResult pageResult = docTemplateInstanceMapper.selectPage(pageReqVO); - return DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult); + PageResult respVOPageResult = DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult); + + // 填充模板名称 + fillTemplateName(respVOPageResult.getList()); + + return respVOPageResult; } @Override public List getTemplateInstanceList() { List list = docTemplateInstanceMapper.selectList(); - return DocTemplateInstanceConvert.INSTANCE.convertList(list); + List respVOList = DocTemplateInstanceConvert.INSTANCE.convertList(list); + + // 填充模板名称 + fillTemplateName(respVOList); + + return respVOList; + } + + /** + * 填充模板名称 + */ + private void fillTemplateName(List list) { + if (list == null || list.isEmpty()) { + return; + } + for (DocTemplateInstanceRespVO vo : list) { + if (vo.getTemplateId() != null) { + DocTemplateDO template = docTemplateMapper.selectById(vo.getTemplateId()); + if (template != null) { + vo.setTemplateName(template.getTmplName()); + } + } + } } } 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 97820d1e..82515295 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 @@ -401,6 +401,8 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService { templateInstanceItemRespVOS.forEach(templateInstanceItemRespVO -> { if (templateInstanceItemRespVO.getItmId().equals(tmplItmDO.getId())) { templateInstanceItemRespVO.setItmName(tmplItmDO.getItmName()); + templateInstanceItemRespVO.setItmNum(tmplItmDO.getItmNum()); + templateInstanceItemRespVO.setVal(tmplItmDO.getItmVal()); } }); }); diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java index b17c2a13..bba6c417 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java @@ -287,6 +287,6 @@ public class PurchaseOrderDO extends BusinessBaseDO { /** * 货权准转移类型 */ - @TableField("MTRG_TP") + @TableField("MTNG_TP") private String meteringType; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java index c375f286..413ae0ce 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java @@ -306,5 +306,6 @@ public class SalesOrderDO extends BusinessBaseDO { /** * 货权准转移类型 */ + @TableField("MTNG_TP") private String meteringType; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java index a6fa05e1..2e5cf0ff 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java @@ -24,10 +24,10 @@ public interface PurchaseOrderMapper extends BaseMapperX { default PageResult selectPage(PurchaseOrderPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(PurchaseOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber()) + .likeIfPresent(PurchaseOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber()) .likeIfPresent(PurchaseOrderDO::getSystemOrderNumber, reqVO.getSystemOrderNumber()) - .eqIfPresent(PurchaseOrderDO::getCpNum, reqVO.getCompanyNumber()) - .eqIfPresent(PurchaseOrderDO::getSupplierNumber, reqVO.getSupplierNumber()) + .likeIfPresent(PurchaseOrderDO::getCpNum, reqVO.getCompanyNumber()) + .likeIfPresent(PurchaseOrderDO::getSupplierNumber, reqVO.getSupplierNumber()) .likeIfPresent(PurchaseOrderDO::getSupplierName, reqVO.getSupplierName()) .eqIfPresent(PurchaseOrderDO::getType, reqVO.getType()) .betweenIfPresent(PurchaseOrderDO::getVoucherDate, reqVO.getVoucherDate()) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java index d54853fe..5c35de1f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java @@ -21,7 +21,7 @@ public interface SalesOrderMapper extends BaseMapperX { default PageResult selectPage(SalesOrderPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(SalesOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber()) + .likeIfPresent(SalesOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber()) .eqIfPresent(SalesOrderDO::getSystemOrderNumber, reqVO.getSystemOrderNumber()) .eqIfPresent(SalesOrderDO::getCpNum, reqVO.getCpNum()) .eqIfPresent(SalesOrderDO::getSupplierNumber, reqVO.getSupplierNumber()) @@ -37,8 +37,8 @@ public interface SalesOrderMapper extends BaseMapperX { .eqIfPresent(SalesOrderDO::getPurchaseGroup, reqVO.getPurchaseGroup()) .eqIfPresent(SalesOrderDO::getCurrencyNumber, reqVO.getCurrencyNumber()) .eqIfPresent(SalesOrderDO::getExchangeRate, reqVO.getExchangeRate()) - .eqIfPresent(SalesOrderDO::getPaperContractNumber, reqVO.getPaperContractNumber()) - .eqIfPresent(SalesOrderDO::getAgreementNumber, reqVO.getAgreementNumber()) + .likeIfPresent(SalesOrderDO::getPaperContractNumber, reqVO.getPaperContractNumber()) + .likeIfPresent(SalesOrderDO::getAgreementNumber, reqVO.getAgreementNumber()) .eqIfPresent(SalesOrderDO::getRemark, reqVO.getRemark()) .eqIfPresent(SalesOrderDO::getAgentNumber, reqVO.getAgentNumber()) .likeIfPresent(SalesOrderDO::getAgentName, reqVO.getAgentName())