楚江ERP：经销标准合同，增加状态字段

@@ -107,6 +107,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `special_terms`              VARCHAR(50) COMMENT '特别条款要求',
     `special_terms`              VARCHAR(50) COMMENT '特别条款要求',
     `designated_consignee`       TEXT COMMENT '需方指定收货人',
     `designated_consignee`       TEXT COMMENT '需方指定收货人',
     `remarks`                    TEXT COMMENT '备注',
     `remarks`                    TEXT COMMENT '备注',
+    `status`                     varchar(20)  not null DEFAULT 'DRAFT' COMMENT '状态',
     `create_by_id`               varchar(32)  not null comment '创建人ID',
     `create_by_id`               varchar(32)  not null comment '创建人ID',
     `create_by`                  varchar(20)  not null comment '创建人',
     `create_by`                  varchar(20)  not null comment '创建人',
     `update_by_id`               varchar(32)  not null comment '更新人ID',
     `update_by_id`               varchar(32)  not null comment '更新人ID',

@@ -153,6 +153,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String remarks;
     private String remarks;
 
 
     /**
     /**
+     * 状态（DRAFT:草稿;FORMAL:正式;DELETED:删除）
+     */
+    private String status;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -61,5 +61,8 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo
     @ApiModelProperty("订货日期筛选结束日期")
     @ApiModelProperty("订货日期筛选结束日期")
     @TypeMismatch(message = "订货日期格式有误！")
     @TypeMismatch(message = "订货日期格式有误！")
     private LocalDate orderDateEnd;
     private LocalDate orderDateEnd;
+
+    @ApiModelProperty("状态")
+    private String status;
 }
 }
 
 

@@ -28,6 +28,7 @@
         <result column="special_terms" property="specialTerms"/>
         <result column="special_terms" property="specialTerms"/>
         <result column="designated_consignee" property="designatedConsignee"/>
         <result column="designated_consignee" property="designatedConsignee"/>
         <result column="remarks" property="remarks"/>
         <result column="remarks" property="remarks"/>
+        <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -66,6 +67,7 @@
             tb.special_terms,
             tb.special_terms,
             tb.designated_consignee,
             tb.designated_consignee,
             tb.remarks,
             tb.remarks,
+            tb.status,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -105,6 +107,9 @@
             <if test="vo.orderDateEnd != null">
             <if test="vo.orderDateEnd != null">
                 AND tb.order_date &lt;= #{vo.orderDateEnd}
                 AND tb.order_date &lt;= #{vo.orderDateEnd}
             </if>
             </if>
+            <if test="vo.status != null">
+                AND tb.status = #{vo.status}
+            </if>
         </where>
         </where>
     </select>
     </select>
 </mapper>
 </mapper>