Showing
6 changed files
with
15 additions
and
4 deletions
| ... | ... | @@ -1726,6 +1726,7 @@ CREATE TABLE `procurement_salesman_quotation` |
| 1726 | 1726 | `material_condition_phosphor_copper` varchar(500) DEFAULT NULL COMMENT '磷铜', |
| 1727 | 1727 | `approval_status` varchar(50) DEFAULT NULL COMMENT '审核状态', |
| 1728 | 1728 | `status` varchar(50) DEFAULT NULL COMMENT '状态', |
| 1729 | + `reason` varchar(500) DEFAULT NULL COMMENT '终止原因', | |
| 1729 | 1730 | `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID', |
| 1730 | 1731 | `create_by` varchar(64) DEFAULT NULL COMMENT '创建人', |
| 1731 | 1732 | `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID', | ... | ... |
| ... | ... | @@ -133,8 +133,9 @@ public class SalesmanQuotationController extends DefaultBaseController { |
| 133 | 133 | @ApiOperation("成交/终止") |
| 134 | 134 | @PostMapping("/updateStatus") |
| 135 | 135 | public InvokeResult<Void> updateStatus(@NotBlank(message = "id不能为空!") String id, |
| 136 | - @NotBlank(message = "状态不能为空!") String status) { | |
| 137 | - salesmanQuotationService.updateStatus(id, status); | |
| 136 | + @NotBlank(message = "状态不能为空!") String status, | |
| 137 | + String reason) { | |
| 138 | + salesmanQuotationService.updateStatus(id, status, reason); | |
| 138 | 139 | return InvokeResultBuilder.success(); |
| 139 | 140 | } |
| 140 | 141 | ... | ... |
| ... | ... | @@ -324,12 +324,13 @@ public class SalesmanQuotationServiceImpl |
| 324 | 324 | * @param status 状态 |
| 325 | 325 | */ |
| 326 | 326 | @Override |
| 327 | - public void updateStatus(String id, String status) { | |
| 327 | + public void updateStatus(String id, String status, String reason) { | |
| 328 | 328 | if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) { |
| 329 | 329 | throw new DefaultClientException("业务员报价ID、状态不能为空!"); |
| 330 | 330 | } |
| 331 | 331 | Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class) |
| 332 | 332 | .set(SalesmanQuotation::getStatus, status) |
| 333 | + .set(SalesmanQuotation::getReason, reason) | |
| 333 | 334 | .eq(SalesmanQuotation::getId, id); |
| 334 | 335 | getBaseMapper().update(wrapper); |
| 335 | 336 | ... | ... |
| ... | ... | @@ -72,8 +72,9 @@ public interface SalesmanQuotationService extends BaseMpService<SalesmanQuotatio |
| 72 | 72 | * |
| 73 | 73 | * @param id 主键ID |
| 74 | 74 | * @param status 状态 |
| 75 | + * @param reason 终止原因 | |
| 75 | 76 | */ |
| 76 | - void updateStatus(String id, String status); | |
| 77 | + void updateStatus(String id, String status, String reason); | |
| 77 | 78 | |
| 78 | 79 | /** |
| 79 | 80 | * 生成编号 | ... | ... |
| ... | ... | @@ -47,6 +47,7 @@ |
| 47 | 47 | <result column="approval_status" property="approvalStatus"/> |
| 48 | 48 | <result column="status" property="status"/> |
| 49 | 49 | <result column="remark" property="remark"/> |
| 50 | + <result column="reason" property="reason"/> | |
| 50 | 51 | <result column="create_by_id" property="createById"/> |
| 51 | 52 | <result column="create_by" property="createBy"/> |
| 52 | 53 | <result column="update_by_id" property="updateById"/> |
| ... | ... | @@ -101,6 +102,7 @@ |
| 101 | 102 | tb.remark, |
| 102 | 103 | tb.approval_status, |
| 103 | 104 | tb.status, |
| 105 | + tb.reason, | |
| 104 | 106 | tb.create_by_id, |
| 105 | 107 | tb.create_by, |
| 106 | 108 | tb.update_by_id, | ... | ... |