Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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

@@ -40,10 +40,12 @@ public class MsgController {
                                                  MsgQuery request) {
         CommonUtil.setNullValue(request);
         request.setUserId(userId);
-        if (!"isRead".equalsIgnoreCase(request.getSort())) {
-            request.setSort("create_time");
-        } else {
+        if ("isRead".equalsIgnoreCase(request.getSort())) {
             request.setSort("is_read");
+        } if ("type".equalsIgnoreCase(request.getSort())) {
+            request.setSort("type");
+        } else {
+            request.setSort("create_time");
         }
         if (!"asc".equalsIgnoreCase(request.getSortType())) {
             request.setSortType("desc");

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

@@ -16,7 +16,7 @@ import java.util.Objects;
 public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
     @Query(value = "select t.cluster_id,t.branch_id,t.group_id" +
             " from (" +
-            " select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read" +
+            " select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read,min(tt.type) type" +
             " 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)" +
@@ -28,7 +28,7 @@ public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
             ") 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" +
+                    " select tt.cluster_id,tt.branch_id,tt.group_id,min(tt.create_time) create_time,min(r.is_read) is_read,min(tt.type) type" +
                     " 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)" +

project-order/src/main/java/com/dituhui/pea/order/dto/MsgQuery.java

@@ -29,7 +29,7 @@ public class MsgQuery {
     private String userId;
 
     /**
-     * 排序字段：create_time、is_read
+     * 排序字段：createTime、isRead、type
      */
     private String sort;