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

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java

@@ -28,8 +28,8 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
                 .likeIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName())
                 .likeIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber())
+                .likeIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber())
-                .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber())
+                .likeIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber())
                 .betweenIfPresent(AccountDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(AccountDO::getId));
     }
@@ -41,11 +41,11 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
                 .likeIfPresent(AccountDO::getAddress, dto.getAddress())
                 .likeIfPresent(AccountDO::getPhone, dto.getPhone())
                 .eqIfPresent(AccountDO::getBankAccount, dto.getBankAccount())
-                .eqIfPresent(AccountDO::getCustomerName, dto.getCustomerName())
+                .likeIfPresent(AccountDO::getCustomerName, dto.getCustomerName())
-                .eqIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber())
+                .likeIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber())
                 .eqIfPresent(AccountDO::getIsEnable, dto.getIsEnable())
-                .eqIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber())
+                .likeIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber())
-                .eqIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber())
+                .likeIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber())
                 .orderByDesc(AccountDO::getId));
     }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java

@@ -21,8 +21,8 @@ public interface CompanyRelativityMapper extends BaseMapperX<CompanyRelativityDO
 
     default PageResult<CompanyRelativityDO> selectPage(CompanyRelativityPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CompanyRelativityDO>()
-                .eqIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber())
+                .likeIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber())
-                .eqIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber())
                 .betweenIfPresent(CompanyRelativityDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(CompanyRelativityDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java

@@ -21,11 +21,11 @@ public interface ContactMapper extends BaseMapperX<ContactDO> {
                 .likeIfPresent(ContactDO::getContact, reqVO.getContact())
                 .likeIfPresent(ContactDO::getTel, reqVO.getTel())
                 .likeIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName())
-                .eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber())
+                .likeIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(ContactDO::getEmail, reqVO.getEmail())
+                .likeIfPresent(ContactDO::getEmail, reqVO.getEmail())
-                .eqIfPresent(ContactDO::getFax, reqVO.getFax())
+                .likeIfPresent(ContactDO::getFax, reqVO.getFax())
-                .eqIfPresent(ContactDO::getAddress, reqVO.getAddress())
+                .likeIfPresent(ContactDO::getAddress, reqVO.getAddress())
                 .betweenIfPresent(ContactDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ContactDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java

@@ -17,16 +17,16 @@ public interface FactoryMapper extends BaseMapperX<FactoryDO> {
 
     default PageResult<FactoryDO> selectPage(FactoryPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<FactoryDO>()
-                .eqIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber())
                 .likeIfPresent(FactoryDO::getCpnName, reqVO.getCpnName())
-                .eqIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber())
+                .likeIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber())
                 .likeIfPresent(FactoryDO::getErpCompanyName, reqVO.getErpCompanyName())
                 .likeIfPresent(FactoryDO::getName, reqVO.getName())
-                .eqIfPresent(FactoryDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(FactoryDO::getNumber, reqVO.getNumber())
                 .betweenIfPresent(FactoryDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(FactoryDO::getIsEnable, reqVO.getIsEnable())
                 .likeIfPresent(FactoryDO::getErpName, reqVO.getErpName())
-                .eqIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber())
+                .likeIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber())
                 .orderByDesc(FactoryDO::getId));
     }
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java

