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

@@ -1517,6 +1517,7 @@ CREATE TABLE `procurement_domestic_customer_credit`
     `investigator_id`              varchar(200)   NOT NULL COMMENT '资信调查人ID',
     `investigator_name`            varchar(200)   NOT NULL COMMENT '资信调查人',
     `purchase_department`          varchar(200)   NOT NULL COMMENT '采购处',
+    `region`                       varchar(200)   NOT NULL COMMENT '区域',
     `review_valid_until`           date           NOT NULL COMMENT '评审有效期',
     `status`                       varchar(20)    DEFAULT NULL COMMENT '审核状态',
     `freeze`                       bool DEFAULT false COMMENT '是否冻结',
@@ -1576,6 +1577,7 @@ CREATE TABLE `procurement_foreign_trade_credit`
     `investigator_id`                  varchar(200) NOT NULL COMMENT '资信调查人ID',
     `investigator_name`                varchar(200) NOT NULL COMMENT '资信调查人',
     `purchase_department`              varchar(200) NOT NULL COMMENT '采购处',
+    `region`                           varchar(200) NOT NULL COMMENT '区域',
     `status`                           varchar(20)    DEFAULT NULL COMMENT '审核状态',
     `freeze`                           bool DEFAULT false COMMENT '是否冻结',
     `create_by_id`                     varchar(32)  DEFAULT NULL COMMENT '创建人ID',

@@ -165,6 +165,7 @@ public class ProcurementDomesticCustomerCreditController extends DefaultBaseCont
 
                     dataMap.put("reviewDate", dateFormatter.format(data.getCreateTime()));
                     dataMap.put("unitName", data.getUnitName() == null ? "" : data.getUnitName());
+                    dataMap.put("customerShortName", data.getCustomerShortName() == null ? "" : data.getCustomerShortName());
                     String companyNature = "①、进口贸易□    ②、国内贸易□\n" +
                             "③、终端产废□    ④、其他□";
                     if ("IMPORT_TRADE".equals(data.getCompanyNature())) {

@@ -266,6 +266,17 @@ public class ProcurementDomesticCustomerCredit extends BaseEntity implements Bas
     private String purchaseDepartmentCode;
 
     /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 区域名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String regionName;
+
+    /**
      * 评审有效期
      */
     private LocalDate reviewValidUntil;

@@ -225,6 +225,17 @@ public class ProcurementForeignTradeCredit extends BaseEntity implements BaseDto
     private String purchaseDepartmentCode;
 
     /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 区域名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String regionName;
+
+    /**
      * 审核状态
      */
     private String status;

@@ -227,6 +227,11 @@ public class CreateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
     @Length(max = 200, message = "采购处最多允许200个字符！")
     private String purchaseDepartment;
 
+    @ApiModelProperty(value = "区域", required = true)
+    @NotBlank(message = "区域不能为空！")
+    @Length(max = 200, message = "区域最多允许200个字符！")
+    private String region;
+
     @ApiModelProperty(value = "评审有效期", required = true)
     @NotNull(message = "评审有效期不能为空！")
     private LocalDate reviewValidUntil;

@@ -203,4 +203,9 @@ public class CreateProcurementForeignTradeCreditVo implements BaseVo, Serializab
     @NotBlank(message = "采购处不能为空！")
     @Length(max = 200, message = "采购处最多允许200个字符！")
     private String purchaseDepartment;
+
+    @ApiModelProperty(value = "区域", required = true)
+    @NotBlank(message = "区域不能为空！")
+    @Length(max = 200, message = "区域最多允许200个字符！")
+    private String region;
 }

@@ -33,6 +33,9 @@ public class QueryProcurementDomesticCustomerCreditVo extends PageVo implements
     @ApiModelProperty("采购处")
     private String purchaseDepartment;
 
+    @ApiModelProperty("区域")
+    private String region;
+
     @ApiModelProperty("审核状态")
     private String status;
 

@@ -30,6 +30,9 @@ public class QueryProcurementForeignTradeCreditVo extends PageVo implements Base
     @ApiModelProperty("采购处")
     private String purchaseDepartment;
 
