Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderInfo.java

@@ -218,4 +218,34 @@ public class OrderInfo implements Serializable {
     @Column(name = "appoint_engineer_codes")
     private String appointEngineerCodes;
 
+    /**
+     * 辅助工程师到达里程(米)
+     */
+    @Column(name = "sub_distance")
+    private Integer subDistance;
+
+    /**
+     * 辅助工程师到达耗时
+     */
+    @Column(name = "sub_elapsed")
+    private Integer subElapsed;
+
+    /**
+     * 辅助工程师计划开始时间
+     */
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "sub_plan_start_time")
+    private LocalDateTime subPlanStartTime;
+
+    /**
+     * 辅助工程师计划结束时间
+     */
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "sub_plan_end_time")
+    private LocalDateTime subPlanEndTime;
+
 }

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

@@ -21,6 +21,7 @@ public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
             " 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)" +
+            " and IF(:#{#req.isRead} is not null, r.is_read = :#{#req.isRead}, 1=1)" +
             " and IF(:#{#req.clusterId} is not null, tt.cluster_id=:#{#req.clusterId}, 1=1)" +
             " and IF(:#{#req.branchId} is not null, tt.branch_id=:#{#req.branchId}, 1=1)" +
             " and IF(:#{#req.groupId} is not null, tt.group_id=:#{#req.groupId}, 1=1)" +
@@ -32,6 +33,7 @@ public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
                     " 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.isRead} is not null, r.is_read = :#{#req.isRead}, 1=1)" +
                     " and IF(:#{#req.keyWord} is not null, tt.content like concat('%',:#{#req.keyWord},'%'), 1=1)" +
                     " and IF(:#{#req.clusterId} is not null, tt.cluster_id=:#{#req.clusterId}, 1=1)" +
                     " and IF(:#{#req.branchId} is not null, tt.branch_id=:#{#req.branchId}, 1=1)" +
@@ -52,6 +54,7 @@ public interface MsgDao extends JpaRepository<MsgEntity, Integer> {
             " and 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)" +
+            " and IF(:#{#req.isRead} is not null, r.is_read = :#{#req.isRead}, 1=1)" +
             ") t"
             , nativeQuery = true
     )

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

@@ -69,4 +69,10 @@ public class MsgQuery {
      * 小组ID
      */
     private String groupId;
+
+
+    /**
+     * 是否已读，0：未读，1：已读
+     */
+    private Integer isRead;
 }
\ No newline at end of file