@@ -23,9 +23,9 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
 
     default PageResult<MaterialInfomationDO> selectPage(MaterialInfomationPageReqVO reqVO, Collection<Long> infomationIds) {
         return BaseMapperX.super.selectPage(reqVO, new LambdaQueryWrapperX<MaterialInfomationDO>()
-                .eqIfPresent(MaterialInfomationDO::getCode, reqVO.getCode())
+                .likeIfPresent(MaterialInfomationDO::getCode, reqVO.getCode())
                 .likeIfPresent(MaterialInfomationDO::getName, reqVO.getName())
-                .eqIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(MaterialInfomationDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(MaterialInfomationDO::getId, infomationIds)
                 .orderByDesc(MaterialInfomationDO::getId));

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java

@@ -22,7 +22,7 @@ public interface MaterialOtherMapper extends BaseMapperX<MaterialOtherDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialOtherDO>()
                 .likeIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber())
                 .likeIfPresent(MaterialOtherDO::getMaterialName, reqVO.getMaterialName())
-                .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber())
+                .likeIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber())
                 .likeIfPresent(MaterialOtherDO::getErpMaterialName, reqVO.getErpMaterialName())
                 .eqIfPresent(MaterialOtherDO::getUnit, reqVO.getUnit())
                 .eqIfPresent(MaterialOtherDO::getAbbreviation, reqVO.getAbbreviation())

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/TaxMapper.java

