Merge branch 'master_chujiang_0819' into master_plan

@@ -22,7 +22,7 @@ public class SupplierQuotationProjectRealtimeListener {
     private SupplierQuotationProjectFinishedRealtimePushService finishedRealtimePushService;
 
     /**
-     * 报价项目或供应商报价变更后，广播当日完整看板数据
+     * 报价项目或供应商报价变更后，广播当月完整看板数据
      *
      * @param event 变更事件
      */
@@ -32,7 +32,7 @@ public class SupplierQuotationProjectRealtimeListener {
                 && !(event.getSource() instanceof SupplierQuotationProjectQuoteServiceImpl)) {
             return;
         }
-        realtimePushService.broadcastCurrentDayFullData(event.getEventType());
-        finishedRealtimePushService.broadcastCurrentDayFinishedData(event.getEventType());
+        realtimePushService.broadcastCurrentMonthFullData(event.getEventType());
+        finishedRealtimePushService.broadcastCurrentMonthFinishedData(event.getEventType());
     }
 }

@@ -65,12 +65,12 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
         return InvokeResultBuilder.success(data);
     }
 
-    @ApiOperation("当日已完成/已中止项目实时查询")
+    @ApiOperation("当月已完成/已中止项目实时查询")
     @HasPermission({"procure-manage:supplier-price:query"})
-    @GetMapping("/queryCurrentDayFinished")
-    public InvokeResult<List<SupplierQuotationProject>> queryCurrentDayFinished() {
+    @GetMapping("/queryCurrentMonthFinished")
+    public InvokeResult<List<SupplierQuotationProject>> queryCurrentMonthFinished() {
         return InvokeResultBuilder.success(
-                supplierQuotationProjectService.queryCurrentDayFinishedBoardList(LocalDate.now(), getCurrentUser().getId()));
+                supplierQuotationProjectService.queryCurrentMonthFinishedBoardList(LocalDate.now(), getCurrentUser().getId()));
     }
 
     @ApiOperation("修改")

@@ -91,8 +91,10 @@ public class SupplierQuotationProjectServiceImpl
     }
 
     @Override
