朱园亮 / xingyun-erp · Commits

Commit 8444450520dff2d6069cbdd6b23fccb9c54e41d9

Authored by 房远帅
1 parent cc18f182

采购内外贸资信：增加区域

Inline Side-by-side
Showing 13 changed files with 67 additions and 0 deletions
@@ -1517,6 +1517,7 @@ CREATE TABLE `procurement_domestic_customer_credit` @@ -1517,6 +1517,7 @@ CREATE TABLE `procurement_domestic_customer_credit`
1517 `investigator_id` varchar(200) NOT NULL COMMENT '资信调查人ID', 1517 `investigator_id` varchar(200) NOT NULL COMMENT '资信调查人ID',
1518 `investigator_name` varchar(200) NOT NULL COMMENT '资信调查人', 1518 `investigator_name` varchar(200) NOT NULL COMMENT '资信调查人',
1519 `purchase_department` varchar(200) NOT NULL COMMENT '采购处', 1519 `purchase_department` varchar(200) NOT NULL COMMENT '采购处',
  1520 + `region` varchar(200) NOT NULL COMMENT '区域',
1520 `review_valid_until` date NOT NULL COMMENT '评审有效期', 1521 `review_valid_until` date NOT NULL COMMENT '评审有效期',
1521 `status` varchar(20) DEFAULT NULL COMMENT '审核状态', 1522 `status` varchar(20) DEFAULT NULL COMMENT '审核状态',
1522 `freeze` bool DEFAULT false COMMENT '是否冻结', 1523 `freeze` bool DEFAULT false COMMENT '是否冻结',
@@ -1576,6 +1577,7 @@ CREATE TABLE `procurement_foreign_trade_credit` @@ -1576,6 +1577,7 @@ CREATE TABLE `procurement_foreign_trade_credit`
1576 `investigator_id` varchar(200) NOT NULL COMMENT '资信调查人ID', 1577 `investigator_id` varchar(200) NOT NULL COMMENT '资信调查人ID',
1577 `investigator_name` varchar(200) NOT NULL COMMENT '资信调查人', 1578 `investigator_name` varchar(200) NOT NULL COMMENT '资信调查人',
1578 `purchase_department` varchar(200) NOT NULL COMMENT '采购处', 1579 `purchase_department` varchar(200) NOT NULL COMMENT '采购处',
  1580 + `region` varchar(200) NOT NULL COMMENT '区域',
1579 `status` varchar(20) DEFAULT NULL COMMENT '审核状态', 1581 `status` varchar(20) DEFAULT NULL COMMENT '审核状态',
1580 `freeze` bool DEFAULT false COMMENT '是否冻结', 1582 `freeze` bool DEFAULT false COMMENT '是否冻结',
1581 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID', 1583 `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
@@ -165,6 +165,7 @@ public class ProcurementDomesticCustomerCreditController extends DefaultBaseCont @@ -165,6 +165,7 @@ public class ProcurementDomesticCustomerCreditController extends DefaultBaseCont
165 165
166 dataMap.put("reviewDate", dateFormatter.format(data.getCreateTime())); 166 dataMap.put("reviewDate", dateFormatter.format(data.getCreateTime()));
167 dataMap.put("unitName", data.getUnitName() == null ? "" : data.getUnitName()); 167 dataMap.put("unitName", data.getUnitName() == null ? "" : data.getUnitName());
  168 + dataMap.put("customerShortName", data.getCustomerShortName() == null ? "" : data.getCustomerShortName());
