BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 87126d838501d35e98f15b82ea3c666144155083

Authored by YunaiV
1 parent 39c0652c

【功能修复】CRM：回款管理导出报错的问题

Inline Side-by-side
Showing 2 changed files with 7 additions and 9 deletions
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java
  View file @87126d8
... ... @@ -7,7 +7,4 @@ package cn.iocoder.yudao.module.bpm.enums;
7 7 */
8 8 public interface DictTypeConstants {
9 9  
10   - String TASK_ASSIGN_RULE_TYPE = "bpm_task_assign_rule_type"; // 任务分配规则类型
11   - String TASK_ASSIGN_SCRIPT = "bpm_task_assign_script"; // 任务分配自定义脚本
12   -
13 10 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableRespVO.java
  View file @87126d8
1 1 package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable;
2 2  
  3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
3 5 import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
  6 +import cn.iocoder.yudao.module.crm.enums.DictTypeConstants;
4 7 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
5 8 import com.alibaba.excel.annotation.ExcelProperty;
6 9 import io.swagger.v3.oas.annotations.media.Schema;
... ... @@ -27,7 +30,8 @@ public class CrmReceivableRespVO {
27 30 private Long planId;
28 31  
29 32 @Schema(description = "回款方式", example = "2")
30   - @ExcelProperty("回款方式")
  33 + @ExcelProperty(value = "回款方式", converter = DictConvert.class)
  34 + @DictFormat(DictTypeConstants.CRM_RECEIVABLE_RETURN_TYPE)
31 35 private Integer returnType;
32 36  
33 37 @Schema(description = "回款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "9000")
... ... @@ -39,7 +43,6 @@ public class CrmReceivableRespVO {
39 43 private LocalDateTime returnTime;
40 44  
41 45 @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
42   - @ExcelProperty("客户编号")
43 46 private Long customerId;
44 47 @Schema(description = "客户名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "test")
45 48 @ExcelProperty("客户名字")
... ... @@ -49,11 +52,9 @@ public class CrmReceivableRespVO {
49 52 @ExcelProperty("合同编号")
50 53 private Long contractId;
51 54 @Schema(description = "合同信息")
52   - @ExcelProperty("合同信息")
53 55 private CrmContractRespVO contract;
54 56  
55 57 @Schema(description = "负责人的用户编号", example = "25682")
56   - @ExcelProperty("负责人的用户编号")
57 58 private Long ownerUserId;
58 59 @Schema(description = "负责人名字", example = "25682")
59 60 @ExcelProperty("负责人名字")
... ... @@ -67,7 +68,8 @@ public class CrmReceivableRespVO {
67 68 private String processInstanceId;
68 69  
69 70 @Schema(description = "审批状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
70   - @ExcelProperty("审批状态")
  71 + @ExcelProperty(value = "审批状态", converter = DictConvert.class)
  72 + @DictFormat(DictTypeConstants.CRM_AUDIT_STATUS)
71 73 private Integer auditStatus;
72 74  
73 75 @Schema(description = "工作流编号", example = "备注")
... ... @@ -83,7 +85,6 @@ public class CrmReceivableRespVO {
83 85 private LocalDateTime updateTime;
84 86  
85 87 @Schema(description = "创建人", example = "25682")
86   - @ExcelProperty("创建人")
87 88 private String creator;
88 89 @Schema(description = "创建人名字", example = "test")
89 90 @ExcelProperty("创建人名字")
... ...