朱园亮 / xingyun-erp · Commits

Commit 9c0a64f4ad1c31facda12afab24b76c70693740f

Authored by yeqianyong
2 parents 51919433 4ea418d1

Merge branch 'master_after20' into master_cj_zq

Inline Side-by-side
Showing 13 changed files with 26 additions and 62 deletions
... ... @@ -108,10 +108,10 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
108 108 private String companyAddress;
109 109
110 110 /**
111   - * 注册资本（单位：万元）
  111 + * 注册资本
112 112 */
113   - @ApiModelProperty("注册资本（单位：万元）")
114   - private BigDecimal registeredCapital;
  113 + @ApiModelProperty("注册资本")
  114 + private String registeredCapital;
115 115
116 116 /**
117 117 * 账号
... ...
... ... @@ -107,10 +107,10 @@ public class GetCustomerCreditHistoryBo extends BaseBo<CustomerCreditHistory> {
107 107 private String companyAddress;
108 108
109 109 /**
110   - * 注册资本（单位：万元）
  110 + * 注册资本
111 111 */
112   - @ApiModelProperty("注册资本（单位：万元）")
113   - private BigDecimal registeredCapital;
  112 + @ApiModelProperty("注册资本")
  113 + private String registeredCapital;
114 114
115 115 /**
116 116 * 账号
... ...
1 1 package com.lframework.xingyun.sc.entity;
2 2
3 3 import com.baomidou.mybatisplus.annotation.TableName;
4   -import java.math.BigDecimal;
5 4 import com.lframework.starter.web.core.dto.BaseDto;
6 5
7 6 import java.time.LocalDate;
... ... @@ -9,7 +8,6 @@ import java.time.LocalDateTime;
9 8 import com.baomidou.mybatisplus.annotation.FieldFill;
10 9 import com.lframework.starter.web.core.entity.BaseEntity;
11 10 import com.baomidou.mybatisplus.annotation.TableField;
12   -import io.swagger.annotations.ApiModelProperty;
13 11 import lombok.Data;
14 12
15 13 /**
... ... @@ -95,9 +93,9 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
95 93 private String companyAddress;
96 94
97 95 /**
98   - * 注册资本（单位：万元）
  96 + * 注册资本
99 97 */
100   - private BigDecimal registeredCapital;
  98 + private String registeredCapital;
101 99
102 100 /**
103 101 * 账号
... ...
... ... @@ -95,10 +95,10 @@ public class CustomerCreditHistory extends BaseEntity implements BaseDto {
95 95 private String companyAddress;
96 96
97 97 /**
98   - * 注册资本（单位：万元）
  98 + * 注册资本
99 99 */
100 100 @Label("注册资本")
101   - private BigDecimal registeredCapital;
  101 + private String registeredCapital;
102 102
103 103 /**
104 104 * 账号
... ...
... ... @@ -32,50 +32,42 @@ public class CustomerCreditChangeImportModel implements ExcelModel {
32 32 /**
33 33 * 年度总销量
34 34 */
35   - @ExcelRequired
36 35 @ExcelProperty("年度总销量（吨）")
37 36 private String annualTotalSales;
38 37
39 38 /**
40 39 * 主要行业
41 40 */
42   - @ExcelRequired
43 41 @ExcelProperty("主要行业")
44 42 private String mainIndustry;
45 43
46   - @ExcelRequired
47 44 @ExcelProperty("占用天数（天）")
48 45 private String occupationDays;
49 46
50   - @ExcelRequired
51 47 @ExcelProperty("吨盈利（元/吨）")
52 48 private String profitPerTon;
53 49
54 50 /**
55 51 * 结算期限
56 52 */
57   - @ExcelRequired
58 53 @ExcelProperty("结算期限")
59 54 private String companySettlementPeriod;
60 55
61 56 /**
62 57 * 授信额度
63 58 */
64   - @ExcelRequired
65 59 @ExcelProperty("授信额度（万元）")
66 60 private String companyCreditLimit;
67 61
68 62 /**
69 63 * 加工操作方案
70 64 */
71   - @ExcelRequired
72 65 @ExcelProperty("加工操作方案")
73 66 private String companyMaterialSupplyPlan;
74 67
75 68 /**
76 69 * 客户分类
77 70 */
78   - @ExcelRequired
79 71 @ExcelProperty("客户分类")
80 72 private String companySuggestedCategory;
81 73 }
... ...
... ... @@ -68,10 +68,10 @@ public class CustomerCreditExportModel extends BaseBo<GetCustomerCreditBo> imple
68 68 private String companyAddress;
69 69
70 70 /**
71   - * 注册资本（单位：万元）
  71 + * 注册资本
72 72 */
73 73 @ExcelProperty("注册资本")
74   - private BigDecimal registeredCapital;
  74 + private String registeredCapital;