168 String companyNature = "①、进口贸易□ ②、国内贸易□\n" + 169 String companyNature = "①、进口贸易□ ②、国内贸易□\n" +
169 "③、终端产废□ ④、其他□"; 170 "③、终端产废□ ④、其他□";
170 if ("IMPORT_TRADE".equals(data.getCompanyNature())) { 171 if ("IMPORT_TRADE".equals(data.getCompanyNature())) {
@@ -266,6 +266,17 @@ public class ProcurementDomesticCustomerCredit extends BaseEntity implements Bas @@ -266,6 +266,17 @@ public class ProcurementDomesticCustomerCredit extends BaseEntity implements Bas
266 private String purchaseDepartmentCode; 266 private String purchaseDepartmentCode;
267 267
268 /** 268 /**
  269 + * 区域
  270 + */
  271 + private String region;
  272 +
  273 + /**
  274 + * 区域名称(非持久化字段)
  275 + */
  276 + @TableField(exist = false)
  277 + private String regionName;
  278 +
  279 + /**
269 * 评审有效期 280 * 评审有效期
270 */ 281 */
271 private LocalDate reviewValidUntil; 282 private LocalDate reviewValidUntil;
@@ -225,6 +225,17 @@ public class ProcurementForeignTradeCredit extends BaseEntity implements BaseDto @@ -225,6 +225,17 @@ public class ProcurementForeignTradeCredit extends BaseEntity implements BaseDto
225 private String purchaseDepartmentCode; 225 private String purchaseDepartmentCode;
226 226
227 /** 227 /**
  228 + * 区域
  229 + */
  230 + private String region;
  231 +
  232 + /**
  233 + * 区域名称(非持久化字段)
  234 + */
  235 + @TableField(exist = false)
  236 + private String regionName;
  237 +
  238 + /**
228 * 审核状态 239 * 审核状态
229 */ 240 */
230 private String status; 241 private String status;
@@ -227,6 +227,11 @@ public class CreateProcurementDomesticCustomerCreditVo implements BaseVo, Serial @@ -227,6 +227,11 @@ public class CreateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
227 @Length(max = 200, message = "采购处最多允许200个字符！") 227 @Length(max = 200, message = "采购处最多允许200个字符！")
228 private String purchaseDepartment; 228 private String purchaseDepartment;
229 229
  230 + @ApiModelProperty(value = "区域", required = true)
  231 + @NotBlank(message = "区域不能为空！")
  232 + @Length(max = 200, message = "区域最多允许200个字符！")
  233 + private String region;
  234 +
230 @ApiModelProperty(value = "评审有效期", required = true) 235 @ApiModelProperty(value = "评审有效期", required = true)
231 @NotNull(message = "评审有效期不能为空！") 236 @NotNull(message = "评审有效期不能为空！")
232 private LocalDate reviewValidUntil; 237 private LocalDate reviewValidUntil;
@@ -203,4 +203,9 @@ public class CreateProcurementForeignTradeCreditVo implements BaseVo, Serializab @@ -203,4 +203,9 @@ public class CreateProcurementForeignTradeCreditVo implements BaseVo, Serializab
203 @NotBlank(message = "采购处不能为空！") 203 @NotBlank(message = "采购处不能为空！")
204 @Length(max = 200, message = "采购处最多允许200个字符！") 204 @Length(max = 200, message = "采购处最多允许200个字符！")
205 private String purchaseDepartment; 205 private String purchaseDepartment;
  206 +
  207 + @ApiModelProperty(value = "区域", required = true)
  208 + @NotBlank(message = "区域不能为空！")
  209 + @Length(max = 200, message = "区域最多允许200个字符！")
  210 + private String region;
206 } 211 }
@@ -33,6 +33,9 @@ public class QueryProcurementDomesticCustomerCreditVo extends PageVo implements @@ -33,6 +33,9 @@ public class QueryProcurementDomesticCustomerCreditVo extends PageVo implements
33 @ApiModelProperty("采购处") 33 @ApiModelProperty("采购处")
34 private String purchaseDepartment; 34 private String purchaseDepartment;
35 35
  36 + @ApiModelProperty("区域")
  37 + private String region;
  38 +
