Merge remote-tracking branch 'origin/dev' into test

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;
 

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;
+
 }

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<DocTemplateInstanceRespVO> getTemplateInstancePage(DocTemplateInstancePageReqVO pageReqVO) {
         PageResult<DocTemplateInstanceDO> pageResult = docTemplateInstanceMapper.selectPage(pageReqVO);
-        return DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult);
+        PageResult<DocTemplateInstanceRespVO> respVOPageResult = DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult);
+
+        // 填充模板名称
+        fillTemplateName(respVOPageResult.getList());
+
+        return respVOPageResult;
     }
 
     @Override
     public List<DocTemplateInstanceRespVO> getTemplateInstanceList() {
         List<DocTemplateInstanceDO> list = docTemplateInstanceMapper.selectList();
-        return DocTemplateInstanceConvert.INSTANCE.convertList(list);
+        List<DocTemplateInstanceRespVO> respVOList = DocTemplateInstanceConvert.INSTANCE.convertList(list);
+
+        // 填充模板名称
+        fillTemplateName(respVOList);
+
+        return respVOList;
+    }
+
+    /**
+     * 填充模板名称
+     */
+    private void fillTemplateName(List<DocTemplateInstanceRespVO> 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());
+                }
+            }
+        }
     }
 
 }

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());
                 }
             });
         });

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;
 }

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;
 }

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<PurchaseOrderDO> {
 
     default PageResult<PurchaseOrderDO> selectPage(PurchaseOrderPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchaseOrderDO>()
-                .eqIfPresent(PurchaseOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber())
+                .likeIfPresent(PurchaseOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber())
                 .likeIfPresent(PurchaseOrderDO::getSystemOrderNumber, reqVO.getSystemOrderNumber())
-                .eqIfPresent(PurchaseOrderDO::getCpNum, reqVO.getCompanyNumber())
+                .likeIfPresent(PurchaseOrderDO::getCpNum, reqVO.getCompanyNumber())
-                .eqIfPresent(PurchaseOrderDO::getSupplierNumber, reqVO.getSupplierNumber())
+                .likeIfPresent(PurchaseOrderDO::getSupplierNumber, reqVO.getSupplierNumber())
                 .likeIfPresent(PurchaseOrderDO::getSupplierName, reqVO.getSupplierName())
                 .eqIfPresent(PurchaseOrderDO::getType, reqVO.getType())
                 .betweenIfPresent(PurchaseOrderDO::getVoucherDate, reqVO.getVoucherDate())

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<SalesOrderDO> {
 
     default PageResult<SalesOrderDO> selectPage(SalesOrderPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<SalesOrderDO>()
-                .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<SalesOrderDO> {
                 .eqIfPresent(SalesOrderDO::getPurchaseGroup, reqVO.getPurchaseGroup())
                 .eqIfPresent(SalesOrderDO::getCurrencyNumber, reqVO.getCurrencyNumber())
                 .eqIfPresent(SalesOrderDO::getExchangeRate, reqVO.getExchangeRate())
-                .eqIfPresent(SalesOrderDO::getPaperContractNumber, reqVO.getPaperContractNumber())
+                .likeIfPresent(SalesOrderDO::getPaperContractNumber, reqVO.getPaperContractNumber())
-                .eqIfPresent(SalesOrderDO::getAgreementNumber, reqVO.getAgreementNumber())
+                .likeIfPresent(SalesOrderDO::getAgreementNumber, reqVO.getAgreementNumber())
                 .eqIfPresent(SalesOrderDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(SalesOrderDO::getAgentNumber, reqVO.getAgentNumber())
                 .likeIfPresent(SalesOrderDO::getAgentName, reqVO.getAgentName())