采购：业务员报价看板-成交/中止；成交数据

@@ -7,6 +7,8 @@ import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
+import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
+import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationLineService;
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationService;
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationService;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
@@ -25,6 +27,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import java.time.LocalDate;
+import java.util.List;
+
 /**
 /**
  * 业务员报价 Controller
  * 业务员报价 Controller
  */
  */
@@ -39,6 +44,8 @@ public class SalesmanQuotationController extends DefaultBaseController {
      */
      */
     @Resource
     @Resource
     private SalesmanQuotationService salesmanQuotationService;
     private SalesmanQuotationService salesmanQuotationService;
+    @Resource
+    private SalesmanQuotationLineService salesmanQuotationLineService;
 
 
     @ApiOperation("生成编号")
     @ApiOperation("生成编号")
     @GetMapping("/generateCode")
     @GetMapping("/generateCode")
@@ -117,4 +124,26 @@ public class SalesmanQuotationController extends DefaultBaseController {
         salesmanQuotationService.cancel(id);
         salesmanQuotationService.cancel(id);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 成交/终止
+     */
+    @ApiOperation("成交/终止")
+    @PostMapping("/updateStatus")
+    public InvokeResult<Void> updateStatus(@NotBlank(message = "id不能为空！") String id,
+                                           @NotBlank(message = "状态不能为空！") String status) {
+        salesmanQuotationService.updateStatus(id, status);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 已成交报价明细
+     */
+    @ApiOperation("已成交报价明细")
+    @GetMapping("/concluded")
+    public InvokeResult<List<SalesmanQuotationLine>> concluded() {
+        LocalDate today = LocalDate.now();
+        List<SalesmanQuotationLine> salesmanQuotationLineList = salesmanQuotationLineService.queryCurrentDayList(today, "DEAL_CLOSED");
+        return InvokeResultBuilder.success(salesmanQuotationLineList);
+    }
 }
 }

@@ -48,8 +48,8 @@ public class SalesmanQuotationLineServiceImpl
      * @return 业务员报价明细列表
      * @return 业务员报价明细列表
      */
      */
     @Override
     @Override
-    public List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day) {
-        return getBaseMapper().queryCurrentDayList(day);
+    public List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day, String status) {
+        return getBaseMapper().queryCurrentDayList(day, status);
     }
     }
 
 
     /**
     /**

@@ -317,6 +317,25 @@ public class SalesmanQuotationServiceImpl
         }
         }
     }
     }
 
 
+    /**
+     * 成交/中止
+     *
+     * @param id     主键ID
+     * @param status 状态
+     */
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            throw new DefaultClientException("业务员报价ID、状态不能为空！");
+        }
+        Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class)
+                .set(SalesmanQuotation::getStatus, status)
+                .eq(SalesmanQuotation::getId, id);
+        getBaseMapper().update(wrapper);
+
+        publishChangedEvent(id, "UPDATE");
+    }
+
 
 
     /**
     /**
      * 构建新增实体
      * 构建新增实体

@@ -26,5 +26,5 @@ public interface SalesmanQuotationLineMapper extends BaseMapper<SalesmanQuotatio
      * @param day 日期
      * @param day 日期
      * @return 业务员报价明细表列表
      * @return 业务员报价明细表列表
      */
      */
-    List<SalesmanQuotationLine> queryCurrentDayList(@Param("day") LocalDate day);
+    List<SalesmanQuotationLine> queryCurrentDayList(@Param("day") LocalDate day, @Param("status") String status);
 }
 }

@@ -27,7 +27,7 @@ public interface SalesmanQuotationLineService extends BaseMpService<SalesmanQuot
      * @param day 日期
      * @param day 日期
      * @return 业务员报价明细列表
      * @return 业务员报价明细列表
      */
      */
-    List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day);
+    List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day, String status);
 
 
     /**
     /**
      * 根据ID查询
      * 根据ID查询

@@ -68,6 +68,14 @@ public interface SalesmanQuotationService extends BaseMpService<SalesmanQuotatio
     void updateApprovalStatus(String id, String approvalStatus);
     void updateApprovalStatus(String id, String approvalStatus);
 
 
     /**
     /**
+     * 更新状态
+     *
+     * @param id     主键ID
+     * @param status 状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
      * 生成编号
      * 生成编号
      *
      *
      * @return 编号
      * @return 编号

@@ -89,7 +89,7 @@ public class SalesmanQuotationLineRealtimePushService {
      */
      */
     private QuotationLineRealtimeMessage buildCurrentDayMessage(String eventType) {
     private QuotationLineRealtimeMessage buildCurrentDayMessage(String eventType) {
         LocalDate today = LocalDate.now();
         LocalDate today = LocalDate.now();
-        List<SalesmanQuotationLine> records = salesmanQuotationLineService.queryCurrentDayList(today);
+        List<SalesmanQuotationLine> records = salesmanQuotationLineService.queryCurrentDayList(today,"QUOTED");
 
 
         QuotationLineRealtimeMessage message = new QuotationLineRealtimeMessage();
         QuotationLineRealtimeMessage message = new QuotationLineRealtimeMessage();
         message.setMessageType("FULL_SYNC");
         message.setMessageType("FULL_SYNC");

@@ -86,7 +86,12 @@
 
 
     <select id="queryCurrentDayList" resultMap="SalesmanQuotationLine">
     <select id="queryCurrentDayList" resultMap="SalesmanQuotationLine">
         <include refid="SalesmanQuotationLineSql1"/>
         <include refid="SalesmanQuotationLineSql1"/>
-        WHERE DATE(sq.create_time) = #{day} and sq.status='QUOTED'
+        <where>
+            DATE(sq.create_time) = #{day}
+            <if test="status != null and status != ''">
+                AND sq.status = #{status}
+            </if>
+        </where>
         ORDER BY tb.create_time DESC, tb.quotation_id DESC
         ORDER BY tb.create_time DESC, tb.quotation_id DESC
     </select>
     </select>
 </mapper>
 </mapper>