@@ -20,11 +20,11 @@ public interface TaxMapper extends BaseMapperX<TaxDO> {
                 .eqIfPresent(TaxDO::getType, reqVO.getType())
                 .eqIfPresent(TaxDO::getCategory, reqVO.getCategory())
                 .eqIfPresent(TaxDO::getTaxCoding, reqVO.getTaxCoding())
-                .eqIfPresent(TaxDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(TaxDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(TaxDO::getTax, reqVO.getTax())
                 .betweenIfPresent(TaxDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(TaxDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(TaxDO::getCustomerNumber, reqVO.getCustomerNumber())
+                .likeIfPresent(TaxDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .likeIfPresent(TaxDO::getCustomerName, reqVO.getCustomerName())
                 .orderByDesc(TaxDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java

@@ -17,7 +17,7 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
 
     default PageResult<WarehouseDO> selectPage(WarehousePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WarehouseDO>()
-                .eqIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber())
                 .likeIfPresent(WarehouseDO::getCpnName, reqVO.getCpnName())
                 .likeIfPresent(WarehouseDO::getErpFactoryName, reqVO.getErpFactoryName())
                 .eqIfPresent(WarehouseDO::getErpFactoryNumber, reqVO.getErpFactoryNumber())
@@ -26,8 +26,8 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
                 .betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(WarehouseDO::getFactoryName, reqVO.getFactoryName())
                 .eqIfPresent(WarehouseDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber())
-                .eqIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding())
+                .likeIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding())
                 .likeIfPresent(WarehouseDO::getErpName, reqVO.getErpName())
                 .orderByDesc(WarehouseDO::getId));
     }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java

@@ -3,6 +3,7 @@ package com.zt.plat.module.contractorder.service.contract;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
@@ -917,16 +918,23 @@ public class ContractServiceImpl implements ContractService {
         if (DictEnum.BSE_CTRT_STS_PUSH_ERROR.getCode().equals(oldContractMainDO.getStatus())) {
             // “推送失败”的状态编辑后状态变为“待推送”
             newContractMainDO.setStatus(DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode());
-        } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(oldContractMainDO.getStatus())
-                || DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(oldContractMainDO.getStatus())) {
-            // 其它状态编辑后都为“待审核”
-            newContractMainDO.setStatus(DictEnum.BSE_CTRT_STS_WAIT_AUDIT.getCode());
         }
 
         // 更新合同主信息
-        int updateNum = contractMainMapper.updateById(newContractMainDO);
+        contractMainMapper.updateById(newContractMainDO);
+        // 模板实例ID更新为null
+        if (newContractMainDO.getInstanceId() == null) {
+            contractMainMapper.update(new LambdaUpdateWrapper<>(ContractMainDO.class)
+                    .set(ContractMainDO::getInstanceId, null)
+                    .eq(ContractMainDO::getId, newContractMainDO.getId()));
+        }
 
-        return updateNum > 0;
+        if (DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(newContractMainDO.getStatus())) {
+            // 执行中合同重新提交erp
+            submitErp(newContractMainDO.getId());
+        }
+
+        return true;
     }
 
     @Override
@@ -944,7 +952,8 @@ public class ContractServiceImpl implements ContractService {
             }
 
             // 合同状态校验
-            if (!DictEnum.BSE_CTRT_STS_DRAFT.getCode().equals(contractMainDO.getStatus())) {
+            if (!(DictEnum.BSE_CTRT_STS_DRAFT.getCode().equals(contractMainDO.getStatus())
+                    || DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(contractMainDO.getStatus()))) {
                 String msg = id.toString()
                         + ":"
                         + CONTRACT_STATUS_NOT_DELETE.getMsg()
@@ -1025,7 +1034,7 @@ public class ContractServiceImpl implements ContractService {
 
         // 合同状态校验
         if (!(DictEnum.BSE_CTRT_STS_DRAFT.getCode().equals(contractMainDO.getStatus())
-                || DictEnum.BSE_CTRT_STS_WAIT_AUDIT.getCode().equals(contractMainDO.getStatus()))) {
+                || DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(contractMainDO.getStatus()))) {
 
             throw exception(CONTRACT_STATUS_NOT_SUBMIT_APPROVAL,
                     DictEnum.getByCodeAndType(contractMainDO.getStatus(), DictTypeConstants.BSE_CTRT_STS).getLabel());
@@ -1128,6 +1137,33 @@ public class ContractServiceImpl implements ContractService {
         badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id
         BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData();
 
+        // 需要调用bpm 审核接口更新审批中的状态
+        if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) {
+            if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
+                BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO();
+                btarDto.setId(undoTask.getId());
+                btarDto.setReason(reqVO.getReviewOpinion());
+                bpmProcessInstanceApi.approveTask(btarDto);
+            }
+        } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) {
+            if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
+                BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO();
+                btrrDto.setId(undoTask.getId());
+                btrrDto.setReason(reqVO.getReviewOpinion());
+                bpmProcessInstanceApi.rejectTask(btrrDto);
+            }
+        }
+
+        // 获取当前流程正在审批的任务节点
+        taskList = bpmTaskApi.getTaskListByProcessInstanceId(contractMainDO.getProcessInstanceId()).getData();
+        undoTask = taskList.get(taskList.size() - 1);
+
+        // 判断是否流程已经通过、驳回
+        badrDto = new BpmApprovalDetailReqDTO();
+        badrDto.setProcessInstanceId(contractMainDO.getProcessInstanceId()); // 流程实例id
+        badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id
+        approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData();
+
         // 更新合同状态,状态需要根据流程的状态进行判断
         contractMainDO.setReviewOpinion(reqVO.getReviewOpinion());
         if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.NOT_START.getStatus())) {
@@ -1147,23 +1183,6 @@ public class ContractServiceImpl implements ContractService {
         }
         contractMainMapper.updateById(contractMainDO);
 
-        // 需要调用bpm 审核接口更新审批中的状态
-        if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) {
-            if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
-                BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO();
-                btarDto.setId(undoTask.getId());
-                btarDto.setReason(reqVO.getReviewOpinion());
-                bpmProcessInstanceApi.approveTask(btarDto);
-            }
-        } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) {
-            if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
-                BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO();
-                btrrDto.setId(undoTask.getId());
-                btrrDto.setReason(reqVO.getReviewOpinion());
-                bpmProcessInstanceApi.rejectTask(btrrDto);
-            }
-        }
-
         return true;
     }
 

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpAssetMapper.java