36 @ApiModelProperty("审核状态") 39 @ApiModelProperty("审核状态")
37 private String status; 40 private String status;
38 41
@@ -30,6 +30,9 @@ public class QueryProcurementForeignTradeCreditVo extends PageVo implements Base @@ -30,6 +30,9 @@ public class QueryProcurementForeignTradeCreditVo extends PageVo implements Base
30 @ApiModelProperty("采购处") 30 @ApiModelProperty("采购处")
31 private String purchaseDepartment; 31 private String purchaseDepartment;
32 32
  33 + @ApiModelProperty("区域")
  34 + private String region;
  35 +
33 @ApiModelProperty("下次评审时间开始") 36 @ApiModelProperty("下次评审时间开始")
34 private LocalDate nextReviewTimeStart; 37 private LocalDate nextReviewTimeStart;
35 38
@@ -238,6 +238,11 @@ public class UpdateProcurementDomesticCustomerCreditVo implements BaseVo, Serial @@ -238,6 +238,11 @@ public class UpdateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
238 @Length(max = 200, message = "采购处最多允许200个字符！") 238 @Length(max = 200, message = "采购处最多允许200个字符！")
239 private String purchaseDepartment; 239 private String purchaseDepartment;
240 240
  241 + @ApiModelProperty(value = "区域", required = true)
  242 + @NotBlank(message = "区域不能为空！")
  243 + @Length(max = 200, message = "区域最多允许200个字符！")
  244 + private String region;
  245 +
241 @ApiModelProperty(value = "评审有效期", required = true) 246 @ApiModelProperty(value = "评审有效期", required = true)
242 @NotNull(message = "评审有效期不能为空！") 247 @NotNull(message = "评审有效期不能为空！")
243 private LocalDate reviewValidUntil; 248 private LocalDate reviewValidUntil;
@@ -211,6 +211,11 @@ public class UpdateProcurementForeignTradeCreditVo implements BaseVo, Serializab @@ -211,6 +211,11 @@ public class UpdateProcurementForeignTradeCreditVo implements BaseVo, Serializab
211 @Length(max = 200, message = "采购处最多允许200个字符！") 211 @Length(max = 200, message = "采购处最多允许200个字符！")
212 private String purchaseDepartment; 212 private String purchaseDepartment;
213 213
  214 + @ApiModelProperty(value = "区域", required = true)
  215 + @NotBlank(message = "区域不能为空！")
  216 + @Length(max = 200, message = "区域最多允许200个字符！")
  217 + private String region;
  218 +
214 /** 219 /**
215 * 操作类型：修改（UPDATE）、变更（CHANGE） 220 * 操作类型：修改（UPDATE）、变更（CHANGE）
216 */ 221 */
@@ -53,6 +53,8 @@ @@ -53,6 +53,8 @@
53 <result column="purchase_department" property="purchaseDepartment"/> 53 <result column="purchase_department" property="purchaseDepartment"/>
54 <result column="purchase_department_name" property="purchaseDepartmentName"/> 54 <result column="purchase_department_name" property="purchaseDepartmentName"/>
55 <result column="purchase_department_code" property="purchaseDepartmentCode"/> 55 <result column="purchase_department_code" property="purchaseDepartmentCode"/>
  56 + <result column="region" property="region"/>
  57 + <result column="region_name" property="regionName"/>
56 <result column="review_valid_until" property="reviewValidUntil"/> 58 <result column="review_valid_until" property="reviewValidUntil"/>
57 <result column="status" property="status"/> 59 <result column="status" property="status"/>
58 <result column="freeze" property="freeze"/> 60 <result column="freeze" property="freeze"/>
@@ -115,6 +117,8 @@ @@ -115,6 +117,8 @@
115 tb.purchase_department, 117 tb.purchase_department,
116 sd.name AS purchase_department_name, 118 sd.name AS purchase_department_name,
117 sd.code AS purchase_department_code, 119 sd.code AS purchase_department_code,
  120 + tb.region,
  121 + sd1.name AS region_name,
