Merge remote-tracking branch 'origin/develop' into develop

.gitignore

@@ -8,6 +8,7 @@
 /*/.classpath
 /*/.classpath
 /*/.project
 /*/.project
 /*/logs/
 /*/logs/
+/logs/
 /*/.gitignore
 /*/.gitignore
 dispatchSolution-*.json
 dispatchSolution-*.json
 /project-order/src/main/resources/application-dev.yaml
 /project-order/src/main/resources/application-dev.yaml

project-order/src/main/java/com/dituhui/pea/order/controller/MsgController.java

@@ -17,7 +17,7 @@ import javax.validation.Valid;
 import java.util.Objects;
 import java.util.Objects;
 
 
 /**
 /**
- * 消息相关接口
+ * 消息
  *
  *
  * @author RenPing
  * @author RenPing
  * @date 2023/10/24
  * @date 2023/10/24

project-order/src/main/java/com/dituhui/pea/order/dao/MsgDao.java

@@ -24,8 +24,16 @@ public interface MsgDao extends JpaRepository<MsgEntity, Long> {
             " and IF(:#{#req.endDate} is not null, tt.create_time<:#{#req.endDate}, 1=1)" +
             " and IF(:#{#req.endDate} is not null, tt.create_time<:#{#req.endDate}, 1=1)" +
             " and IF(:#{#req.keyWord} is not null, tt.content like concat('%',:#{#req.keyWord},'%'), 1=1)" +
             " and IF(:#{#req.keyWord} is not null, tt.content like concat('%',:#{#req.keyWord},'%'), 1=1)" +
             "group by tt.cluster_id,tt.branch_id,tt.group_id" +
             "group by tt.cluster_id,tt.branch_id,tt.group_id" +
+            ") t",
+            countQuery = "select count(t.cluster_id)" +
+                    " from (" +
+                    " select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read" +
+                    " from zzz_msg tt join zzz_msg_receiver r on r.msg_id=tt.id and r.user_id=:#{#req.userId}" +
+                    " where IF(:#{#req.startDate} is not null, tt.create_time>=:#{#req.startDate}, 1=1)" +
+                    " and IF(:#{#req.endDate} is not null, tt.create_time<:#{#req.endDate}, 1=1)" +
+                    " and IF(:#{#req.keyWord} is not null, tt.content like concat('%',:#{#req.keyWord},'%'), 1=1)" +
+                    "group by tt.cluster_id,tt.branch_id,tt.group_id" +
                     ") t"
                     ") t"
-            //, countProjection = "t.id" //用于分页计数
             , nativeQuery = true // 开启原生sql
             , nativeQuery = true // 开启原生sql
     )
     )
     Page<Map<String, Objects>> getGroupList(@Param("req") MsgDTO.Request req, Pageable pageable);
     Page<Map<String, Objects>> getGroupList(@Param("req") MsgDTO.Request req, Pageable pageable);

project-order/src/main/java/com/dituhui/pea/order/feign/bean/BeanR.java

@@ -18,11 +18,11 @@ public class BeanR<E> {
     /**
     /**
      * 状态码
      * 状态码
      */
      */
-    private Integer errorCode;
+    private String status;
     /**
     /**
      * 成功&失败
      * 成功&失败
      */
      */
-    private Boolean succ;
+    private Boolean success;
     /**
     /**
      * 数据对象
      * 数据对象
      */
      */