凌云集团更改公司

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -202,9 +202,9 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
      * @param userId
      * @return
      */
-    @Select("SELECT * FROM(SELECT DATE_FORMAT(a.report_date, '%Y-%m-%d') AS returnWork,a.report_date,CASE WHEN td.start_local in(2,3) THEN 5 ELSE td.start_local END AS startMsg,CASE WHEN td.end_local  in(2,3) " +
-            "THEN 5 ELSE td.end_local END AS endMsg FROM ms_report a LEFT JOIN ms_suspected b ON a.report_id = b.report_id LEFT JOIN ms_trip c ON b.suspected_id = c.trip_id LEFT JOIN ms_trip_det td ON td.trip_id " +
-            "= c.trip_id WHERE c.is_trip = 1 AND a.report_status = 1 AND a.user_create = #{userId}) aa WHERE aa.startMsg != aa.endMsg ORDER BY aa.report_date DESC LIMIT 1")
+    @Select("SELECT * FROM(SELECT DATE_FORMAT( a.report_date, '%Y-%m-%d' ) AS returnWork,a.report_date,CASE WHEN td.start_local in(2,3) and td.end_local in(2,3) THEN 5 ELSE td.start_local END AS startMsg," +
+            "td.start_local,td.end_local FROM ms_report a LEFT JOIN ms_suspected b ON a.report_id = b.report_id LEFT JOIN ms_trip c ON b.suspected_id = c.trip_id LEFT JOIN ms_trip_det td ON td.trip_id = " +
+            "c.trip_id WHERE c.is_trip = 1 AND a.report_status = 1 AND a.user_create = #{userId}) aa WHERE aa.startMsg !=5 ORDER BY aa.report_date DESC LIMIT 1")
     MsTripDet returnWork(@Param("userId") Long userId);
 
     /**