118 tb.review_valid_until, 122 tb.review_valid_until,
119 tb.status, 123 tb.status,
120 tb.freeze, 124 tb.freeze,
@@ -126,6 +130,7 @@ @@ -126,6 +130,7 @@
126 tb.update_time 130 tb.update_time
127 FROM procurement_domestic_customer_credit tb 131 FROM procurement_domestic_customer_credit tb
128 left join sys_dept as sd on sd.id = tb.purchase_department 132 left join sys_dept as sd on sd.id = tb.purchase_department
  133 + left join sys_dept as sd1 on sd1.id = tb.region
129 </sql> 134 </sql>
130 135
131 <select id="query" resultMap="ProcurementDomesticCustomerCredit"> 136 <select id="query" resultMap="ProcurementDomesticCustomerCredit">
@@ -152,6 +157,9 @@ @@ -152,6 +157,9 @@
152 <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''"> 157 <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''">
153 AND tb.purchase_department = #{vo.purchaseDepartment} 158 AND tb.purchase_department = #{vo.purchaseDepartment}
154 </if> 159 </if>
  160 + <if test="vo.region != null and vo.region != ''">
  161 + AND tb.region = #{vo.region}
  162 + </if>
155 <if test="vo.status != null and vo.status != ''"> 163 <if test="vo.status != null and vo.status != ''">
156 AND tb.status = #{vo.status} 164 AND tb.status = #{vo.status}
157 </if> 165 </if>
@@ -45,6 +45,8 @@ @@ -45,6 +45,8 @@
45 <result column="purchase_department" property="purchaseDepartment"/> 45 <result column="purchase_department" property="purchaseDepartment"/>
46 <result column="purchase_department_name" property="purchaseDepartmentName"/> 46 <result column="purchase_department_name" property="purchaseDepartmentName"/>
47 <result column="purchase_department_code" property="purchaseDepartmentCode"/> 47 <result column="purchase_department_code" property="purchaseDepartmentCode"/>
  48 + <result column="region" property="region"/>
  49 + <result column="region_name" property="regionName"/>
48 <result column="status" property="status"/> 50 <result column="status" property="status"/>
49 <result column="freeze" property="freeze"/> 51 <result column="freeze" property="freeze"/>
50 <result column="create_by_id" property="createById"/> 52 <result column="create_by_id" property="createById"/>
@@ -98,6 +100,8 @@ @@ -98,6 +100,8 @@
98 tb.purchase_department, 100 tb.purchase_department,
99 sd.name AS purchase_department_name, 101 sd.name AS purchase_department_name,
100 sd.code AS purchase_department_code, 102 sd.code AS purchase_department_code,
  103 + tb.region,
  104 + sd1.name AS region_name,
101 tb.status, 105 tb.status,
102 tb.freeze, 106 tb.freeze,
103 tb.create_by_id, 107 tb.create_by_id,
@@ -108,6 +112,7 @@ @@ -108,6 +112,7 @@
108 tb.update_time 112 tb.update_time
109 FROM procurement_foreign_trade_credit tb 113 FROM procurement_foreign_trade_credit tb
110 LEFT JOIN sys_dept AS sd ON sd.id = tb.purchase_department 114 LEFT JOIN sys_dept AS sd ON sd.id = tb.purchase_department
  115 + LEFT JOIN sys_dept as sd1 on sd1.id = tb.region
111 </sql> 116 </sql>
112 117
113 <select id="query" resultMap="ProcurementForeignTradeCredit"> 118 <select id="query" resultMap="ProcurementForeignTradeCredit">
@@ -131,6 +136,9 @@ @@ -131,6 +136,9 @@
131 <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''"> 136 <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''">
132 AND tb.purchase_department = #{vo.purchaseDepartment} 137 AND tb.purchase_department = #{vo.purchaseDepartment}
133 </if> 138 </if>
  139 + <if test="vo.region != null and vo.region != ''">
  140 + AND tb.region = #{vo.region}
  141 + </if>
134 <if test="vo.status != null and vo.status != ''"> 142 <if test="vo.status != null and vo.status != ''">
135 AND tb.status = #{vo.status} 143 AND tb.status = #{vo.status}
136 </if> 144 </if>