ccongli
/
YX-SCM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://222.71.165.188:3000/ccongli/YX-SCM

Browse Source
pull/1/head
杨世强 1 year ago
parent 6c718e84e8 c632239704
commit ffaf675fb8
34 changed files with 650 additions and 544 deletions
Show Stats Download Patch File Download Diff File

3
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/ContractController.java
Unescape View File

@ -1,5 +1,6 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -8,7 +9,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
@ -23,7 +23,6 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractDO;
import com.yunxi.scm.module.xxjj.convert.contract.ContractConvert;
import com.yunxi.scm.module.xxjj.service.contract.ContractService;

29
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/ContractInfoController.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/ContractInfoController.java
Unescape View File

@ -1,5 +1,6 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo;
package com.yunxi.scm.module.xxjj.controller.admin.contract;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -8,7 +9,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
@ -23,12 +23,11 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
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.convert.contractinfo.ContractInfoConvert;
import com.yunxi.scm.module.xxjj.service.contractinfo.ContractInfoService;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractInfoDO;
import com.yunxi.scm.module.xxjj.convert.contract.ContractInfoConvert;
import com.yunxi.scm.module.xxjj.service.contract.ContractInfoService;
@Tag(name = "管理后台 - 合同信息")
@Tag(name = "管理后台 - 合同详情")
@RestController
@RequestMapping("/xxjj/contract-info")
@Validated
@ -38,14 +37,14 @@ public class ContractInfoController {
private ContractInfoService contractInfoService;
@PostMapping("/create")
@Operation(summary = "创建合同信息")
@Operation(summary = "创建合同详情")
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:create')")
public CommonResult<Long> createContractInfo(@Valid @RequestBody ContractInfoCreateReqVO createReqVO) {
return success(contractInfoService.createContractInfo(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新合同信息")
@Operation(summary = "更新合同详情")
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:update')")
public CommonResult<Boolean> updateContractInfo(@Valid @RequestBody ContractInfoUpdateReqVO updateReqVO) {
contractInfoService.updateContractInfo(updateReqVO);
@ -53,7 +52,7 @@ public class ContractInfoController {
}
@DeleteMapping("/delete")
@Operation(summary = "删除合同信息")
@Operation(summary = "删除合同详情")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:delete')")
public CommonResult<Boolean> deleteContractInfo(@RequestParam("id") Long id) {
@ -62,7 +61,7 @@ public class ContractInfoController {
}
@GetMapping("/get")
@Operation(summary = "获得合同信息")
@Operation(summary = "获得合同详情")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:query')")
public CommonResult<ContractInfoRespVO> getContractInfo(@RequestParam("id") Long id) {
@ -71,7 +70,7 @@ public class ContractInfoController {
}
@GetMapping("/list")
@Operation(summary = "获得合同信息列表")
@Operation(summary = "获得合同详情列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:query')")
public CommonResult<List<ContractInfoRespVO>> getContractInfoList(@RequestParam("ids") Collection<Long> ids) {
@ -80,7 +79,7 @@ public class ContractInfoController {
}
@GetMapping("/page")
@Operation(summary = "获得合同信息分页")
@Operation(summary = "获得合同详情分页")
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:query')")
public CommonResult<PageResult<ContractInfoRespVO>> getContractInfoPage(@Valid ContractInfoPageReqVO pageVO) {
PageResult<ContractInfoDO> pageResult = contractInfoService.getContractInfoPage(pageVO);
@ -88,7 +87,7 @@ public class ContractInfoController {
}
@GetMapping("/export-excel")
@Operation(summary = "导出合同信息 Excel")
@Operation(summary = "导出合同详情 Excel")
@PreAuthorize("@ss.hasPermission('xxjj:contract-info:export')")
@OperateLog(type = EXPORT)
public void exportContractInfoExcel(@Valid ContractInfoExportReqVO exportReqVO,
@ -96,7 +95,7 @@ public class ContractInfoController {
List<ContractInfoDO> list = contractInfoService.getContractInfoList(exportReqVO);
// 导出 Excel
List<ContractInfoExcelVO> datas = ContractInfoConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "合同信息.xls", "数据", ContractInfoExcelVO.class, datas);
ExcelUtils.write(response, "合同详情.xls", "数据", ContractInfoExcelVO.class, datas);
}
}

25
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/assoc/ContractAssocRespVO.java
Unescape View File

@ -0,0 +1,25 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.assoc;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractBaseVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoBaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "用户后台 - 合同列表信息 Response VO")
public class ContractAssocRespVO extends ContractBaseVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10001")
private Long id;
@Schema(description = "合同详情", requiredMode = Schema.RequiredMode.AUTO, example = "{}")
private ContractInfoBaseVO contractInfo;
}

7
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractBaseVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractBaseVO.java
Unescape View File

@ -1,11 +1,8 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;

4
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractCreateReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractCreateReqVO.java
Unescape View File

@ -1,9 +1,7 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合同信息创建 Request VO")
@Data

8
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractExcelVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractExcelVO.java
Unescape View File

@ -1,11 +1,7 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;

5
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractExportReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractExportReqVO.java
Unescape View File

@ -1,9 +1,8 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.yunxi.scm.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;

3
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractPageReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractPageReqVO.java
Unescape View File

@ -1,7 +1,6 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.yunxi.scm.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;

2
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractRespVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractRespVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

7
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/ContractUpdateReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contract/ContractUpdateReqVO.java
Unescape View File

@ -1,8 +1,8 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合同信息更新 Request VO")
@ -11,8 +11,9 @@ import javax.validation.constraints.*;
@ToString(callSuper = true)
public class ContractUpdateReqVO extends ContractBaseVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "367")
@Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "367")
@NotNull(message = "编号不能为空")
private Long id;
}

106
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoBaseVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoBaseVO.java
Unescape View File

@ -1,11 +1,11 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
@ -14,7 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* 合同信息 Base VO，提供给添加、修改、详细的子 VO 使用
* 合同详情 Base VO，提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/
@Data
@ -22,48 +22,7 @@ public class ContractInfoBaseVO {
@Schema(description = "关联合同id", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "关联合同id不能为空")
private Long contractInfo;
@Schema(description = "币种（0：人民币 1：港币 2：美元 3：欧元 4：加币 5：日元 6：台币）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "币种（0：人民币 1：港币 2：美元 3：欧元 4：加币 5：日元 6：台币）不能为空")
private String currency;
@Schema(description = "采购模式（0：以销定采 1：以采定销）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "采购模式（0：以销定采 1：以采定销）不能为空")
private String procurementModel;
@Schema(description = "定价模式（0：锁价模式 1：后结算模式）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "定价模式（0：锁价模式 1：后结算模式）不能为空")
private String pricingModel;
@Schema(description = "合同期限", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "合同期限不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime contractPeriodTime;
@Schema(description = "交货时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime deliveryTime;
@Schema(description = "交货方式（0：快递上门 1：送货上门 2：上门提货）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "交货方式（0：快递上门 1：送货上门 2：上门提货）不能为空")
private String deliveryModel;
@Schema(description = "交货地点", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "交货地点不能为空")
private String deliveryLocation;
@Schema(description = "配送方式（0：仓配 1：直送 2：直通 3：无）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "配送方式（0：仓配 1：直送 2：直通 3：无）不能为空")
private String deliveryMethod;
@Schema(description = "运输方式（0：公路 1：铁路 2：轮船 3：空运 4：无）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "运输方式（0：公路 1：铁路 2：轮船 3：空运 4：无）不能为空")
private String modeTransport;
@Schema(description = "费用承担主体（0：甲方 1：乙方）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "费用承担主体（0：甲方 1：乙方）不能为空")
private String costBearingMian;
private Long contractId;
@Schema(description = "合计金额（人民币）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "合计金额（人民币）不能为空")
@ -88,10 +47,6 @@ public class ContractInfoBaseVO {
@Schema(description = "合同标签")
private String contractLabel;
@Schema(description = "长协合同", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "长协合同不能为空")
private String contractAgreement;
@Schema(description = "安全协议", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "安全协议不能为空")
private String securityProtocol;
@ -100,14 +55,59 @@ public class ContractInfoBaseVO {
@NotNull(message = "扩展字段不能为空")
private String extendedField;
@Schema(description = "是否招投标（0：是 1：否）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否招投标（0：是 1：否）不能为空")
private String bidding;
@Schema(description = "备注2")
private String remark2;
@Schema(description = "备注3")
private String remark3;
@Schema(description = "长协合同 参照字典contract_ longterm_status", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "长协合同不能为空")
private String contractAgreement;
@Schema(description = "币种 参照字典contract_currency", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "币种 参照字典contract_currency不能为空")
private String currency;
@Schema(description = "采购模式 参照字典contract_procurement_model", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "采购模式 参照字典contract_procurement_model不能为空")
private String procurementModel;
@Schema(description = "定价模式 参照字典contract_pricing_model", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "定价模式 参照字典contract_pricing_model不能为空")
private String pricingModel;
@Schema(description = "合同期限 ", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "合同期限 不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime contractPeriodTime;
@Schema(description = "交货时间 ")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime deliveryTime;
@Schema(description = "交货方式 参照字典contract_delivery_model", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "交货方式 参照字典contract_delivery_model不能为空")
private String deliveryModel;
@Schema(description = "交货地点 ", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "交货地点 不能为空")
private String deliveryLocation;
@Schema(description = "配送方式 参照字典contract_delivery_method", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "配送方式 参照字典contract_delivery_method不能为空")
private String deliveryMethod;
@Schema(description = "运输方式 参照字典contract_mode_transport", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "运输方式 参照字典contract_mode_transport不能为空")
private String modeTransport;
@Schema(description = "费用承担主体 参照字典contract_cost_main", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "费用承担主体 参照字典contract_cost_main不能为空")
private String costBearingMian;
@Schema(description = "是否招投标 参照字典contract_bidding_status", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否招投标 参照字典contract_bidding_status不能为空")
private String bidding;
}

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoCreateReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoCreateReqVO.java
Unescape View File

@ -1,11 +1,9 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合同信息创建 Request VO")
@Schema(description = "管理后台 - 合同详情创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

112
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoExcelVO.java
Unescape View File

@ -0,0 +1,112 @@
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yunxi.scm.framework.excel.core.annotations.DictFormat;
import com.yunxi.scm.framework.excel.core.convert.DictConvert;
/**
* 合同详情 Excel VO
*
* @author 长江云息
*/
@Data
public class ContractInfoExcelVO {
@ExcelProperty("编号")
private Long id;
@ExcelProperty("关联合同id")
private Long contractId;
@ExcelProperty("合计金额（人民币）")
private BigDecimal totalAmount;
@ExcelProperty("大写金额（人民币）")
private String amountCapitalization;
@ExcelProperty("合同要求")
private String contractRequirement;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("合同附件")
private String contractAppendices;
@ExcelProperty("附属文件")
private String ancillaryDocuments;
@ExcelProperty("合同标签")
private String contractLabel;
@ExcelProperty("安全协议")
private String securityProtocol;
@ExcelProperty("扩展字段")
private String extendedField;
@ExcelProperty("备注2")
private String remark2;
@ExcelProperty("备注3")
private String remark3;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("长协合同")
@DictFormat("contract_longterm_status")
private String contractAgreement;
@ExcelProperty(value = "币种 参照字典contract_currency", converter = DictConvert.class)
@DictFormat("contract_currency") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String currency;
@ExcelProperty(value = "采购模式 参照字典contract_procurement_model", converter = DictConvert.class)
@DictFormat("contract_procurement_model") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String procurementModel;
@ExcelProperty(value = "定价模式 参照字典contract_pricing_model", converter = DictConvert.class)
@DictFormat("合同定价模式") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String pricingModel;
@ExcelProperty("合同期限 ")
private LocalDateTime contractPeriodTime;
@ExcelProperty("交货时间 ")
private LocalDateTime deliveryTime;
@ExcelProperty(value = "交货方式 参照字典contract_delivery_model", converter = DictConvert.class)
@DictFormat("contract_delivery_model") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String deliveryModel;
@ExcelProperty("交货地点 ")
private String deliveryLocation;
@ExcelProperty(value = "配送方式 参照字典contract_delivery_method", converter = DictConvert.class)
@DictFormat("contract_delivery_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String deliveryMethod;
@ExcelProperty(value = "运输方式 参照字典contract_mode_transport", converter = DictConvert.class)
@DictFormat("contract_mode_transport") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String modeTransport;
@ExcelProperty(value = "费用承担主体 参照字典contract_cost_main", converter = DictConvert.class)
@DictFormat("合同费用承担主体") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String costBearingMian;
@ExcelProperty(value = "是否招投标 参照字典contract_bidding_status", converter = DictConvert.class)
@DictFormat("contract_bidding_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String bidding;
}

76
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoExportReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoExportReqVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import lombok.*;
@ -11,44 +11,12 @@ import org.springframework.format.annotation.DateTimeFormat;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合同信息 Excel 导出 Request VO，参数和 ContractInfoPageReqVO 是一致的")
@Schema(description = "管理后台 - 合同详情 Excel 导出 Request VO，参数和 ContractInfoPageReqVO 是一致的")
@Data
public class ContractInfoExportReqVO {
@Schema(description = "关联合同id")
private Long contractInfo;
@Schema(description = "币种（0：人民币 1：港币 2：美元 3：欧元 4：加币 5：日元 6：台币）")
private String currency;
@Schema(description = "采购模式（0：以销定采 1：以采定销）")
private String procurementModel;
@Schema(description = "定价模式（0：锁价模式 1：后结算模式）")
private String pricingModel;
@Schema(description = "合同期限")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] contractPeriodTime;
@Schema(description = "交货时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] deliveryTime;
@Schema(description = "交货方式（0：快递上门 1：送货上门 2：上门提货）")
private String deliveryModel;
@Schema(description = "交货地点")
private String deliveryLocation;
@Schema(description = "配送方式（0：仓配 1：直送 2：直通 3：无）")
private String deliveryMethod;
@Schema(description = "运输方式（0：公路 1：铁路 2：轮船 3：空运 4：无）")
private String modeTransport;
@Schema(description = "费用承担主体（0：甲方 1：乙方）")
private String costBearingMian;
private Long contractId;
@Schema(description = "合计金额（人民币）")
private BigDecimal totalAmount;
@ -80,9 +48,6 @@ public class ContractInfoExportReqVO {
@Schema(description = "扩展字段")
private String extendedField;
@Schema(description = "是否招投标（0：是 1：否）")
private String bidding;
@Schema(description = "备注2")
private String remark2;
@ -93,4 +58,39 @@ public class ContractInfoExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "币种 参照字典contract_currency")
private String currency;
@Schema(description = "采购模式 参照字典contract_procurement_model")
private String procurementModel;
@Schema(description = "定价模式 参照字典contract_pricing_model")
private String pricingModel;
@Schema(description = "合同期限 ")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] contractPeriodTime;
@Schema(description = "交货时间 ")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] deliveryTime;
@Schema(description = "交货方式 参照字典contract_delivery_model")
private String deliveryModel;
@Schema(description = "交货地点 ")
private String deliveryLocation;
@Schema(description = "配送方式 参照字典contract_delivery_method")
private String deliveryMethod;
@Schema(description = "运输方式 参照字典contract_mode_transport")
private String modeTransport;
@Schema(description = "费用承担主体 参照字典contract_cost_main")
private String costBearingMian;
@Schema(description = "是否招投标 参照字典contract_bidding_status")
private String bidding;
}

76
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoPageReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoPageReqVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import lombok.*;
@ -11,46 +11,14 @@ import java.time.LocalDateTime;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 合同信息分页 Request VO")
@Schema(description = "管理后台 - 合同详情分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ContractInfoPageReqVO extends PageParam {
@Schema(description = "关联合同id")
private Long contractInfo;
@Schema(description = "币种（0：人民币 1：港币 2：美元 3：欧元 4：加币 5：日元 6：台币）")
private String currency;
@Schema(description = "采购模式（0：以销定采 1：以采定销）")
private String procurementModel;
@Schema(description = "定价模式（0：锁价模式 1：后结算模式）")
private String pricingModel;
@Schema(description = "合同期限")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] contractPeriodTime;
@Schema(description = "交货时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] deliveryTime;
@Schema(description = "交货方式（0：快递上门 1：送货上门 2：上门提货）")
private String deliveryModel;
@Schema(description = "交货地点")
private String deliveryLocation;
@Schema(description = "配送方式（0：仓配 1：直送 2：直通 3：无）")
private String deliveryMethod;
@Schema(description = "运输方式（0：公路 1：铁路 2：轮船 3：空运 4：无）")
private String modeTransport;
@Schema(description = "费用承担主体（0：甲方 1：乙方）")
private String costBearingMian;
private Long contractId;
@Schema(description = "合计金额（人民币）")
private BigDecimal totalAmount;
@ -82,9 +50,6 @@ public class ContractInfoPageReqVO extends PageParam {
@Schema(description = "扩展字段")
private String extendedField;
@Schema(description = "是否招投标（0：是 1：否）")
private String bidding;
@Schema(description = "备注2")
private String remark2;
@ -95,4 +60,39 @@ public class ContractInfoPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "币种 参照字典contract_currency")
private String currency;
@Schema(description = "采购模式 参照字典contract_procurement_model")
private String procurementModel;
@Schema(description = "定价模式 参照字典contract_pricing_model")
private String pricingModel;
@Schema(description = "合同期限 ")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] contractPeriodTime;
@Schema(description = "交货时间 ")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] deliveryTime;
@Schema(description = "交货方式 参照字典contract_delivery_model")
private String deliveryModel;
@Schema(description = "交货地点 ")
private String deliveryLocation;
@Schema(description = "配送方式 参照字典contract_delivery_method")
private String deliveryMethod;
@Schema(description = "运输方式 参照字典contract_mode_transport")
private String modeTransport;
@Schema(description = "费用承担主体 参照字典contract_cost_main")
private String costBearingMian;
@Schema(description = "是否招投标 参照字典contract_bidding_status")
private String bidding;
}

4
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoRespVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoRespVO.java
Unescape View File

@ -1,10 +1,10 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 合同信息 Response VO")
@Schema(description = "管理后台 - 合同详情 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoUpdateReqVO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contract/vo/contractinfo/ContractInfoUpdateReqVO.java
Unescape View File

@ -1,11 +1,11 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
package com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 合同信息更新 Request VO")
@Schema(description = "管理后台 - 合同详情更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

100
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/contractinfo/vo/ContractInfoExcelVO.java
Unescape View File

@ -1,100 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 合同信息 Excel VO
*
* @author 长江云息
*/
@Data
public class ContractInfoExcelVO {
@ExcelProperty("编号")
private Long id;
@ExcelProperty("关联合同id")
private Long contractInfo;
@ExcelProperty("币种（0：人民币 1：港币 2：美元 3：欧元 4：加币 5：日元 6：台币）")
private String currency;
@ExcelProperty("采购模式（0：以销定采 1：以采定销）")
private String procurementModel;
@ExcelProperty("定价模式（0：锁价模式 1：后结算模式）")
private String pricingModel;
@ExcelProperty("合同期限")
private LocalDateTime contractPeriodTime;
@ExcelProperty("交货时间")
private LocalDateTime deliveryTime;
@ExcelProperty("交货方式（0：快递上门 1：送货上门 2：上门提货）")
private String deliveryModel;
@ExcelProperty("交货地点")
private String deliveryLocation;
@ExcelProperty("配送方式（0：仓配 1：直送 2：直通 3：无）")
private String deliveryMethod;
@ExcelProperty("运输方式（0：公路 1：铁路 2：轮船 3：空运 4：无）")
private String modeTransport;
@ExcelProperty("费用承担主体（0：甲方 1：乙方）")
private String costBearingMian;
@ExcelProperty("合计金额（人民币）")
private BigDecimal totalAmount;
@ExcelProperty("大写金额（人民币）")
private String amountCapitalization;
@ExcelProperty("合同要求")
private String contractRequirement;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("合同附件")
private String contractAppendices;
@ExcelProperty("附属文件")
private String ancillaryDocuments;
@ExcelProperty("合同标签")
private String contractLabel;
@ExcelProperty("长协合同")
private String contractAgreement;
@ExcelProperty("安全协议")
private String securityProtocol;
@ExcelProperty("扩展字段")
private String extendedField;
@ExcelProperty("是否招投标（0：是 1：否）")
private String bidding;
@ExcelProperty("备注2")
private String remark2;
@ExcelProperty("备注3")
private String remark3;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

8
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/contract/ContractConvert.java
Unescape View File

@ -4,9 +4,13 @@ import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.assoc.ContractAssocRespVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractCreateReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractExcelVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractRespVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractUpdateReqVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractDO;
/**
@ -25,6 +29,8 @@ public interface ContractConvert {
ContractRespVO convert(ContractDO bean);
ContractAssocRespVO convertAssoc(ContractDO bean);
List<ContractRespVO> convertList(List<ContractDO> list);
PageResult<ContractRespVO> convertPage(PageResult<ContractDO> page);

11
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/contractinfo/ContractInfoConvert.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/contract/ContractInfoConvert.java
Unescape View File

@ -1,16 +1,19 @@
package com.yunxi.scm.module.xxjj.convert.contractinfo;
package com.yunxi.scm.module.xxjj.convert.contract;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoCreateReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoExcelVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoRespVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contractinfo.ContractInfoUpdateReqVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
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.dataobject.contract.ContractInfoDO;
/**
* 合同信息 Convert
* 合同详情 Convert
*
* @author 长江云息
*/

12
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/contract/ContractDO.java
Unescape View File

@ -1,11 +1,9 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.contract;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
@ -88,4 +86,10 @@ public class ContractDO extends BaseDO {
*/
private LocalDateTime declarationTime;
/**
* 合同详情
*/
@TableField(exist = false)
private ContractInfoDO contractInfoDO;
}

112
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/contractinfo/ContractInfoDO.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/contract/ContractInfoDO.java
Unescape View File

@ -1,17 +1,17 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.contractinfo;
package com.yunxi.scm.module.xxjj.dal.dataobject.contract;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
/**
* 合同信息 DO
* 合同详情 DO
*
* @author 长江云息
*/
@ -33,47 +33,7 @@ public class ContractInfoDO extends BaseDO {
/**
* 关联合同id
*/
private Long contractInfo;
/**
* 币种（0：人民币 1：港币 2：美元 3：欧元 4：加币 5：日元 6：台币）
*/
private String currency;
/**
* 采购模式（0：以销定采 1：以采定销）
*/
private String procurementModel;
/**
* 定价模式（0：锁价模式 1：后结算模式）
*/
private String pricingModel;
/**
* 合同期限
*/
private LocalDateTime contractPeriodTime;
/**
* 交货时间
*/
private LocalDateTime deliveryTime;
/**
* 交货方式（0：快递上门 1：送货上门 2：上门提货）
*/
private String deliveryModel;
/**
* 交货地点
*/
private String deliveryLocation;
/**
* 配送方式（0：仓配 1：直送 2：直通 3：无）
*/
private String deliveryMethod;
/**
* 运输方式（0：公路 1：铁路 2：轮船 3：空运 4：无）
*/
private String modeTransport;
/**
* 费用承担主体（0：甲方 1：乙方）
*/
private String costBearingMian;
private Long contractId;
/**
* 合计金额（人民币）
*/
@ -114,10 +74,6 @@ public class ContractInfoDO extends BaseDO {
* 扩展字段
*/
private String extendedField;
/**
* 是否招投标（0：是 1：否）
*/
private String bidding;
/**
* 备注2
*/
@ -126,5 +82,65 @@ public class ContractInfoDO extends BaseDO {
* 备注3
*/
private String remark3;
/**
* 币种 参照字典contract_currency
*
* 枚举 {@link TODO contract_currency 对应的类}
*/
private String currency;
/**
* 采购模式 参照字典contract_procurement_model
*
* 枚举 {@link TODO contract_procurement_model 对应的类}
*/
private String procurementModel;
/**
* 定价模式 参照字典contract_pricing_model
*
* 枚举 {@link TODO 合同定价模式 对应的类}
*/
private String pricingModel;
/**
* 合同期限
*/
private LocalDateTime contractPeriodTime;
/**
* 交货时间
*/
private LocalDateTime deliveryTime;
/**
* 交货方式 参照字典contract_delivery_model
*
* 枚举 {@link TODO contract_delivery_model 对应的类}
*/
private String deliveryModel;
/**
* 交货地点
*/
private String deliveryLocation;
/**
* 配送方式 参照字典contract_delivery_method
*
* 枚举 {@link TODO contract_delivery_method 对应的类}
*/
private String deliveryMethod;
/**
* 运输方式 参照字典contract_mode_transport
*
* 枚举 {@link TODO contract_mode_transport 对应的类}
*/
private String modeTransport;
/**
* 费用承担主体 参照字典contract_cost_main
*
* 枚举 {@link TODO 合同费用承担主体 对应的类}
*/
private String costBearingMian;
/**
* 是否招投标 参照字典contract_bidding_status
*
* 枚举 {@link TODO contract_bidding_status 对应的类}
*/
private String bidding;
}

47
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/contractinfo/ContractInfoMapper.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/contract/ContractInfoMapper.java
Unescape View File

@ -1,16 +1,17 @@
package com.yunxi.scm.module.xxjj.dal.mysql.contractinfo;
package com.yunxi.scm.module.xxjj.dal.mysql.contract;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
import com.yunxi.scm.module.xxjj.dal.dataobject.contractinfo.ContractInfoDO;
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.dal.dataobject.contract.ContractInfoDO;
import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo.*;
/**
* 合同信息 Mapper
* 合同详情 Mapper
*
* @author 长江云息
*/
@ -19,17 +20,7 @@ public interface ContractInfoMapper extends BaseMapperX<ContractInfoDO> {
default PageResult<ContractInfoDO> selectPage(ContractInfoPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ContractInfoDO>()
.eqIfPresent(ContractInfoDO::getContractInfo, reqVO.getContractInfo())
.eqIfPresent(ContractInfoDO::getCurrency, reqVO.getCurrency())
.eqIfPresent(ContractInfoDO::getProcurementModel, reqVO.getProcurementModel())
.eqIfPresent(ContractInfoDO::getPricingModel, reqVO.getPricingModel())
.betweenIfPresent(ContractInfoDO::getContractPeriodTime, reqVO.getContractPeriodTime())
.betweenIfPresent(ContractInfoDO::getDeliveryTime, reqVO.getDeliveryTime())
.eqIfPresent(ContractInfoDO::getDeliveryModel, reqVO.getDeliveryModel())
.eqIfPresent(ContractInfoDO::getDeliveryLocation, reqVO.getDeliveryLocation())
.eqIfPresent(ContractInfoDO::getDeliveryMethod, reqVO.getDeliveryMethod())
.eqIfPresent(ContractInfoDO::getModeTransport, reqVO.getModeTransport())
.eqIfPresent(ContractInfoDO::getCostBearingMian, reqVO.getCostBearingMian())
.eqIfPresent(ContractInfoDO::getContractId, reqVO.getContractId())
.eqIfPresent(ContractInfoDO::getTotalAmount, reqVO.getTotalAmount())
.eqIfPresent(ContractInfoDO::getAmountCapitalization, reqVO.getAmountCapitalization())
.eqIfPresent(ContractInfoDO::getContractRequirement, reqVO.getContractRequirement())
@ -40,16 +31,9 @@ public interface ContractInfoMapper extends BaseMapperX<ContractInfoDO> {
.eqIfPresent(ContractInfoDO::getContractAgreement, reqVO.getContractAgreement())
.eqIfPresent(ContractInfoDO::getSecurityProtocol, reqVO.getSecurityProtocol())
.eqIfPresent(ContractInfoDO::getExtendedField, reqVO.getExtendedField())
.eqIfPresent(ContractInfoDO::getBidding, reqVO.getBidding())
.eqIfPresent(ContractInfoDO::getRemark2, reqVO.getRemark2())
.eqIfPresent(ContractInfoDO::getRemark3, reqVO.getRemark3())
.betweenIfPresent(ContractInfoDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ContractInfoDO::getId));
}
default List<ContractInfoDO> selectList(ContractInfoExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ContractInfoDO>()
.eqIfPresent(ContractInfoDO::getContractInfo, reqVO.getContractInfo())
.eqIfPresent(ContractInfoDO::getCurrency, reqVO.getCurrency())
.eqIfPresent(ContractInfoDO::getProcurementModel, reqVO.getProcurementModel())
.eqIfPresent(ContractInfoDO::getPricingModel, reqVO.getPricingModel())
@ -60,6 +44,13 @@ public interface ContractInfoMapper extends BaseMapperX<ContractInfoDO> {
.eqIfPresent(ContractInfoDO::getDeliveryMethod, reqVO.getDeliveryMethod())
.eqIfPresent(ContractInfoDO::getModeTransport, reqVO.getModeTransport())
.eqIfPresent(ContractInfoDO::getCostBearingMian, reqVO.getCostBearingMian())
.eqIfPresent(ContractInfoDO::getBidding, reqVO.getBidding())
.orderByDesc(ContractInfoDO::getId));
}
default List<ContractInfoDO> selectList(ContractInfoExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ContractInfoDO>()
.eqIfPresent(ContractInfoDO::getContractId, reqVO.getContractId())
.eqIfPresent(ContractInfoDO::getTotalAmount, reqVO.getTotalAmount())
.eqIfPresent(ContractInfoDO::getAmountCapitalization, reqVO.getAmountCapitalization())
.eqIfPresent(ContractInfoDO::getContractRequirement, reqVO.getContractRequirement())
@ -70,10 +61,20 @@ public interface ContractInfoMapper extends BaseMapperX<ContractInfoDO> {
.eqIfPresent(ContractInfoDO::getContractAgreement, reqVO.getContractAgreement())
.eqIfPresent(ContractInfoDO::getSecurityProtocol, reqVO.getSecurityProtocol())
.eqIfPresent(ContractInfoDO::getExtendedField, reqVO.getExtendedField())
.eqIfPresent(ContractInfoDO::getBidding, reqVO.getBidding())
.eqIfPresent(ContractInfoDO::getRemark2, reqVO.getRemark2())
.eqIfPresent(ContractInfoDO::getRemark3, reqVO.getRemark3())
.betweenIfPresent(ContractInfoDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(ContractInfoDO::getCurrency, reqVO.getCurrency())
.eqIfPresent(ContractInfoDO::getProcurementModel, reqVO.getProcurementModel())
.eqIfPresent(ContractInfoDO::getPricingModel, reqVO.getPricingModel())
.betweenIfPresent(ContractInfoDO::getContractPeriodTime, reqVO.getContractPeriodTime())
.betweenIfPresent(ContractInfoDO::getDeliveryTime, reqVO.getDeliveryTime())
.eqIfPresent(ContractInfoDO::getDeliveryModel, reqVO.getDeliveryModel())
.eqIfPresent(ContractInfoDO::getDeliveryLocation, reqVO.getDeliveryLocation())
.eqIfPresent(ContractInfoDO::getDeliveryMethod, reqVO.getDeliveryMethod())
.eqIfPresent(ContractInfoDO::getModeTransport, reqVO.getModeTransport())
.eqIfPresent(ContractInfoDO::getCostBearingMian, reqVO.getCostBearingMian())
.eqIfPresent(ContractInfoDO::getBidding, reqVO.getBidding())
.orderByDesc(ContractInfoDO::getId));
}

3
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/contract/ContractMapper.java
Unescape View File

@ -5,9 +5,10 @@ import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractExportReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractPageReqVO;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractDO;
import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.*;
/**
* 合同信息 Mapper

82
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/contract/ContractInfoService.java
Unescape View File

@ -0,0 +1,82 @@
package com.yunxi.scm.module.xxjj.service.contract;
import java.util.*;
import javax.validation.*;
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.dal.dataobject.contract.ContractInfoDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
/**
* 合同详情 Service 接口
*
* @author 长江云息
*/
public interface ContractInfoService {
/**
* 创建合同详情
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createContractInfo(@Valid ContractInfoCreateReqVO createReqVO);
/**
* 更新合同详情
*
* @param updateReqVO 更新信息
*/
void updateContractInfo(@Valid ContractInfoUpdateReqVO updateReqVO);
/**
* 删除合同详情
*
* @param id 编号
*/
void deleteContractInfo(Long id);
/**
* 获得合同详情
*
* @param id 编号
* @return 合同详情
*/
ContractInfoDO getContractInfo(Long id);
/**
* 获得合同详情列表
*
* @param ids 编号
* @return 合同详情列表
*/
List<ContractInfoDO> getContractInfoList(Collection<Long> ids);
/**
* 获得合同详情分页
*
* @param pageReqVO 分页查询
* @return 合同详情分页
*/
PageResult<ContractInfoDO> getContractInfoPage(ContractInfoPageReqVO pageReqVO);
/**
* 获得合同详情列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 合同详情列表
*/
List<ContractInfoDO> getContractInfoList(ContractInfoExportReqVO exportReqVO);
/**
* 通过ContractId获得合同详情
* @param contractId
* @return ContractInfoDO
*/
ContractInfoDO getContractInfoByContractId(Long contractId);
}

21
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/contractinfo/ContractInfoServiceImpl.java → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/contract/ContractInfoServiceImpl.java
Unescape View File

@ -1,22 +1,26 @@
package com.yunxi.scm.module.xxjj.service.contractinfo;
package com.yunxi.scm.module.xxjj.service.contract;
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 org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
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.dataobject.contract.ContractInfoDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.convert.contractinfo.ContractInfoConvert;
import com.yunxi.scm.module.xxjj.dal.mysql.contractinfo.ContractInfoMapper;
import com.yunxi.scm.module.xxjj.convert.contract.ContractInfoConvert;
import com.yunxi.scm.module.xxjj.dal.mysql.contract.ContractInfoMapper;
import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
/**
* 合同信息 Service 实现类
* 合同详情 Service 实现类
*
* @author 长江云息
*/
@ -79,4 +83,9 @@ public class ContractInfoServiceImpl implements ContractInfoService {
return contractInfoMapper.selectList(exportReqVO);
}
@Override
public ContractInfoDO getContractInfoByContractId(Long contractId) {
return contractInfoMapper.selectOne(ContractInfoDO::getContractId, contractId);
}
}

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/contract/ContractService.java
Unescape View File

@ -2,7 +2,11 @@ package com.yunxi.scm.module.xxjj.service.contract;
import java.util.*;
import javax.validation.*;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.*;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractCreateReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractExportReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractPageReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractUpdateReqVO;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractDO;
import com.yunxi.scm.framework.common.pojo.PageResult;

18
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/contract/ContractServiceImpl.java
Unescape View File

@ -1,11 +1,16 @@
package com.yunxi.scm.module.xxjj.service.contract;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractCreateReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractExportReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractPageReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractUpdateReqVO;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractInfoDO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
@ -27,6 +32,10 @@ public class ContractServiceImpl implements ContractService {
@Resource
private ContractMapper contractMapper;
@Resource
private ContractInfoService contractInfoService;
@Override
public Long createContract(ContractCreateReqVO createReqVO) {
// 插入
@ -61,7 +70,12 @@ public class ContractServiceImpl implements ContractService {
@Override
public ContractDO getContract(Long id) {
return contractMapper.selectById(id);
ContractDO contractDO = contractMapper.selectById(id);
// 合同详情
ContractInfoDO contractInfoDO = contractInfoService.getContractInfoByContractId(contractDO.getId());
contractDO.setContractInfoDO(contractInfoDO);
// todo
return contractDO;
}
@Override

70
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/contractinfo/ContractInfoService.java
Unescape View File

@ -1,70 +0,0 @@
package com.yunxi.scm.module.xxjj.service.contractinfo;
import java.util.*;
import javax.validation.*;
import com.yunxi.scm.module.xxjj.controller.admin.contractinfo.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.contractinfo.ContractInfoDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
/**
* 合同信息 Service 接口
*
* @author 长江云息
*/
public interface ContractInfoService {
/**
* 创建合同信息
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createContractInfo(@Valid ContractInfoCreateReqVO createReqVO);
/**
* 更新合同信息
*
* @param updateReqVO 更新信息
*/
void updateContractInfo(@Valid ContractInfoUpdateReqVO updateReqVO);
/**
* 删除合同信息
*
* @param id 编号
*/
void deleteContractInfo(Long id);
/**
* 获得合同信息
*
* @param id 编号
* @return 合同信息
*/
ContractInfoDO getContractInfo(Long id);
/**
* 获得合同信息列表
*
* @param ids 编号
* @return 合同信息列表
*/
List<ContractInfoDO> getContractInfoList(Collection<Long> ids);
/**
* 获得合同信息分页
*
* @param pageReqVO 分页查询
* @return 合同信息分页
*/
PageResult<ContractInfoDO> getContractInfoPage(ContractInfoPageReqVO pageReqVO);
/**
* 获得合同信息列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 合同信息列表
*/
List<ContractInfoDO> getContractInfoList(ContractInfoExportReqVO exportReqVO);
}

2
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/contractinfo/ContractInfoMapper.xml → yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/contract/ContractInfoMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yunxi.scm.module.xxjj.dal.mysql.contractinfo.ContractInfoMapper">
<mapper namespace="com.yunxi.scm.module.xxjj.dal.mysql.contract.ContractInfoMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

1
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml
Unescape View File

@ -8,4 +8,5 @@
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

11
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/contract/ContractServiceImplTest.java
Unescape View File

@ -1,32 +1,29 @@
package com.yunxi.scm.module.xxjj.service.contract;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractCreateReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractExportReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractPageReqVO;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.contract.ContractUpdateReqVO;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import javax.annotation.Resource;
import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
import com.yunxi.scm.module.xxjj.controller.admin.contract.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.contract.ContractDO;
import com.yunxi.scm.module.xxjj.dal.mysql.contract.ContractMapper;
import com.yunxi.scm.framework.common.pojo.PageResult;
import javax.annotation.Resource;
import org.springframework.context.annotation.Import;
import java.util.*;
import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*;
import static com.yunxi.scm.framework.common.util.date.DateUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
/**
* {@link ContractServiceImpl} 的单元测试类

198
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/contractinfo/ContractInfoServiceImplTest.java
Unescape View File

@ -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);

13
yunxi-ui-admin-vben/.eslintrc.js
Unescape View File

@ -3,8 +3,19 @@ const process = require('node:process')
process.env.ESLINT_TSCONFIG = 'tsconfig.json'
module.exports = {
extends: ['@xingyuv', '@unocss'],
// extends: ['@xingyuv', '@unocss'],
extends: [],
rules: {
'no-console': 'off',
'semi': 0,
'no-unused-vars': [
2,
{
// 允许声明未使用变量
vars: 'local',
// 参数不检查
args: 'none'
}
]
},
}

Write Preview
Loading…
Cancel
Save