|
|
|
@ -1,5 +1,10 @@
|
|
|
|
|
package com.yunxi.scm.module.xxjj.service.contractinfo;
|
|
|
|
|
|
|
|
|
|
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoCreateReqVO;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoExportReqVO;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoPageReqVO;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoUpdateReqVO;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.service.contract.ContractInfoServiceImpl;
|
|
|
|
|
import org.junit.jupiter.api.Disabled;
|
|
|
|
|
import org.junit.jupiter.api.Test;
|
|
|
|
|
|
|
|
|
@ -7,9 +12,8 @@ import javax.annotation.Resource;
|
|
|
|
|
|
|
|
|
|
import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
|
|
|
|
|
|
|
|
|
|
import com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo.*;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.dal.dataobject.contractinfo.ContractInfoDO;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.dal.mysql.contractinfo.ContractInfoMapper;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractInfoDO;
|
|
|
|
|
import com.yunxi.scm.module.xxjj.dal.mysql.contract.ContractInfoMapper;
|
|
|
|
|
import com.yunxi.scm.framework.common.pojo.PageResult;
|
|
|
|
|
|
|
|
|
|
import org.springframework.context.annotation.Import;
|
|
|
|
@ -104,17 +108,7 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
public void testGetContractInfoPage() {
|
|
|
|
|
// mock 数据
|
|
|
|
|
ContractInfoDO dbContractInfo = randomPojo(ContractInfoDO.class, o -> { // 等会查询到
|
|
|
|
|
o.setContractInfo(null);
|
|
|
|
|
o.setCurrency(null);
|
|
|
|
|
o.setProcurementModel(null);
|
|
|
|
|
o.setPricingModel(null);
|
|
|
|
|
o.setContractPeriodTime(null);
|
|
|
|
|
o.setDeliveryTime(null);
|
|
|
|
|
o.setDeliveryModel(null);
|
|
|
|
|
o.setDeliveryLocation(null);
|
|
|
|
|
o.setDeliveryMethod(null);
|
|
|
|
|
o.setModeTransport(null);
|
|
|
|
|
o.setCostBearingMian(null);
|
|
|
|
|
o.setContractId(null);
|
|
|
|
|
o.setTotalAmount(null);
|
|
|
|
|
o.setAmountCapitalization(null);
|
|
|
|
|
o.setContractRequirement(null);
|
|
|
|
@ -125,34 +119,24 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
o.setContractAgreement(null);
|
|
|
|
|
o.setSecurityProtocol(null);
|
|
|
|
|
o.setExtendedField(null);
|
|
|
|
|
o.setBidding(null);
|
|
|
|
|
o.setRemark2(null);
|
|
|
|
|
o.setRemark3(null);
|
|
|
|
|
o.setCreateTime(null);
|
|
|
|
|
o.setCurrency(null);
|
|
|
|
|
o.setProcurementModel(null);
|
|
|
|
|
o.setPricingModel(null);
|
|
|
|
|
o.setContractPeriodTime(null);
|
|
|
|
|
o.setDeliveryTime(null);
|
|
|
|
|
o.setDeliveryModel(null);
|
|
|
|
|
o.setDeliveryLocation(null);
|
|
|
|
|
o.setDeliveryMethod(null);
|
|
|
|
|
o.setModeTransport(null);
|
|
|
|
|
o.setCostBearingMian(null);
|
|
|
|
|
o.setBidding(null);
|
|
|
|
|
});
|
|
|
|
|
contractInfoMapper.insert(dbContractInfo);
|
|
|
|
|
// 测试 contractInfo 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractInfo(null)));
|
|
|
|
|
// 测试 currency 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCurrency(null)));
|
|
|
|
|
// 测试 procurementModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setProcurementModel(null)));
|
|
|
|
|
// 测试 pricingModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setPricingModel(null)));
|
|
|
|
|
// 测试 contractPeriodTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractPeriodTime(null)));
|
|
|
|
|
// 测试 deliveryTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryTime(null)));
|
|
|
|
|
// 测试 deliveryModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryModel(null)));
|
|
|
|
|
// 测试 deliveryLocation 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryLocation(null)));
|
|
|
|
|
// 测试 deliveryMethod 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryMethod(null)));
|
|
|
|
|
// 测试 modeTransport 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setModeTransport(null)));
|
|
|
|
|
// 测试 costBearingMian 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCostBearingMian(null)));
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractId(null)));
|
|
|
|
|
// 测试 totalAmount 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setTotalAmount(null)));
|
|
|
|
|
// 测试 amountCapitalization 不匹配
|
|
|
|
@ -173,27 +157,37 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setSecurityProtocol(null)));
|
|
|
|
|
// 测试 extendedField 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setExtendedField(null)));
|
|
|
|
|
// 测试 bidding 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setBidding(null)));
|
|
|
|
|
// 测试 remark2 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setRemark2(null)));
|
|
|
|
|
// 测试 remark3 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setRemark3(null)));
|
|
|
|
|
// 测试 createTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCreateTime(null)));
|
|
|
|
|
// 测试 currency 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCurrency(null)));
|
|
|
|
|
// 测试 procurementModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setProcurementModel(null)));
|
|
|
|
|
// 测试 pricingModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setPricingModel(null)));
|
|
|
|
|
// 测试 contractPeriodTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractPeriodTime(null)));
|
|
|
|
|
// 测试 deliveryTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryTime(null)));
|
|
|
|
|
// 测试 deliveryModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryModel(null)));
|
|
|
|
|
// 测试 deliveryLocation 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryLocation(null)));
|
|
|
|
|
// 测试 deliveryMethod 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryMethod(null)));
|
|
|
|
|
// 测试 modeTransport 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setModeTransport(null)));
|
|
|
|
|
// 测试 costBearingMian 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCostBearingMian(null)));
|
|
|
|
|
// 测试 bidding 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setBidding(null)));
|
|
|
|
|
// 准备参数
|
|
|
|
|
ContractInfoPageReqVO reqVO = new ContractInfoPageReqVO();
|
|
|
|
|
reqVO.setContractInfo(null);
|
|
|
|
|
reqVO.setCurrency(null);
|
|
|
|
|
reqVO.setProcurementModel(null);
|
|
|
|
|
reqVO.setPricingModel(null);
|
|
|
|
|
reqVO.setContractPeriodTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryModel(null);
|
|
|
|
|
reqVO.setDeliveryLocation(null);
|
|
|
|
|
reqVO.setDeliveryMethod(null);
|
|
|
|
|
reqVO.setModeTransport(null);
|
|
|
|
|
reqVO.setCostBearingMian(null);
|
|
|
|
|
reqVO.setContractId(null);
|
|
|
|
|
reqVO.setTotalAmount(null);
|
|
|
|
|
reqVO.setAmountCapitalization(null);
|
|
|
|
|
reqVO.setContractRequirement(null);
|
|
|
|
@ -204,10 +198,20 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
reqVO.setContractAgreement(null);
|
|
|
|
|
reqVO.setSecurityProtocol(null);
|
|
|
|
|
reqVO.setExtendedField(null);
|
|
|
|
|
reqVO.setBidding(null);
|
|
|
|
|
reqVO.setRemark2(null);
|
|
|
|
|
reqVO.setRemark3(null);
|
|
|
|
|
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setCurrency(null);
|
|
|
|
|
reqVO.setProcurementModel(null);
|
|
|
|
|
reqVO.setPricingModel(null);
|
|
|
|
|
reqVO.setContractPeriodTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryModel(null);
|
|
|
|
|
reqVO.setDeliveryLocation(null);
|
|
|
|
|
reqVO.setDeliveryMethod(null);
|
|
|
|
|
reqVO.setModeTransport(null);
|
|
|
|
|
reqVO.setCostBearingMian(null);
|
|
|
|
|
reqVO.setBidding(null);
|
|
|
|
|
|
|
|
|
|
// 调用
|
|
|
|
|
PageResult<ContractInfoDO> pageResult = contractInfoService.getContractInfoPage(reqVO);
|
|
|
|
@ -222,17 +226,7 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
public void testGetContractInfoList() {
|
|
|
|
|
// mock 数据
|
|
|
|
|
ContractInfoDO dbContractInfo = randomPojo(ContractInfoDO.class, o -> { // 等会查询到
|
|
|
|
|
o.setContractInfo(null);
|
|
|
|
|
o.setCurrency(null);
|
|
|
|
|
o.setProcurementModel(null);
|
|
|
|
|
o.setPricingModel(null);
|
|
|
|
|
o.setContractPeriodTime(null);
|
|
|
|
|
o.setDeliveryTime(null);
|
|
|
|
|
o.setDeliveryModel(null);
|
|
|
|
|
o.setDeliveryLocation(null);
|
|
|
|
|
o.setDeliveryMethod(null);
|
|
|
|
|
o.setModeTransport(null);
|
|
|
|
|
o.setCostBearingMian(null);
|
|
|
|
|
o.setContractId(null);
|
|
|
|
|
o.setTotalAmount(null);
|
|
|
|
|
o.setAmountCapitalization(null);
|
|
|
|
|
o.setContractRequirement(null);
|
|
|
|
@ -243,34 +237,24 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
o.setContractAgreement(null);
|
|
|
|
|
o.setSecurityProtocol(null);
|
|
|
|
|
o.setExtendedField(null);
|
|
|
|
|
o.setBidding(null);
|
|
|
|
|
o.setRemark2(null);
|
|
|
|
|
o.setRemark3(null);
|
|
|
|
|
o.setCreateTime(null);
|
|
|
|
|
o.setCurrency(null);
|
|
|
|
|
o.setProcurementModel(null);
|
|
|
|
|
o.setPricingModel(null);
|
|
|
|
|
o.setContractPeriodTime(null);
|
|
|
|
|
o.setDeliveryTime(null);
|
|
|
|
|
o.setDeliveryModel(null);
|
|
|
|
|
o.setDeliveryLocation(null);
|
|
|
|
|
o.setDeliveryMethod(null);
|
|
|
|
|
o.setModeTransport(null);
|
|
|
|
|
o.setCostBearingMian(null);
|
|
|
|
|
o.setBidding(null);
|
|
|
|
|
});
|
|
|
|
|
contractInfoMapper.insert(dbContractInfo);
|
|
|
|
|
// 测试 contractInfo 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractInfo(null)));
|
|
|
|
|
// 测试 currency 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCurrency(null)));
|
|
|
|
|
// 测试 procurementModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setProcurementModel(null)));
|
|
|
|
|
// 测试 pricingModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setPricingModel(null)));
|
|
|
|
|
// 测试 contractPeriodTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractPeriodTime(null)));
|
|
|
|
|
// 测试 deliveryTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryTime(null)));
|
|
|
|
|
// 测试 deliveryModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryModel(null)));
|
|
|
|
|
// 测试 deliveryLocation 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryLocation(null)));
|
|
|
|
|
// 测试 deliveryMethod 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryMethod(null)));
|
|
|
|
|
// 测试 modeTransport 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setModeTransport(null)));
|
|
|
|
|
// 测试 costBearingMian 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCostBearingMian(null)));
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractId(null)));
|
|
|
|
|
// 测试 totalAmount 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setTotalAmount(null)));
|
|
|
|
|
// 测试 amountCapitalization 不匹配
|
|
|
|
@ -291,27 +275,37 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setSecurityProtocol(null)));
|
|
|
|
|
// 测试 extendedField 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setExtendedField(null)));
|
|
|
|
|
// 测试 bidding 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setBidding(null)));
|
|
|
|
|
// 测试 remark2 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setRemark2(null)));
|
|
|
|
|
// 测试 remark3 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setRemark3(null)));
|
|
|
|
|
// 测试 createTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCreateTime(null)));
|
|
|
|
|
// 测试 currency 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCurrency(null)));
|
|
|
|
|
// 测试 procurementModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setProcurementModel(null)));
|
|
|
|
|
// 测试 pricingModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setPricingModel(null)));
|
|
|
|
|
// 测试 contractPeriodTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setContractPeriodTime(null)));
|
|
|
|
|
// 测试 deliveryTime 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryTime(null)));
|
|
|
|
|
// 测试 deliveryModel 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryModel(null)));
|
|
|
|
|
// 测试 deliveryLocation 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryLocation(null)));
|
|
|
|
|
// 测试 deliveryMethod 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setDeliveryMethod(null)));
|
|
|
|
|
// 测试 modeTransport 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setModeTransport(null)));
|
|
|
|
|
// 测试 costBearingMian 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setCostBearingMian(null)));
|
|
|
|
|
// 测试 bidding 不匹配
|
|
|
|
|
contractInfoMapper.insert(cloneIgnoreId(dbContractInfo, o -> o.setBidding(null)));
|
|
|
|
|
// 准备参数
|
|
|
|
|
ContractInfoExportReqVO reqVO = new ContractInfoExportReqVO();
|
|
|
|
|
reqVO.setContractInfo(null);
|
|
|
|
|
reqVO.setCurrency(null);
|
|
|
|
|
reqVO.setProcurementModel(null);
|
|
|
|
|
reqVO.setPricingModel(null);
|
|
|
|
|
reqVO.setContractPeriodTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryModel(null);
|
|
|
|
|
reqVO.setDeliveryLocation(null);
|
|
|
|
|
reqVO.setDeliveryMethod(null);
|
|
|
|
|
reqVO.setModeTransport(null);
|
|
|
|
|
reqVO.setCostBearingMian(null);
|
|
|
|
|
reqVO.setContractId(null);
|
|
|
|
|
reqVO.setTotalAmount(null);
|
|
|
|
|
reqVO.setAmountCapitalization(null);
|
|
|
|
|
reqVO.setContractRequirement(null);
|
|
|
|
@ -322,10 +316,20 @@ public class ContractInfoServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
reqVO.setContractAgreement(null);
|
|
|
|
|
reqVO.setSecurityProtocol(null);
|
|
|
|
|
reqVO.setExtendedField(null);
|
|
|
|
|
reqVO.setBidding(null);
|
|
|
|
|
reqVO.setRemark2(null);
|
|
|
|
|
reqVO.setRemark3(null);
|
|
|
|
|
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setCurrency(null);
|
|
|
|
|
reqVO.setProcurementModel(null);
|
|
|
|
|
reqVO.setPricingModel(null);
|
|
|
|
|
reqVO.setContractPeriodTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
|
|
|
reqVO.setDeliveryModel(null);
|
|
|
|
|
reqVO.setDeliveryLocation(null);
|
|
|
|
|
reqVO.setDeliveryMethod(null);
|
|
|
|
|
reqVO.setModeTransport(null);
|
|
|
|
|
reqVO.setCostBearingMian(null);
|
|
|
|
|
reqVO.setBidding(null);
|
|
|
|
|
|
|
|
|
|
// 调用
|
|
|
|
|
List<ContractInfoDO> list = contractInfoService.getContractInfoList(reqVO);
|
|
|
|
|