75 75
76 76 /**
77 77 * 账号
... ...
... ... @@ -159,21 +159,6 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
159 159 "第" + context.readRowHolder().getRowIndex() + "行“企业类型”不存在");
160 160 }
161 161 }
162   - //注册资本
163   - if (data.getRegisteredCapitalStr() != null) {
164   - try {
165   - data.setRegisteredCapital(new BigDecimal(data.getRegisteredCapitalStr()));
166   - } catch (NumberFormatException ignored) {
167   - Matcher matcher = WAN_PATTERN.matcher(data.getRegisteredCapitalStr());
168   - if (matcher.matches()) {
169   - BigDecimal number = new BigDecimal(matcher.group(1));
170   - data.setRegisteredCapital(number);
171   - } else {
172   - throw new DefaultClientException(
173   - "第" + context.readRowHolder().getRowIndex() + "行“注册资本”格式错误");
174   - }
175   - }
176   - }
177 162 //注册时间
178 163 if (data.getRegistrationTimeStr() != null) {
179 164 String dateStr = data.getRegistrationTimeStr().trim();
... ...
... ... @@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
5 5 import com.lframework.starter.web.core.annotations.excel.ExcelRequired;
6 6 import com.lframework.starter.web.core.components.excel.ExcelModel;
7 7 import lombok.Data;
8   -import java.math.BigDecimal;
9 8 import java.time.LocalDate;
10 9
11 10 @Data
... ... @@ -109,16 +108,10 @@ public class CustomerCreditImportModel implements ExcelModel {
109 108 private String companyAddress;
110 109
111 110 /**
112   - * 注册资本（万元）
113   - */
114   - @ExcelIgnore
115   - private BigDecimal registeredCapital;
116   -
117   - /**
118 111 * 注册资本
119 112 */
120   - @ExcelProperty("注册资本（万元）")
121   - private String registeredCapitalStr;
  113 + @ExcelProperty("注册资本")
  114 + private String registeredCapital;
122 115
123 116 /**
124 117 * 账号
... ...
... ... @@ -1461,7 +1461,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
1461 1461 Files.createDirectories(dirPath);
1462 1462 }
1463 1463 // 3. 生成唯一文件名
1464   - String fileName = "资信报告_" + System.currentTimeMillis() + ".docx";
  1464 + String companyName = credit.getCompanyName();
  1465 + String fileName = companyName + "-资信调查表.docx";
1465 1466 String outputPath = dirPath.resolve(fileName).toString();
1466 1467
1467 1468 // 5. 重新打包为 .docx
... ...
1 1 package com.lframework.xingyun.sc.vo.customer.credit;
2 2
3   -import java.math.BigDecimal;
4 3 import javax.validation.constraints.NotBlank;
5 4 import java.time.LocalDate;
6 5 import com.lframework.starter.web.core.vo.BaseVo;
... ... @@ -103,11 +102,10 @@ public class CreateCustomerCreditHistoryVo implements BaseVo, Serializable {
103 102 private String companyAddress;
104 103
105 104 /**
106   - * 注册资本（单位：万元）
  105 + * 注册资本
107 106 */
108   - @ApiModelProperty("注册资本（单位：万元）")
109   - @TypeMismatch(message = "注册资本（单位：万元）格式有误！")
110   - private BigDecimal registeredCapital;
  107 + @ApiModelProperty("注册资本")
  108 + private String registeredCapital;
111 109
112 110 /**
113 111 * 账号
... ...
1 1 package com.lframework.xingyun.sc.vo.customer.credit;
2 2
3   -import java.math.BigDecimal;
4 3 import javax.validation.constraints.NotBlank;
5 4 import java.time.LocalDate;
6 5 import com.lframework.starter.web.core.vo.BaseVo;
... ... @@ -83,11 +82,10 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
83 82 private String companyAddress;
84 83
85 84 /**
86   - * 注册资本（单位：万元）
  85 + * 注册资本
87 86 */
88   - @ApiModelProperty("注册资本（单位：万元）")
89   - @TypeMismatch(message = "注册资本（单位：万元）格式有误！")
90   - private BigDecimal registeredCapital;
  87 + @ApiModelProperty("注册资本")
  88 + private String registeredCapital;
91 89
92 90 /**
93 91 * 账号
... ...
... ... @@ -92,11 +92,10 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
92 92 private String companyAddress;
93 93
94 94 /**
95   - * 注册资本（单位：万元）
  95 + * 注册资本
96 96 */
97   - @ApiModelProperty("注册资本（单位：万元）")
98   - @TypeMismatch(message = "注册资本（单位：万元）格式有误！")
99   - private BigDecimal registeredCapital;
  97 + @ApiModelProperty("注册资本")
  98 + private String registeredCapital;
100 99
101 100 /**
102 101 * 账号
... ...
... ... @@ -214,7 +214,7 @@
214 214 <w:sz w:val="16"/>
215 215 <w:szCs w:val="32"/>
216 216 </w:rPr>
217   - <w:t xml:space="preserve"> ${region!}</w:t>
  217 + <w:t xml:space="preserve"> ${regionName!}</w:t>
218 218 </w:r>
219 219 </w:p>
220 220 </w:tc>
... ...