凌云集团更改公司

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 DATE_FORMAT( a.report_date, '%Y-%m-%d' ) as returnWork ,CASE WHEN td.start_local = 4 THEN td.start_local_other ELSE td.start_local END as startMsg,CASE WHEN td.end_local = 4 " +
-            "THEN td.end_local_other 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.work_local = c.today_local OR c.work_local_other = c.today_local_other ) AND c.is_trip = 1 AND a.report_status = 1 AND a.user_create = #{userId} ORDER BY a.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) 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")
     MsTripDet returnWork(@Param("userId") Long userId);
 
     /**

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -285,7 +285,7 @@ public class ScanController {
 //                    }
                     MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
                     if (work != null) {
-                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work.getStartMsg(), work.getEndMsg())) {
+                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
                             if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                                 model.put("collor", "red");
                                 model.put("collor2", "red");
@@ -294,7 +294,7 @@ public class ScanController {
                                 scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                                 return new ModelAndView("/user/scan.ftl", model);
                             }
-                        } else if (!ly2 && !compareWhere(work.getStartMsg(), work.getEndMsg()))  {
+                        } else if (!ly2)  {
                             if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                                 model.put("collor", "red");
                                 model.put("collor2", "red");
@@ -750,7 +750,7 @@ public class ScanController {
 //            }
             MsTripDet work = msReportMapper.returnWork(userId);
             if (work != null) {
-                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work.getStartMsg(), work.getEndMsg())) {
+                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
                     if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
@@ -758,7 +758,7 @@ public class ScanController {
                         model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。" + day15(s.parse(work.getReturnWork())) + "起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
-                } else if (!ly2 && !compareWhere(work.getStartMsg(), work.getEndMsg()))  {
+                } else if (!ly2)  {
                     if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                         model.put("collor", "red");
                         model.put("collor2", "red");