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 b17c2a1..bba6c41 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 c375f28..413ae0c 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 a6fa05e..2e5cf0f 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 d54853f..5c35de1 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())