凌云集团更改公司

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

@@ -200,9 +200,10 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
      * @param userId
      * @return
      */
-    @Select("select DATE_FORMAT(a.report_date,'%Y-%m-%d') 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 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")
-    String returnWork(@Param("userId") Long userId);
+    @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")
+    MsTripDet returnWork(@Param("userId") Long userId);
 
     /**
      * 最近去工作驻地的时间

whepi-web/src/main/java/com/bofeng/entity/MsTripDet.java

@@ -58,4 +58,13 @@ public class MsTripDet {
 
     @TableField("time_update")
     private DateTime timeUpdate;
+
+    @TableField(exist = false)
+    private String returnWork;
+
+    @TableField(exist = false)
+    private String startMsg;
+
+    @TableField(exist = false)
+    private String endMsg;
 }

whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -690,9 +690,9 @@ public class MsReportService {
                 Integer isFamliyContact = msReportMapper.selectFamilyContactNum(msReport.getUserId()) > 0 ? 1 : 0;
                 //异地返工
                 Integer isWork = 0;
-                String returnWork = msReportMapper.returnWork(msReport.getUserId());
+                MsTripDet returnWork = msReportMapper.returnWork(msReport.getUserId());
                 if (returnWork != null) {
-                    if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                    if (sdf.parse(returnWork.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                         isWork = 1;
                     }
                 }

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

@@ -274,23 +274,23 @@ 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);
 //                    }
-                    String returnWork = msReportMapper.returnWork(userOpen.getUserId());
-                    if (returnWork != null) {
-                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(returnWork).getTime()) {
-                            if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                    MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
+                    if (work != null) {
+                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work)) {
+                            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");
                                 model.put("into", "不许进入");
-                                model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。" + day15(s.parse(returnWork)) + "起方可进入！");
+                                model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。" + day15(s.parse(work.getReturnWork())) + "起方可进入！");
                                 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)  {
-                            if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                        } else if (!ly2 && !compareWhere(work))  {
+                            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");
                                 model.put("into", "不许进入");
-                                model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。" + day15(s.parse(returnWork)) + "起方可进入！");
+                                model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。" + day15(s.parse(work.getReturnWork())) + "起方可进入！");
                                 scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                                 return new ModelAndView("/user/scan.ftl", model);
                             }
@@ -722,22 +722,22 @@ public class ScanController {
 //                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
 //                return new ModelAndView("/user/returnWork.ftl", model);
 //            }
-            String returnWork = msReportMapper.returnWork(userId);
-            if (returnWork != null) {
-                if (ly2 && outUser2.getStartDate().getTime() < s.parse(returnWork).getTime()) {
-                    if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+            MsTripDet work = msReportMapper.returnWork(userId);
+            if (work != null) {
+                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work)) {
+                    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");
                         model.put("into", "不可复工");
-                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。" + day15(s.parse(returnWork)) + "起方可进入！");
+                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。" + day15(s.parse(work.getReturnWork())) + "起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
-                } else if (!ly2)  {
-                    if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                } else if (!ly2 && !compareWhere(work))  {
+                    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");
                         model.put("into", "不可复工");
-                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。" + day15(s.parse(returnWork)) + "起方可进入！");
+                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。" + day15(s.parse(work.getReturnWork())) + "起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
@@ -891,6 +891,19 @@ public class ScanController {
         }
     }
 
+    /**
+     * 比较出发地和目地地是否一样
+     * @param m
+     * @return
+     */
+    public Boolean compareWhere(MsTripDet m) {
+        Boolean type = false;
+        if ((m.getStartMsg().equals("2") || m.getStartMsg().equals("3")) && (m.getEndMsg().equals("2") || m.getEndMsg().equals("3"))) {
+            type = true;
+        }
+        return type;
+    }
+
 
 //    /**
 //     * 生成进出门二维码