@@ -17,17 +17,17 @@ public interface ErpAssetMapper extends BaseMapperX<ErpAssetDO> {
 
     default PageResult<ErpAssetDO> selectPage(ErpAssetPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpAssetDO>()
-                .eqIfPresent(ErpAssetDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(ErpAssetDO::getCompanyNumber, reqVO.getCompanyNumber())
-                .eqIfPresent(ErpAssetDO::getMainAssetNumber, reqVO.getMainAssetNumber())
+                .likeIfPresent(ErpAssetDO::getMainAssetNumber, reqVO.getMainAssetNumber())
                 .betweenIfPresent(ErpAssetDO::getRecordCreateDate, reqVO.getRecordCreateDate())
                 .likeIfPresent(ErpAssetDO::getUpdateUserName, reqVO.getUpdateUserName())
-                .eqIfPresent(ErpAssetDO::getAssetTypeNumber, reqVO.getAssetTypeNumber())
+                .likeIfPresent(ErpAssetDO::getAssetTypeNumber, reqVO.getAssetTypeNumber())
                 .likeIfPresent(ErpAssetDO::getAssetTypeName, reqVO.getAssetTypeName())
                 .betweenIfPresent(ErpAssetDO::getAssetDate, reqVO.getAssetDate())
                 .eqIfPresent(ErpAssetDO::getUom, reqVO.getUom())
                 .eqIfPresent(ErpAssetDO::getQuantity, reqVO.getQuantity())
-                .eqIfPresent(ErpAssetDO::getAssetDescription, reqVO.getAssetDescription())
+                .likeIfPresent(ErpAssetDO::getAssetDescription, reqVO.getAssetDescription())
-                .eqIfPresent(ErpAssetDO::getAssetDescriptionAttach, reqVO.getAssetDescriptionAttach())
+                .likeIfPresent(ErpAssetDO::getAssetDescriptionAttach, reqVO.getAssetDescriptionAttach())
                 .betweenIfPresent(ErpAssetDO::getDepreciationStartDate, reqVO.getDepreciationStartDate())
                 .eqIfPresent(ErpAssetDO::getPlanYearDate, reqVO.getPlanYearDate())
                 .eqIfPresent(ErpAssetDO::getCostcenterNumber, reqVO.getCostcenterNumber())

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java

@@ -17,10 +17,10 @@ public interface ErpBomMapper extends BaseMapperX<ErpBomDO> {
 
     default PageResult<ErpBomDO> selectPage(ErpBomPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpBomDO>()
-                .eqIfPresent(ErpBomDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(ErpBomDO::getFactoryNumber, reqVO.getFactoryNumber())
-                .eqIfPresent(ErpBomDO::getUpMaterial, reqVO.getUpMaterial())
+                .likeIfPresent(ErpBomDO::getUpMaterial, reqVO.getUpMaterial())
                 .eqIfPresent(ErpBomDO::getUseItem, reqVO.getUseItem())
-                .eqIfPresent(ErpBomDO::getMaterialDescription, reqVO.getMaterialDescription())
+                .likeIfPresent(ErpBomDO::getMaterialDescription, reqVO.getMaterialDescription())
                 .eqIfPresent(ErpBomDO::getQuantity, reqVO.getQuantity())
                 .eqIfPresent(ErpBomDO::getUnit, reqVO.getUnit())
                 .orderByDesc(ErpBomDO::getId));

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCompanyMapper.java

@@ -18,7 +18,7 @@ public interface ErpCompanyMapper extends BaseMapperX<ErpCompanyDO> {
     default PageResult<ErpCompanyDO> selectPage(ErpCompanyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpCompanyDO>()
                 .likeIfPresent(ErpCompanyDO::getName, reqVO.getName())
-                .eqIfPresent(ErpCompanyDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(ErpCompanyDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(ErpCompanyDO::getCurrency, reqVO.getCurrency())
                 .orderByDesc(ErpCompanyDO::getId));
     }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpContractMapper.java

@@ -19,17 +19,17 @@ public interface ErpContractMapper extends BaseMapperX<ErpContractDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpContractDO>()
                 .eqIfPresent(ErpContractDO::getOperationId, reqVO.getOperationId())
                 .eqIfPresent(ErpContractDO::getContractMainId, reqVO.getContractMainId())
-                .eqIfPresent(ErpContractDO::getContractPaperNumber, reqVO.getContractPaperNumber())
+                .likeIfPresent(ErpContractDO::getContractPaperNumber, reqVO.getContractPaperNumber())
                 .likeIfPresent(ErpContractDO::getContractName, reqVO.getContractName())
-                .eqIfPresent(ErpContractDO::getContractTypeNumber, reqVO.getContractTypeNumber())
+                .likeIfPresent(ErpContractDO::getContractTypeNumber, reqVO.getContractTypeNumber())
                 .likeIfPresent(ErpContractDO::getContractTypeName, reqVO.getContractTypeName())
                 .eqIfPresent(ErpContractDO::getContractCategory, reqVO.getContractCategory())
                 .eqIfPresent(ErpContractDO::getIsVirtualContract, reqVO.getIsVirtualContract())
-                .eqIfPresent(ErpContractDO::getSupplierNumber, reqVO.getSupplierNumber())
+                .likeIfPresent(ErpContractDO::getSupplierNumber, reqVO.getSupplierNumber())
                 .likeIfPresent(ErpContractDO::getSupplierName, reqVO.getSupplierName())
                 .eqIfPresent(ErpContractDO::getAgent, reqVO.getAgent())
-                .eqIfPresent(ErpContractDO::getContractImplementNumber, reqVO.getContractImplementNumber())
+                .likeIfPresent(ErpContractDO::getContractImplementNumber, reqVO.getContractImplementNumber())
-                .eqIfPresent(ErpContractDO::getContractSignNumber, reqVO.getContractSignNumber())
+                .likeIfPresent(ErpContractDO::getContractSignNumber, reqVO.getContractSignNumber())
                 .betweenIfPresent(ErpContractDO::getSignDate, reqVO.getSignDate())
                 .betweenIfPresent(ErpContractDO::getStartDate, reqVO.getStartDate())
                 .betweenIfPresent(ErpContractDO::getStopDate, reqVO.getStopDate())
@@ -52,7 +52,7 @@ public interface ErpContractMapper extends BaseMapperX<ErpContractDO> {
                 .eqIfPresent(ErpContractDO::getQualityassuranceAmount, reqVO.getQualityassuranceAmount())
                 .eqIfPresent(ErpContractDO::getIsInternal, reqVO.getIsInternal())
                 .eqIfPresent(ErpContractDO::getNature, reqVO.getNature())
-                .eqIfPresent(ErpContractDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(ErpContractDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(ErpContractDO::getSourceAccumulateSettlementAmount, reqVO.getSourceAccumulateSettlementAmount())
                 .eqIfPresent(ErpContractDO::getBasicAccumulateSettlementAmount, reqVO.getBasicAccumulateSettlementAmount())
                 .eqIfPresent(ErpContractDO::getSourceUseAmount, reqVO.getSourceUseAmount())

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java

@@ -20,7 +20,7 @@ public interface ErpCostcenterMapper extends BaseMapperX<ErpCostcenterDO> {
 
     default PageResult<ErpCostcenterDO> selectPage(ErpCostcenterPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpCostcenterDO>()
-                .eqIfPresent(ErpCostcenterDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(ErpCostcenterDO::getNumber, reqVO.getNumber())
                 .likeIfPresent(ErpCostcenterDO::getName, reqVO.getName())
                 .eqIfPresent(ErpCostcenterDO::getIsUse, reqVO.getIsUse())
                 .eqIfPresent(ErpCostcenterDO::getScopeNumber, reqVO.getScopeNumber())

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCustomerMapper.java

@@ -17,10 +17,10 @@ public interface ErpCustomerMapper extends BaseMapperX<ErpCustomerDO> {
 
     default PageResult<ErpCustomerDO> selectPage(ErpCustomerPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpCustomerDO>()
-                .eqIfPresent(ErpCustomerDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(ErpCustomerDO::getNumber, reqVO.getNumber())
                 .likeIfPresent(ErpCustomerDO::getName, reqVO.getName())
                 .eqIfPresent(ErpCustomerDO::getAccountGroup, reqVO.getAccountGroup())
-                .eqIfPresent(ErpCustomerDO::getDescription, reqVO.getDescription())
+                .likeIfPresent(ErpCustomerDO::getDescription, reqVO.getDescription())
                 .eqIfPresent(ErpCustomerDO::getCenterNumber, reqVO.getCenterNumber())
                 .betweenIfPresent(ErpCustomerDO::getCreateDate, reqVO.getCreateDate())
                 .betweenIfPresent(ErpCustomerDO::getRepairDate, reqVO.getRepairDate())

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpInternalOrderMapper.java

@@ -17,7 +17,7 @@ public interface ErpInternalOrderMapper extends BaseMapperX<ErpInternalOrderDO>
 
     default PageResult<ErpInternalOrderDO> selectPage(ErpInternalOrderPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpInternalOrderDO>()
-                .eqIfPresent(ErpInternalOrderDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(ErpInternalOrderDO::getNumber, reqVO.getNumber())
                 .likeIfPresent(ErpInternalOrderDO::getName, reqVO.getName())
                 .eqIfPresent(ErpInternalOrderDO::getType, reqVO.getType())
                 .eqIfPresent(ErpInternalOrderDO::getIsOff, reqVO.getIsOff())

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java

@@ -27,12 +27,12 @@ public interface ErpMaterialMapper extends BaseMapperX<ErpMaterialDO> {
                 .betweenIfPresent(ErpMaterialDO::getMaterialGroupDate, reqVO.getMaterialGroupDate())
                 .betweenIfPresent(ErpMaterialDO::getExternalMaterialGroupDate, reqVO.getExternalMaterialGroupDate())
                 .eqIfPresent(ErpMaterialDO::getUnit, reqVO.getUnit())
-                .eqIfPresent(ErpMaterialDO::getUnitDescription, reqVO.getUnitDescription())
+                .likeIfPresent(ErpMaterialDO::getUnitDescription, reqVO.getUnitDescription())
-                .eqIfPresent(ErpMaterialDO::getMaterialTypeDescription, reqVO.getMaterialTypeDescription())
+                .likeIfPresent(ErpMaterialDO::getMaterialTypeDescription, reqVO.getMaterialTypeDescription())
-                .eqIfPresent(ErpMaterialDO::getMaterialGroupDescription, reqVO.getMaterialGroupDescription())
+                .likeIfPresent(ErpMaterialDO::getMaterialGroupDescription, reqVO.getMaterialGroupDescription())
                 .eqIfPresent(ErpMaterialDO::getExternalMaterialGroupDescription, reqVO.getExternalMaterialGroupDescription())
                 .likeIfPresent(ErpMaterialDO::getMaterialName, reqVO.getMaterialName())
-                .eqIfPresent(ErpMaterialDO::getMaterialLengthDescription, reqVO.getMaterialLengthDescription())
+                .likeIfPresent(ErpMaterialDO::getMaterialLengthDescription, reqVO.getMaterialLengthDescription())
                 .orderByDesc(ErpMaterialDO::getId));
     }
 

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessDetailMapper.java

@@ -18,10 +18,10 @@ public interface ErpProcessDetailMapper extends BaseMapperX<ErpProcessDetailDO>
     default PageResult<ErpProcessDetailDO> selectPage(ErpProcessDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpProcessDetailDO>()
                 .eqIfPresent(ErpProcessDetailDO::getProcessId, reqVO.getProcessId())
-                .eqIfPresent(ErpProcessDetailDO::getProcessingNumber, reqVO.getProcessingNumber())
+                .likeIfPresent(ErpProcessDetailDO::getProcessingNumber, reqVO.getProcessingNumber())
                 .likeIfPresent(ErpProcessDetailDO::getProcessingName, reqVO.getProcessingName())
                 .eqIfPresent(ErpProcessDetailDO::getUom, reqVO.getUom())
-                .eqIfPresent(ErpProcessDetailDO::getWorkCenterNumber, reqVO.getWorkCenterNumber())
+                .likeIfPresent(ErpProcessDetailDO::getWorkCenterNumber, reqVO.getWorkCenterNumber())
                 .likeIfPresent(ErpProcessDetailDO::getWorkCenterName, reqVO.getWorkCenterName())
                 .orderByDesc(ErpProcessDetailDO::getId));
     }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessMapper.java

@@ -17,12 +17,12 @@ public interface ErpProcessMapper extends BaseMapperX<ErpProcessDO> {
 
     default PageResult<ErpProcessDO> selectPage(ErpProcessPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpProcessDO>()
-                .eqIfPresent(ErpProcessDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(ErpProcessDO::getFactoryNumber, reqVO.getFactoryNumber())
-                .eqIfPresent(ErpProcessDO::getMaterialNumber, reqVO.getMaterialNumber())
+                .likeIfPresent(ErpProcessDO::getMaterialNumber, reqVO.getMaterialNumber())
                 .likeIfPresent(ErpProcessDO::getMaterialName, reqVO.getMaterialName())
                 .eqIfPresent(ErpProcessDO::getBlineGroup, reqVO.getBlineGroup())
                 .eqIfPresent(ErpProcessDO::getGroupCount, reqVO.getGroupCount())
-                .eqIfPresent(ErpProcessDO::getBlineDescription, reqVO.getBlineDescription())
+                .likeIfPresent(ErpProcessDO::getBlineDescription, reqVO.getBlineDescription())
                 .eqIfPresent(ErpProcessDO::getUom, reqVO.getUom())
                 .eqIfPresent(ErpProcessDO::getUseDescription, reqVO.getUseDescription())
                 .eqIfPresent(ErpProcessDO::getStatus, reqVO.getStatus())

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveOrderMapper.java

@@ -17,21 +17,21 @@ public interface ErpProductiveOrderMapper extends BaseMapperX<ErpProductiveOrder
 
     default PageResult<ErpProductiveOrderDO> selectPage(ErpProductiveOrderPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpProductiveOrderDO>()
-                .eqIfPresent(ErpProductiveOrderDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(ErpProductiveOrderDO::getCompanyNumber, reqVO.getCompanyNumber())
-                .eqIfPresent(ErpProductiveOrderDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(ErpProductiveOrderDO::getFactoryNumber, reqVO.getFactoryNumber())
                 .likeIfPresent(ErpProductiveOrderDO::getFactoryName, reqVO.getFactoryName())
-                .eqIfPresent(ErpProductiveOrderDO::getOrderNumber, reqVO.getOrderNumber())
+                .likeIfPresent(ErpProductiveOrderDO::getOrderNumber, reqVO.getOrderNumber())
                 .betweenIfPresent(ErpProductiveOrderDO::getStartDate, reqVO.getStartDate())
                 .betweenIfPresent(ErpProductiveOrderDO::getEndDate, reqVO.getEndDate())
-                .eqIfPresent(ErpProductiveOrderDO::getMainMaterialNumber, reqVO.getMainMaterialNumber())
+                .likeIfPresent(ErpProductiveOrderDO::getMainMaterialNumber, reqVO.getMainMaterialNumber())
                 .eqIfPresent(ErpProductiveOrderDO::getUnit, reqVO.getUnit())
-                .eqIfPresent(ErpProductiveOrderDO::getMaterialDescription, reqVO.getMaterialDescription())
+                .likeIfPresent(ErpProductiveOrderDO::getMaterialDescription, reqVO.getMaterialDescription())
                 .eqIfPresent(ErpProductiveOrderDO::getProcessingList, reqVO.getProcessingList())
                 .eqIfPresent(ErpProductiveOrderDO::getProcessingNumber, reqVO.getProcessingNumber())
-                .eqIfPresent(ErpProductiveOrderDO::getProcessingDescription, reqVO.getProcessingDescription())
+                .likeIfPresent(ErpProductiveOrderDO::getProcessingDescription, reqVO.getProcessingDescription())
                 .eqIfPresent(ErpProductiveOrderDO::getObjectNumber, reqVO.getObjectNumber())
                 .eqIfPresent(ErpProductiveOrderDO::getWorkCenterNumber, reqVO.getWorkCenterNumber())
-                .eqIfPresent(ErpProductiveOrderDO::getWorkCenterDescription, reqVO.getWorkCenterDescription())
+                .likeIfPresent(ErpProductiveOrderDO::getWorkCenterDescription, reqVO.getWorkCenterDescription())
                 .eqIfPresent(ErpProductiveOrderDO::getCostcenterNumber, reqVO.getCostcenterNumber())
                 .likeIfPresent(ErpProductiveOrderDO::getCostcenterName, reqVO.getCostcenterName())
                 .orderByDesc(ErpProductiveOrderDO::getId));

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveVersionMapper.java

@@ -19,11 +19,11 @@ public interface ErpProductiveVersionMapper extends BaseMapperX<ErpProductiveVer
 
     default PageResult<ErpProductiveVersionDO> selectPage(ErpProductiveVersionPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpProductiveVersionDO>()
-                .eqIfPresent(ErpProductiveVersionDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(ErpProductiveVersionDO::getFactoryNumber, reqVO.getFactoryNumber())
-                .eqIfPresent(ErpProductiveVersionDO::getMaterialNumber, reqVO.getMaterialNumber())
+                .likeIfPresent(ErpProductiveVersionDO::getMaterialNumber, reqVO.getMaterialNumber())
-                .eqIfPresent(ErpProductiveVersionDO::getProductiveVersionNumber, reqVO.getProductiveVersionNumber())
+                .likeIfPresent(ErpProductiveVersionDO::getProductiveVersionNumber, reqVO.getProductiveVersionNumber())
                 .likeIfPresent(ErpProductiveVersionDO::getProductiveVersionName, reqVO.getProductiveVersionName())
-                .eqIfPresent(ErpProductiveVersionDO::getBomNumber, reqVO.getBomNumber())
+                .likeIfPresent(ErpProductiveVersionDO::getBomNumber, reqVO.getBomNumber())
                 .eqIfPresent(ErpProductiveVersionDO::getBlineGroup, reqVO.getBlineGroup())
                 .eqIfPresent(ErpProductiveVersionDO::getGroupCount, reqVO.getGroupCount())
                 .orderByDesc(ErpProductiveVersionDO::getId));

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpPurchaseOrganizationMapper.java

@@ -17,9 +17,9 @@ public interface ErpPurchaseOrganizationMapper extends BaseMapperX<ErpPurchaseOr
 
     default PageResult<ErpPurchaseOrganizationDO> selectPage(ErpPurchaseOrganizationPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpPurchaseOrganizationDO>()
-                .eqIfPresent(ErpPurchaseOrganizationDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(ErpPurchaseOrganizationDO::getNumber, reqVO.getNumber())
                 .likeIfPresent(ErpPurchaseOrganizationDO::getName, reqVO.getName())
-                .eqIfPresent(ErpPurchaseOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(ErpPurchaseOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber())
                 .orderByDesc(ErpPurchaseOrganizationDO::getId));
     }
 

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpSalesOrganizationMapper.java

@@ -17,9 +17,9 @@ public interface ErpSalesOrganizationMapper extends BaseMapperX<ErpSalesOrganiza
 
     default PageResult<ErpSalesOrganizationDO> selectPage(ErpSalesOrganizationPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpSalesOrganizationDO>()
-                .eqIfPresent(ErpSalesOrganizationDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(ErpSalesOrganizationDO::getNumber, reqVO.getNumber())
                 .likeIfPresent(ErpSalesOrganizationDO::getName, reqVO.getName())
-                .eqIfPresent(ErpSalesOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(ErpSalesOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber())
                 .orderByDesc(ErpSalesOrganizationDO::getId));
     }