采购:业务员报价看板-报价明细数据

@@ -139,13 +139,14 @@ public class SalesmanQuotationController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
-     * 已成交报价明细
+     * 报价明细
      */
      */
-    @ApiOperation("已成交报价明细")
+    @ApiOperation("报价明细")
     @GetMapping("/concluded")
     @GetMapping("/concluded")
-    public InvokeResult<List<SalesmanQuotationLine>> concluded() {
+    public InvokeResult<List<SalesmanQuotationLine>> concluded(@Valid QuerySalesmanQuotationVo vo) {
         LocalDate today = LocalDate.now();
         LocalDate today = LocalDate.now();
-        List<SalesmanQuotationLine> salesmanQuotationLineList = salesmanQuotationLineService.queryCurrentDayList(today, "DEAL_CLOSED");
+        vo.setToday(today);
+        List<SalesmanQuotationLine> salesmanQuotationLineList = salesmanQuotationLineService.queryCurrentDayList(vo);
         return InvokeResultBuilder.success(salesmanQuotationLineList);
         return InvokeResultBuilder.success(salesmanQuotationLineList);
     }
     }
 
 

@@ -16,6 +16,7 @@ import com.lframework.xingyun.sc.procurement.mappers.quotation.SalesmanQuotation
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationLineService;
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationLineService;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
+import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDate;
@@ -46,12 +47,11 @@ public class SalesmanQuotationLineServiceImpl
     /**
     /**
      * 查询指定日期创建的业务员报价明细
      * 查询指定日期创建的业务员报价明细
      *
      *
-     * @param day 日期
      * @return 业务员报价明细列表
      * @return 业务员报价明细列表
      */
      */
     @Override
     @Override
-    public List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day, String status) {
-        return getBaseMapper().queryCurrentDayList(day, status);
+    public List<SalesmanQuotationLine> queryCurrentDayList(QuerySalesmanQuotationVo vo) {
+        return getBaseMapper().queryCurrentDayList(vo);
     }
     }
 
 
     /**
     /**

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
+import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
@@ -25,10 +26,9 @@ public interface SalesmanQuotationLineMapper extends BaseMapper<SalesmanQuotatio
     /**
     /**
      * 查询指定日期创建的业务员报价明细
      * 查询指定日期创建的业务员报价明细
      *
      *
-     * @param day 日期
      * @return 业务员报价明细表列表
      * @return 业务员报价明细表列表
      */
      */
-    List<SalesmanQuotationLine> queryCurrentDayList(@Param("day") LocalDate day, @Param("status") String status);
+    List<SalesmanQuotationLine> queryCurrentDayList(@Param("qvo") QuerySalesmanQuotationVo qvo);
 
 
     /**
     /**
      * 查询当日业务报价成交区域汇总
      * 查询当日业务报价成交区域汇总

@@ -6,6 +6,7 @@ import com.lframework.xingyun.sc.procurement.dto.quotation.SalesmanQuotationDeal
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationLineVo;
+import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.UpdateSalesmanQuotationLineVo;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
@@ -26,10 +27,9 @@ public interface SalesmanQuotationLineService extends BaseMpService<SalesmanQuot
     /**
     /**
      * 查询指定日期创建的业务员报价明细
      * 查询指定日期创建的业务员报价明细
      *
      *
-     * @param day 日期
      * @return 业务员报价明细列表
      * @return 业务员报价明细列表
      */
      */
-    List<SalesmanQuotationLine> queryCurrentDayList(LocalDate day, String status);
+    List<SalesmanQuotationLine> queryCurrentDayList(QuerySalesmanQuotationVo vo);
 
 
     /**
     /**
      * 查询当日业务报价成交区域汇总
      * 查询当日业务报价成交区域汇总

@@ -5,6 +5,8 @@ import com.lframework.starter.web.core.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -55,13 +57,13 @@ public class QuerySalesmanQuotationVo extends PageVo implements BaseVo, Serializ
      * 报价时间开始
      * 报价时间开始
      */
      */
     @ApiModelProperty("报价时间开始")
     @ApiModelProperty("报价时间开始")
-    private LocalDate quoteDateStart;
+    private LocalDateTime quoteDateStart;
 
 
     /**
     /**
      * 报价时间结束
      * 报价时间结束
      */
      */
     @ApiModelProperty("报价时间结束")
     @ApiModelProperty("报价时间结束")
-    private LocalDate quoteDateEnd;
+    private LocalDateTime quoteDateEnd;
 
 
     /**
     /**
      * 审核状态
      * 审核状态
@@ -75,4 +77,16 @@ public class QuerySalesmanQuotationVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
     private String status;
     private String status;
 
 
+    /**
+     * 业务员/供应商/品种
+     */
+    @ApiModelProperty("搜索关键词")
+    private String searchKey;
+
+    /**
+     * 当日
+     */
+    @ApiModelProperty("当日")
+    private LocalDate today;
+
 }
 }

@@ -4,6 +4,7 @@ import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.procurement.dto.quotation.QuotationLineRealtimeMessage;
 import com.lframework.xingyun.sc.procurement.dto.quotation.QuotationLineRealtimeMessage;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 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.SalesmanQuotationLineService;
+import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.TextMessage;
@@ -89,7 +90,10 @@ 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,"QUOTED");
+        QuerySalesmanQuotationVo vo = new QuerySalesmanQuotationVo();
+        vo.setStatus("QUOTED");
+        vo.setToday(today);
+        List<SalesmanQuotationLine> records = salesmanQuotationLineService.queryCurrentDayList(vo);
 
 
         QuotationLineRealtimeMessage message = new QuotationLineRealtimeMessage();
         QuotationLineRealtimeMessage message = new QuotationLineRealtimeMessage();
         message.setMessageType("FULL_SYNC");
         message.setMessageType("FULL_SYNC");

@@ -87,9 +87,21 @@
     <select id="queryCurrentDayList" resultMap="SalesmanQuotationLine">
     <select id="queryCurrentDayList" resultMap="SalesmanQuotationLine">
         <include refid="SalesmanQuotationLineSql1"/>
         <include refid="SalesmanQuotationLineSql1"/>
         <where>
         <where>
-            DATE(sq.create_time) = #{day}
-            <if test="status != null and status != ''">
-                AND sq.status = #{status}
+
+            <if test="qvo.status != null and qvo.status != ''">
+                AND sq.status = #{qvo.status}
+            </if>
+            <if test="qvo.searchKey != null and qvo.searchKey != ''">
+                AND (sq.quoter_name LIKE CONCAT('%', #{qvo.searchKey}, '%') OR pdc.unit_name LIKE CONCAT('%',
+                #{qvo.searchKey}, '%') OR br.product_name LIKE CONCAT('%',#{qvo.searchKey}, '%'))
+            </if>
+            <if test="qvo.quoteDateStart != null">
+                AND sq.quote_time >= #{qvo.quoteDateStart}
+            </if>
+            <if test="qvo.quoteDateEnd != null">
+                <![CDATA[
+                    AND sq.quote_time <= #{qvo.quoteDateEnd}
+                ]]>
             </if>
             </if>
         </where>
         </where>
         ORDER BY tb.create_time DESC, tb.quotation_id DESC
         ORDER BY tb.create_time DESC, tb.quotation_id DESC