-    public List<SupplierQuotationProject> queryCurrentDayBoardList(LocalDate day, String userId) {
-        List<SupplierQuotationProject> datas = getBaseMapper().queryCurrentDayList(day);
+    public List<SupplierQuotationProject> queryCurrentMonthBoardList(LocalDate month, String userId) {
+        LocalDate monthStart = month.withDayOfMonth(1);
+        LocalDate nextMonthStart = monthStart.plusMonths(1);
+        List<SupplierQuotationProject> datas = getBaseMapper().queryCurrentMonthList(monthStart, nextMonthStart);
         fillComputedStatus(datas);
         if (datas == null || datas.isEmpty()) {
             return datas;
@@ -105,8 +107,10 @@ public class SupplierQuotationProjectServiceImpl
     }
 
     @Override
-    public List<SupplierQuotationProject> queryCurrentDayFinishedBoardList(LocalDate day, String userId) {
-        List<SupplierQuotationProject> datas = getBaseMapper().queryCurrentDayFinishedList(day);
+    public List<SupplierQuotationProject> queryCurrentMonthFinishedBoardList(LocalDate month, String userId) {
+        LocalDate monthStart = month.withDayOfMonth(1);
+        LocalDate nextMonthStart = monthStart.plusMonths(1);
+        List<SupplierQuotationProject> datas = getBaseMapper().queryCurrentMonthFinishedList(monthStart, nextMonthStart);
         fillComputedStatus(datas);
         if (datas == null || datas.isEmpty()) {
             return datas;

@@ -15,8 +15,8 @@ public interface SupplierQuotationProjectMapper extends BaseMapper<SupplierQuota
 
     String getMaxCodeByDay(@Param("dayPrefix") String dayPrefix);
 
-    List<SupplierQuotationProject> queryCurrentDayList(@Param("day") LocalDate day);
+    List<SupplierQuotationProject> queryCurrentMonthList(@Param("monthStart") LocalDate monthStart, @Param("nextMonthStart") LocalDate nextMonthStart);
 
-    List<SupplierQuotationProject> queryCurrentDayFinishedList(@Param("day") LocalDate day);
+    List<SupplierQuotationProject> queryCurrentMonthFinishedList(@Param("monthStart") LocalDate monthStart, @Param("nextMonthStart") LocalDate nextMonthStart);
 }
 

@@ -23,9 +23,9 @@ public interface SupplierQuotationProjectService extends BaseMpService<SupplierQ
 
     void delete(String id);
 
-    List<SupplierQuotationProject> queryCurrentDayBoardList(LocalDate day, String userId);
+    List<SupplierQuotationProject> queryCurrentMonthBoardList(LocalDate month, String userId);
 
-    List<SupplierQuotationProject> queryCurrentDayFinishedBoardList(LocalDate day, String userId);
+    List<SupplierQuotationProject> queryCurrentMonthFinishedBoardList(LocalDate month, String userId);
 
     /**
      * 更新项目状态

@@ -36,27 +36,27 @@ public class SupplierQuotationProjectFinishedRealtimePushService {
         }
     }
 
-    public void broadcastCurrentDayFinishedData(String eventType) {
+    public void broadcastCurrentMonthFinishedData(String eventType) {
         if (sessionMap.isEmpty()) {
             return;
         }
 
         for (WebSocketSession session : sessionMap.values()) {
-            replayCurrentDayFinishedData(session, eventType);
+            replayCurrentMonthFinishedData(session, eventType);
         }
     }
 
-    public void replayCurrentDayFinishedData(WebSocketSession session, String eventType) {
+    public void replayCurrentMonthFinishedData(WebSocketSession session, String eventType) {
         if (session == null) {
             return;
         }
-        sendMessage(session, JsonUtil.toJsonString(buildCurrentDayMessage(session, eventType)));
+        sendMessage(session, JsonUtil.toJsonString(buildCurrentMonthMessage(session, eventType)));
     }
 
-    private SupplierQuotationProjectRealtimeMessage buildCurrentDayMessage(WebSocketSession session, String eventType) {
+    private SupplierQuotationProjectRealtimeMessage buildCurrentMonthMessage(WebSocketSession session, String eventType) {
         LocalDate today = LocalDate.now();
         String userId = getUserId(session);
-        List<SupplierQuotationProject> records = supplierQuotationProjectService.queryCurrentDayFinishedBoardList(today, userId);
+        List<SupplierQuotationProject> records = supplierQuotationProjectService.queryCurrentMonthFinishedBoardList(today, userId);
 
         SupplierQuotationProjectRealtimeMessage message = new SupplierQuotationProjectRealtimeMessage();
         message.setMessageType("FULL_SYNC_FINISHED");

@@ -19,14 +19,14 @@ public class SupplierQuotationProjectFinishedWebSocketHandler extends TextWebSoc
     @Override
     public void afterConnectionEstablished(WebSocketSession session) {
         realtimePushService.register(session);
-        realtimePushService.replayCurrentDayFinishedData(session, "INIT");
+        realtimePushService.replayCurrentMonthFinishedData(session, "INIT");
     }
 
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) {
         String payload = StringUtils.trimToEmpty(message.getPayload());
-        if ("SYNC_TODAY".equalsIgnoreCase(payload) || "RESYNC".equalsIgnoreCase(payload)) {
-            realtimePushService.replayCurrentDayFinishedData(session, "RESYNC");
+        if ("SYNC_TODAY".equalsIgnoreCase(payload) || "SYNC_MONTH".equalsIgnoreCase(payload) || "RESYNC".equalsIgnoreCase(payload)) {
+            realtimePushService.replayCurrentMonthFinishedData(session, "RESYNC");
         }
     }
 

@@ -53,44 +53,44 @@ public class SupplierQuotationProjectRealtimePushService {
     }
 
     /**
-     * 广播当日完整报价项目看板数据
+     * 广播当月完整报价项目看板数据
      *
      * @param eventType 事件类型
      */
-    public void broadcastCurrentDayFullData(String eventType) {
+    public void broadcastCurrentMonthFullData(String eventType) {
         if (sessionMap.isEmpty()) {
             return;
         }
 
         for (WebSocketSession session : sessionMap.values()) {
-            replayCurrentDayFullData(session, eventType);
+            replayCurrentMonthFullData(session, eventType);
         }
     }
 
     /**
-     * 向单个连接补推当日完整报价项目看板数据
+     * 向单个连接补推当月完整报价项目看板数据
      *
      * @param session   WebSocket 会话
      * @param eventType 事件类型
      */
-    public void replayCurrentDayFullData(WebSocketSession session, String eventType) {
+    public void replayCurrentMonthFullData(WebSocketSession session, String eventType) {
         if (session == null) {
             return;
         }
-        sendMessage(session, JsonUtil.toJsonString(buildCurrentDayMessage(session, eventType)));
+        sendMessage(session, JsonUtil.toJsonString(buildCurrentMonthMessage(session, eventType)));
     }
 
     /**
-     * 构建当日完整数据消息
+     * 构建当月完整数据消息
      *
      * @param session   WebSocket 会话
      * @param eventType 事件类型
      * @return 推送消息
      */
-    private SupplierQuotationProjectRealtimeMessage buildCurrentDayMessage(WebSocketSession session, String eventType) {
+    private SupplierQuotationProjectRealtimeMessage buildCurrentMonthMessage(WebSocketSession session, String eventType) {
         LocalDate today = LocalDate.now();
         String userId = getUserId(session);
-        List<SupplierQuotationProject> records = supplierQuotationProjectService.queryCurrentDayBoardList(today, userId);
+        List<SupplierQuotationProject> records = supplierQuotationProjectService.queryCurrentMonthBoardList(today, userId);
 
         SupplierQuotationProjectRealtimeMessage message = new SupplierQuotationProjectRealtimeMessage();
         message.setMessageType("FULL_SYNC");

@@ -22,14 +22,14 @@ public class SupplierQuotationProjectWebSocketHandler extends TextWebSocketHandl
     @Override
     public void afterConnectionEstablished(WebSocketSession session) {
         realtimePushService.register(session);
-        realtimePushService.replayCurrentDayFullData(session, "INIT");
+        realtimePushService.replayCurrentMonthFullData(session, "INIT");
     }
 
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) {
         String payload = StringUtils.trimToEmpty(message.getPayload());
-        if ("SYNC_TODAY".equalsIgnoreCase(payload) || "RESYNC".equalsIgnoreCase(payload)) {
-            realtimePushService.replayCurrentDayFullData(session, "RESYNC");
+        if ("SYNC_TODAY".equalsIgnoreCase(payload) || "SYNC_MONTH".equalsIgnoreCase(payload) || "RESYNC".equalsIgnoreCase(payload)) {
+            realtimePushService.replayCurrentMonthFullData(session, "RESYNC");
         }
     }
 

@@ -90,16 +90,18 @@
         LIMIT 1
     </select>
 
-    <select id="queryCurrentDayList" resultMap="SupplierQuotationProject">
+    <select id="queryCurrentMonthList" resultMap="SupplierQuotationProject">
         <include refid="SupplierQuotationProjectSql"/>
-        WHERE DATE(tb.create_time) = #{day}
+        WHERE tb.create_time <![CDATA[ >= ]]> CONCAT(#{monthStart}, ' 00:00:00')
+        AND tb.create_time <![CDATA[ < ]]> CONCAT(#{nextMonthStart}, ' 00:00:00')
         AND tb.status='PUBLISHED'
         ORDER BY tb.create_time DESC, tb.id DESC
     </select>
 
-    <select id="queryCurrentDayFinishedList" resultMap="SupplierQuotationProject">
+    <select id="queryCurrentMonthFinishedList" resultMap="SupplierQuotationProject">
         <include refid="SupplierQuotationProjectSql"/>
-        WHERE DATE(tb.create_time) = #{day}
+        WHERE tb.create_time <![CDATA[ >= ]]> CONCAT(#{monthStart}, ' 00:00:00')
+        AND tb.create_time <![CDATA[ < ]]> CONCAT(#{nextMonthStart}, ' 00:00:00')
         AND tb.status IN ('COMPLETED', 'ABORTED')
         ORDER BY tb.update_time DESC, tb.id DESC
     </select>