业务员报价：新增 终止原因

@@ -1726,6 +1726,7 @@ CREATE TABLE `procurement_salesman_quotation`
     `material_condition_phosphor_copper` varchar(500)     DEFAULT NULL COMMENT '磷铜',
     `material_condition_phosphor_copper` varchar(500)     DEFAULT NULL COMMENT '磷铜',
     `approval_status` varchar(50)                         DEFAULT NULL COMMENT '审核状态',
     `approval_status` varchar(50)                         DEFAULT NULL COMMENT '审核状态',
     `status` varchar(50)                                  DEFAULT NULL COMMENT '状态',
     `status` varchar(50)                                  DEFAULT NULL COMMENT '状态',
+    `reason` varchar(500)                                 DEFAULT NULL COMMENT '终止原因',
     `create_by_id`               varchar(32)              DEFAULT NULL COMMENT '创建人ID',
     `create_by_id`               varchar(32)              DEFAULT NULL COMMENT '创建人ID',
     `create_by`                  varchar(64)              DEFAULT NULL COMMENT '创建人',
     `create_by`                  varchar(64)              DEFAULT NULL COMMENT '创建人',
     `update_by_id`               varchar(32)              DEFAULT NULL COMMENT '更新人ID',
     `update_by_id`               varchar(32)              DEFAULT NULL COMMENT '更新人ID',

@@ -133,8 +133,9 @@ public class SalesmanQuotationController extends DefaultBaseController {
     @ApiOperation("成交/终止")
     @ApiOperation("成交/终止")
     @PostMapping("/updateStatus")
     @PostMapping("/updateStatus")
     public InvokeResult<Void> updateStatus(@NotBlank(message = "id不能为空！") String id,
     public InvokeResult<Void> updateStatus(@NotBlank(message = "id不能为空！") String id,
-                                           @NotBlank(message = "状态不能为空！") String status) {
-        salesmanQuotationService.updateStatus(id, status);
+                                           @NotBlank(message = "状态不能为空！") String status,
+                                           String reason) {
+        salesmanQuotationService.updateStatus(id, status, reason);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
 
 

@@ -247,6 +247,11 @@ public class SalesmanQuotation extends BaseEntity implements BaseDto {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 终止原因
+     */
+    private String reason;
+
+    /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -324,12 +324,13 @@ public class SalesmanQuotationServiceImpl
      * @param status 状态
      * @param status 状态
      */
      */
     @Override
     @Override
-    public void updateStatus(String id, String status) {
+    public void updateStatus(String id, String status, String reason) {
         if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
         if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
             throw new DefaultClientException("业务员报价ID、状态不能为空！");
             throw new DefaultClientException("业务员报价ID、状态不能为空！");
         }
         }
         Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class)
         Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class)
                 .set(SalesmanQuotation::getStatus, status)
                 .set(SalesmanQuotation::getStatus, status)
+                .set(SalesmanQuotation::getReason, reason)
                 .eq(SalesmanQuotation::getId, id);
                 .eq(SalesmanQuotation::getId, id);
         getBaseMapper().update(wrapper);
         getBaseMapper().update(wrapper);
 
 

@@ -72,8 +72,9 @@ public interface SalesmanQuotationService extends BaseMpService<SalesmanQuotatio
      *
      *
      * @param id     主键ID
      * @param id     主键ID
      * @param status 状态
      * @param status 状态
+     * @param reason 终止原因
      */
      */
-    void updateStatus(String id, String status);
+    void updateStatus(String id, String status, String reason);
 
 
     /**
     /**
      * 生成编号
      * 生成编号

@@ -47,6 +47,7 @@
         <result column="approval_status" property="approvalStatus"/>
         <result column="approval_status" property="approvalStatus"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="remark" property="remark"/>
         <result column="remark" property="remark"/>
+        <result column="reason" property="reason"/>
         <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"/>
@@ -101,6 +102,7 @@
             tb.remark,
             tb.remark,
             tb.approval_status,
             tb.approval_status,
             tb.status,
             tb.status,
+            tb.reason,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,