diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java index b1ac35366..80a683aeb 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java +++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java @@ -19,6 +19,7 @@ public class BpmProcessInstanceCreateReqDTO { */ @NotEmpty(message = "流程定义的标识不能为空") private String processDefinitionKey; + /** * 变量实例(动态表单) */ diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java index 1a947294a..91217c6c0 100644 --- a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java @@ -8,9 +8,11 @@ package cn.iocoder.yudao.module.cms.enums; public interface DictTypeConstants { // ***** 字典名称 ****** - String Contract_Type = "contract_type"; // 合同类型 - - - - + String CONTRACT_TYPE = "contract_type"; // 合同类型 + String CONTRACT_STATUS = "contract_status"; // 合同类型 + String COUNT_TYPE = "count_type"; + String SOURCE = "source"; + String PROCESS_STATUS = "process_status"; + String CHARGING_STANDARD = "charging_standard"; + String OUTS_CONTRACT_MAJOR = "outs_contract_major"; } diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ProcessStatusEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ProcessStatusEnum.java new file mode 100644 index 000000000..92f1bb771 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ProcessStatusEnum.java @@ -0,0 +1,43 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 收费标注枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum ProcessStatusEnum { + //未执行 + NO_EXECUTION("0","NO_EXECUTION"), + //正在执行 + EXECUTING("1","EXECUTING"), + //执行完成 + COMPLETED("2","COMPLETED"); + + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (ProcessStatusEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java index fc0b264a8..00ba59e1b 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contract.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -18,14 +20,17 @@ public class ContractPageReqVO extends PageParam { private String name; @Schema(description = "合同类型", example = "2") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; - @Schema(description = "合同进展") + @Schema(description = "合同进展",example = "1") private String progress; @Schema(description = "合同状态", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "计费方式", example = "1") + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; } \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java index 7930e78ce..cea132a62 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractRespVO.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.cms.controller.admin.contract.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; + +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -50,6 +53,7 @@ public class ContractRespVO { @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("合同类型") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED) @@ -74,12 +78,15 @@ public class ContractRespVO { @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("合同状态") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "计费方式", example = "1") @ExcelProperty("计费方式") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String countType; + @Schema(description = "备注", example = "随便") @ExcelProperty("备注") private String remark; @@ -94,6 +101,7 @@ public class ContractRespVO { @Schema(description = "资金来源") @ExcelProperty("资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "优惠", example = "17910") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java index bb8057619..ab0007f10 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractSaveReqVO.java @@ -1,4 +1,6 @@ package cn.iocoder.yudao.module.cms.controller.admin.contract.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -53,6 +55,7 @@ public class ContractSaveReqVO { @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotEmpty(message = "合同类型不能为空") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED) @@ -75,9 +78,11 @@ public class ContractSaveReqVO { @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotEmpty(message = "合同状态不能为空") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "计费方式", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String countType; @Schema(description = "备注", example = "随便") @@ -90,6 +95,7 @@ public class ContractSaveReqVO { private BigDecimal constructionCost; @Schema(description = "资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "优惠", example = "17910") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryPageReqVO.java index 5b14bce58..dc0d25252 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryPageReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryPageReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contractHistory.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -22,18 +24,22 @@ public class ContractHistoryPageReqVO extends PageParam { private String name; @Schema(description = "合同类型", example = "2") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "合同进展") private String progress; @Schema(description = "合同状态", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "计费方式") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String countType; @Schema(description = "流程状态", example = "2") + @DictFormat(DictTypeConstants.PROCESS_STATUS) private String processStatus; } \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryRespVO.java index 56537018e..7375c7994 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryRespVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistoryRespVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contractHistory.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -52,6 +54,7 @@ public class ContractHistoryRespVO { @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("合同类型") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED) @@ -76,10 +79,12 @@ public class ContractHistoryRespVO { @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("合同状态") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "计费方式", example = "2") @ExcelProperty("计费方式") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String countType; @Schema(description = "备注", example = "你猜") @@ -96,6 +101,7 @@ public class ContractHistoryRespVO { @Schema(description = "资金来源") @ExcelProperty("资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "优惠", example = "18154") @@ -153,6 +159,7 @@ public class ContractHistoryRespVO { @Schema(description = "流程状态", example = "2") @ExcelProperty("流程状态") + @DictFormat(DictTypeConstants.PROCESS_STATUS) private String processStatus; @Schema(description = "版本") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistorySaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistorySaveReqVO.java index a2aafce34..1cd995f31 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistorySaveReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractHistory/vo/ContractHistorySaveReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contractHistory.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -55,6 +57,7 @@ public class ContractHistorySaveReqVO { @Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotEmpty(message = "合同类型不能为空") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED) @@ -77,9 +80,11 @@ public class ContractHistorySaveReqVO { @Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotEmpty(message = "合同状态不能为空") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "计费方式", example = "2") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String countType; @Schema(description = "备注", example = "你猜") @@ -92,6 +97,7 @@ public class ContractHistorySaveReqVO { private BigDecimal constructionCost; @Schema(description = "资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "优惠", example = "18154") @@ -132,6 +138,7 @@ public class ContractHistorySaveReqVO { private BigDecimal otherFee; @Schema(description = "流程状态", example = "2") + @DictFormat(DictTypeConstants.PROCESS_STATUS) private String processStatus; @Schema(description = "合同", example = "20704") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractPageReqVO.java index 4fc4adbab..757a6cf17 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractPageReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractPageReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -22,6 +24,7 @@ public class ExtContractPageReqVO extends PageParam { private String name; @Schema(description = "合同类型", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "客户公司id", example = "25191") @@ -32,6 +35,7 @@ public class ExtContractPageReqVO extends PageParam { @Schema(description = "状态", example = "2") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "合同id", example = "27460") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java index d5aa08842..f169659a6 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractRespVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.*; @@ -23,6 +25,7 @@ public class ExtContractRespVO { @Schema(description = "合同类型", example = "1") @ExcelProperty("合同类型") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @@ -60,6 +63,7 @@ public class ExtContractRespVO { @Schema(description = "状态", example = "2") @ExcelProperty("状态") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED) @@ -88,6 +92,7 @@ public class ExtContractRespVO { @Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("计费方式") + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @Schema(description = "备注", example = "你猜") @@ -104,6 +109,7 @@ public class ExtContractRespVO { @Schema(description = "资金来源") @ExcelProperty("资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "分包合同提示时间") @@ -112,6 +118,7 @@ public class ExtContractRespVO { @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("收费标准") + @DictFormat(DictTypeConstants.CHARGING_STANDARD) private String chargingStandard; @Schema(description = "优惠", example = "15529") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java index 67d5ec89c..5e6c2f3bf 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/vo/ExtContractSaveReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -49,6 +51,7 @@ public class ExtContractSaveReqVO { @Schema(description = "合同类型", example = "1") @ExcelProperty("合同类型") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "合同进展") @@ -65,6 +68,7 @@ public class ExtContractSaveReqVO { private LocalDateTime archiveTime; @Schema(description = "状态", example = "2") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED) @@ -88,6 +92,7 @@ public class ExtContractSaveReqVO { @Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotEmpty(message = "计费方式不能为空") + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @Schema(description = "备注", example = "你猜") @@ -100,10 +105,12 @@ public class ExtContractSaveReqVO { private BigDecimal constructionCost; @Schema(description = "资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "收费标准不能为空") + @DictFormat(DictTypeConstants.CHARGING_STANDARD) private String chargingStandard; @Schema(description = "优惠", example = "15529") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryPageReqVO.java index 19c243ce0..0cf88784d 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryPageReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryPageReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.extcontracthistory.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -19,12 +21,14 @@ public class ExtContractHistoryPageReqVO extends PageParam { private String name; @Schema(description = "合同类型", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @Schema(description = "客户公司id", example = "28989") private Long customerCompanyId; @Schema(description = "状态", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @@ -32,6 +36,7 @@ public class ExtContractHistoryPageReqVO extends PageParam { private String processInstanceId; @Schema(description = "流程状态", example = "2") + @DictFormat(DictTypeConstants.PROCESS_STATUS) private String processStatus; @Schema(description = "合同id", example = "26795") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryRespVO.java index 098b59fe6..bffa16f0c 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryRespVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryRespVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.cms.controller.admin.extcontracthistory.vo; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.math.BigDecimal; @@ -50,6 +51,7 @@ public class ExtContractHistoryRespVO { @Schema(description = "合同类型", example = "1") @ExcelProperty("合同类型") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @@ -72,6 +74,7 @@ public class ExtContractHistoryRespVO { @Schema(description = "状态", example = "1") @ExcelProperty("状态") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @@ -98,7 +101,7 @@ public class ExtContractHistoryRespVO { @Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty(value = "计费方式", converter = DictConvert.class) - @DictFormat("contract_billing_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @Schema(description = "备注", example = "你猜") @@ -115,11 +118,12 @@ public class ExtContractHistoryRespVO { @Schema(description = "资金来源") @ExcelProperty(value = "资金来源", converter = DictConvert.class) - @DictFormat("funds_source") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.COUNT_TYPE) private String source; @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("收费标准") + @DictFormat(DictTypeConstants.CHARGING_STANDARD) private String chargingStandard; @Schema(description = "优惠", example = "7511") @@ -152,7 +156,7 @@ public class ExtContractHistoryRespVO { @Schema(description = "流程状态", example = "2") @ExcelProperty(value = "流程状态", converter = DictConvert.class) - @DictFormat("bpm_process_instance_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.PROCESS_STATUS) private String processStatus; @Schema(description = "合同id", example = "26795") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistorySaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistorySaveReqVO.java index 8e0c57b14..233c5fe6c 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistorySaveReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistorySaveReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.extcontracthistory.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -51,6 +53,7 @@ public class ExtContractHistorySaveReqVO { private String name; @Schema(description = "合同类型", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_TYPE) private String type; @@ -69,6 +72,7 @@ public class ExtContractHistorySaveReqVO { private LocalDateTime archiveTime; @Schema(description = "状态", example = "1") + @DictFormat(DictTypeConstants.CONTRACT_STATUS) private String status; @Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED) @@ -92,6 +96,7 @@ public class ExtContractHistorySaveReqVO { @Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotEmpty(message = "计费方式不能为空") + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @Schema(description = "备注", example = "你猜") @@ -104,10 +109,12 @@ public class ExtContractHistorySaveReqVO { private BigDecimal constructionCost; @Schema(description = "资金来源") + @DictFormat(DictTypeConstants.SOURCE) private String source; @Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "收费标准不能为空") + @DictFormat(DictTypeConstants.CHARGING_STANDARD) private String chargingStandard; @Schema(description = "优惠", example = "7511") @@ -131,6 +138,7 @@ public class ExtContractHistorySaveReqVO { @Schema(description = "流程状态", example = "2") + @DictFormat(DictTypeConstants.PROCESS_STATUS) private String processStatus; @Schema(description = "合同id", example = "26795") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractPageReqVO.java index dcdd444b2..c20a6cbcf 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractPageReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractPageReqVO.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,7 +29,8 @@ public class OutsContractPageReqVO extends PageParam { @Schema(description = "主合同id", example = "19816") private Long contractId; - @Schema(description = "类型", example = "2") + @Schema(description = "计费类型", example = "2") + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @Schema(description = "合同金额") @@ -37,6 +40,7 @@ public class OutsContractPageReqVO extends PageParam { private String code; @Schema(description = "专业") + @DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR) private String major; @Schema(description = "签订时间") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractRespVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractRespVO.java index 6d4362f17..0d45dfc40 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractRespVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractRespVO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; @@ -47,7 +48,7 @@ public class OutsContractRespVO { @Schema(description = "外包合同类型", example = "2") @ExcelProperty(value = "外包合同类型", converter = DictConvert.class) - @DictFormat("contract_billing_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @Schema(description = "外包合同总额") @@ -56,7 +57,7 @@ public class OutsContractRespVO { @Schema(description = "专业") @ExcelProperty(value = "专业", converter = DictConvert.class) - @DictFormat("major") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR) private String major; @Schema(description = "签订时间") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractSaveReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractSaveReqVO.java index 11ee23f5a..2c92065e0 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractSaveReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/vo/OutsContractSaveReqVO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.iocoder.yudao.module.cms.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -53,7 +54,7 @@ public class OutsContractSaveReqVO { @Schema(description = "外包合同类型", example = "2") @ExcelProperty(value = "外包合同类型", converter = DictConvert.class) - @DictFormat("contract_billing_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.COUNT_TYPE) private String countType; @@ -64,7 +65,7 @@ public class OutsContractSaveReqVO { @Schema(description = "专业") @ExcelProperty(value = "专业", converter = DictConvert.class) - @DictFormat("major") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR) private String major; @Schema(description = "签订时间") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java index 08af77378..11a00f3d6 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.cms.dal.dataobject.contract; +import cn.iocoder.yudao.module.pms.enums.DictTypeConstants; import lombok.*; import java.time.LocalDateTime; @@ -38,6 +39,8 @@ public class ContractDO extends BaseDO { private String name; /** * 合同类型 + * + * 枚举 枚举 {@link DictTypeConstants} */ private String type; /** diff --git a/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/DictTypeConstants.java b/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/DictTypeConstants.java index 25ab8a4f0..e53f2abc2 100644 --- a/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/DictTypeConstants.java +++ b/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/DictTypeConstants.java @@ -14,6 +14,7 @@ public interface DictTypeConstants { String PROCESS_STATUS = "process_status"; // 流程状态 String POSSIBILITY_OF_LANDING = "possibility_of_landing"; // 可能性 String BPM_PROCESS_INSTANCE_STATUS = "bpm_process_instance_status"; // 流程实例状态 + String TRACKING_DEPLOYMENT = "tracking_deployment"; diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectImpl.java b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectImpl.java index 50861cb82..141a84f70 100644 --- a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectImpl.java +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectImpl.java @@ -26,15 +26,13 @@ public class ProjectImpl implements ProjectApi { @Override public ProjectRespDTO getProject(Long projectId) { ProjectDO projectDO = projectMapper.selectById(projectId); - ProjectRespDTO projectRespDTO = BeanUtils.toBean(projectDO, ProjectRespDTO.class); - return projectRespDTO; + return BeanUtils.toBean(projectDO, ProjectRespDTO.class); } @Override public ProjectDetailRespDTO getProjectDetailById(Long projectId) { ProjectDetailDO projectMapperDetail = projectMapper.getDetailById(projectId); - ProjectDetailRespDTO detailRespDTO = BeanUtils.toBean(projectMapperDetail, ProjectDetailRespDTO.class); - return detailRespDTO; + return BeanUtils.toBean(projectMapperDetail, ProjectDetailRespDTO.class); } @Override diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/project/ProjectController.java b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/project/ProjectController.java index 4516fb40b..c2c8935f6 100644 --- a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/project/ProjectController.java +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/project/ProjectController.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.pms.controller.admin.project; -import cn.iocoder.yudao.framework.common.pojo.FileDTO; import cn.iocoder.yudao.framework.common.util.file.FileUtils; import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDetailDO; import org.springframework.web.bind.annotation.*; @@ -11,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -30,7 +28,6 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import cn.iocoder.yudao.module.pms.controller.admin.project.vo.*; -import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO; import cn.iocoder.yudao.module.pms.service.project.ProjectService; @Tag(name = "管理后台 - 项目基本信息") diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/project/ProjectDetailDO.java b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/project/ProjectDetailDO.java index b847a4a7b..51d83d857 100644 --- a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/project/ProjectDetailDO.java +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/project/ProjectDetailDO.java @@ -8,7 +8,7 @@ import lombok.Data; * @date 2024/7/4 */ @Data -public class ProjectDetailDO extends ProjectDO{ +public class ProjectDetailDO extends ProjectDO { /** * 跟踪部门