采购外贸资信：区域字段先去除

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

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

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

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

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

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