+    @ApiModelProperty("区域")
+    private String region;
+
     @ApiModelProperty("下次评审时间开始")
     private LocalDate nextReviewTimeStart;
 

@@ -238,6 +238,11 @@ public class UpdateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
     @Length(max = 200, message = "采购处最多允许200个字符！")
     private String purchaseDepartment;
 
+    @ApiModelProperty(value = "区域", required = true)
+    @NotBlank(message = "区域不能为空！")
+    @Length(max = 200, message = "区域最多允许200个字符！")
+    private String region;
+
     @ApiModelProperty(value = "评审有效期", required = true)
     @NotNull(message = "评审有效期不能为空！")
     private LocalDate reviewValidUntil;

@@ -211,6 +211,11 @@ public class UpdateProcurementForeignTradeCreditVo implements BaseVo, Serializab
     @Length(max = 200, message = "采购处最多允许200个字符！")
     private String purchaseDepartment;
 
+    @ApiModelProperty(value = "区域", required = true)
+    @NotBlank(message = "区域不能为空！")
+    @Length(max = 200, message = "区域最多允许200个字符！")
+    private String region;
+
     /**
      * 操作类型：修改（UPDATE）、变更（CHANGE）
      */

@@ -53,6 +53,8 @@
         <result column="purchase_department" property="purchaseDepartment"/>
         <result column="purchase_department_name" property="purchaseDepartmentName"/>
         <result column="purchase_department_code" property="purchaseDepartmentCode"/>
+        <result column="region" property="region"/>
+        <result column="region_name" property="regionName"/>
         <result column="review_valid_until" property="reviewValidUntil"/>
         <result column="status" property="status"/>
         <result column="freeze" property="freeze"/>
@@ -115,6 +117,8 @@
             tb.purchase_department,
             sd.name AS purchase_department_name,
             sd.code AS purchase_department_code,
+            tb.region,
+            sd1.name AS region_name,
             tb.review_valid_until,
             tb.status,
             tb.freeze,
@@ -126,6 +130,7 @@
             tb.update_time
         FROM procurement_domestic_customer_credit tb
         left join sys_dept as sd on sd.id = tb.purchase_department
+        left join sys_dept as sd1 on sd1.id = tb.region
     </sql>
 
     <select id="query" resultMap="ProcurementDomesticCustomerCredit">
@@ -152,6 +157,9 @@
             <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''">
                 AND tb.purchase_department = #{vo.purchaseDepartment}
             </if>
+            <if test="vo.region != null and vo.region != ''">
+                AND tb.region = #{vo.region}
+            </if>
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>

@@ -45,6 +45,8 @@
         <result column="purchase_department" property="purchaseDepartment"/>
         <result column="purchase_department_name" property="purchaseDepartmentName"/>
         <result column="purchase_department_code" property="purchaseDepartmentCode"/>
+        <result column="region" property="region"/>
+        <result column="region_name" property="regionName"/>
         <result column="status" property="status"/>
         <result column="freeze" property="freeze"/>
         <result column="create_by_id" property="createById"/>
@@ -98,6 +100,8 @@
             tb.purchase_department,
             sd.name AS purchase_department_name,
             sd.code AS purchase_department_code,
+            tb.region,
+            sd1.name AS region_name,
             tb.status,
             tb.freeze,
             tb.create_by_id,
@@ -108,6 +112,7 @@
             tb.update_time
         FROM procurement_foreign_trade_credit tb
         LEFT JOIN sys_dept AS sd ON sd.id = tb.purchase_department
+        LEFT JOIN sys_dept as sd1 on sd1.id = tb.region
     </sql>
 
     <select id="query" resultMap="ProcurementForeignTradeCredit">
@@ -131,6 +136,9 @@
             <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''">
                 AND tb.purchase_department = #{vo.purchaseDepartment}
             </if>
+            <if test="vo.region != null and vo.region != ''">
+                AND tb.region = #{vo.region}
+            </if>
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>