Showing
4 changed files
with
14 additions
and
0 deletions
| ... | ... | @@ -107,6 +107,7 @@ create table if not exists `tbl_contract_distributor_standard` | 
| 107 | 107 | `special_terms` VARCHAR(50) COMMENT '特别条款要求', | 
| 108 | 108 | `designated_consignee` TEXT COMMENT '需方指定收货人', | 
| 109 | 109 | `remarks` TEXT COMMENT '备注', | 
| 110 | + `status` varchar(20) not null DEFAULT 'DRAFT' COMMENT '状态', | |
| 110 | 111 | `create_by_id` varchar(32) not null comment '创建人ID', | 
| 111 | 112 | `create_by` varchar(20) not null comment '创建人', | 
| 112 | 113 | `update_by_id` varchar(32) not null comment '更新人ID', | ... | ... | 
| ... | ... | @@ -153,6 +153,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto { | 
| 153 | 153 | private String remarks; | 
| 154 | 154 | |
| 155 | 155 | /** | 
| 156 | + * 状态(DRAFT:草稿;FORMAL:正式;DELETED:删除) | |
| 157 | + */ | |
| 158 | + private String status; | |
| 159 | + | |
| 160 | + /** | |
| 156 | 161 | * 创建人ID | 
| 157 | 162 | */ | 
| 158 | 163 | @TableField(fill = FieldFill.INSERT) | ... | ... | 
| ... | ... | @@ -61,5 +61,8 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo | 
| 61 | 61 | @ApiModelProperty("订货日期筛选结束日期") | 
| 62 | 62 | @TypeMismatch(message = "订货日期格式有误!") | 
| 63 | 63 | private LocalDate orderDateEnd; | 
| 64 | + | |
| 65 | + @ApiModelProperty("状态") | |
| 66 | + private String status; | |
| 64 | 67 | } | 
| 65 | 68 | ... | ... | 
| ... | ... | @@ -28,6 +28,7 @@ | 
| 28 | 28 | <result column="special_terms" property="specialTerms"/> | 
| 29 | 29 | <result column="designated_consignee" property="designatedConsignee"/> | 
| 30 | 30 | <result column="remarks" property="remarks"/> | 
| 31 | + <result column="status" property="status"/> | |
| 31 | 32 | <result column="create_by_id" property="createById"/> | 
| 32 | 33 | <result column="create_by" property="createBy"/> | 
| 33 | 34 | <result column="update_by_id" property="updateById"/> | 
| ... | ... | @@ -66,6 +67,7 @@ | 
| 66 | 67 | tb.special_terms, | 
| 67 | 68 | tb.designated_consignee, | 
| 68 | 69 | tb.remarks, | 
| 70 | + tb.status, | |
| 69 | 71 | tb.create_by_id, | 
| 70 | 72 | tb.create_by, | 
| 71 | 73 | tb.update_by_id, | 
| ... | ... | @@ -105,6 +107,9 @@ | 
| 105 | 107 | <if test="vo.orderDateEnd != null"> | 
| 106 | 108 | AND tb.order_date <= #{vo.orderDateEnd} | 
| 107 | 109 | </if> | 
| 110 | + <if test="vo.status != null"> | |
| 111 | + AND tb.status = #{vo.status} | |
| 112 | + </if> | |
| 108 | 113 | </where> | 
| 109 | 114 | </select> | 
| 110 | 115 | </mapper> | ... | ... |