凌云集团更改公司

admin-ui/app/whepi/scan/specialPersonnelLYS.js

@@ -281,6 +281,7 @@ define(function (require) {
                                         },
                                         {field: 'createName', title: '新增人', maxWidth: 200, align: 'left',},
                                         {field: 'updateName', title: '修改人', maxWidth: 200, align: 'left',},
+                                        {field: 'timeUpdate', title: '更新时间', formatter: 'ts'},
                                     ]
                                 ]
                         }

admin-ui/app/whepi/scan/specialPersonnelLYS2.js

@@ -240,6 +240,7 @@ define(function (require) {
                                         },
                                         {field: 'createName', title: '新增人', maxWidth: 200, align: 'left',},
                                         {field: 'updateName', title: '修改人', maxWidth: 200, align: 'left',},
+                                        {field: 'timeUpdate', title: '更新时间', formatter: 'ts'},
                                     ]
                                 ]
                         }

admin-ui/app/whepi/scan/specialPersonnelLYSixS.js

@@ -263,6 +263,7 @@ define(function (require) {
                                         },
                                         {field: 'createName', title: '新增人', maxWidth: 200, align: 'left',},
                                         {field: 'updateName', title: '修改人', maxWidth: 200, align: 'left',},
+                                        {field: 'timeUpdate', title: '更新时间', formatter: 'ts'},
                                     ]
                                 ]
                         }

admin-ui/app/whepi/scan/xqmanageLY.js

@@ -280,9 +280,9 @@ define(function (require) {
                                             title: '禁止提示',
                                             align: 'left',
                                         },
-                                        // {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
-                                        // {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
-                                        // {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
+                                        {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
+                                        {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
+                                        {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

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

@@ -283,6 +283,15 @@ 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);
 //                    }
+                    MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
+                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+                        model.put("collor", "red");
+                        model.put("collor2", "red");
+                        model.put("into", "不许进入");
+                        model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
+                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                        return new ModelAndView("/user/scan.ftl", model);
+                    }
                     MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
                     if (work != null) {
                         if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
@@ -305,15 +314,6 @@ public class ScanController {
                             }
                         }
                     }
-                    MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
-                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-                        model.put("collor", "red");
-                        model.put("collor2", "red");
-                        model.put("into", "不许进入");
-                        model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
-                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
-                        return new ModelAndView("/user/scan.ftl", model);
-                    }
                     //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
                     model.put("collor", "green");
                     model.put("collor2", "green");
@@ -748,6 +748,14 @@ public class ScanController {
 //                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
 //                return new ModelAndView("/user/returnWork.ftl", model);
 //            }
+            MsReport msReport1 = msReportMapper.msAddr(userId);
+            if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不可复工");
+                model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
+                return new ModelAndView("/user/returnWork.ftl", model);
+            }
             MsTripDet work = msReportMapper.returnWork(userId);
             if (work != null) {
                 if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
@@ -768,14 +776,6 @@ public class ScanController {
                     }
                 }
             }
-            MsReport msReport1 = msReportMapper.msAddr(userId);
-            if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不可复工");
-                model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
-                return new ModelAndView("/user/returnWork.ftl", model);
-            }
             model.put("collor", "blue-ly");
             model.put("collor2", "blue-ly");
             model.put("into", "允许复工");

whepi-web/src/main/resources/mapper/OutUserMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.bofeng.dao.OutUserMapper">
 
     <select id="getAllOutUser" resultType="com.bofeng.entity.OutUser">
-        select u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,uu.ridgepole,uu.unit,u.name,u.phone,suh.doorplate,
+        select u.time_update as timeUpdate,u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,uu.ridgepole,uu.unit,u.name,u.phone,suh.doorplate,
         DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as createName,sur1.staff_name as updateName
         from out_user u
         left join sys_uptown_home uh on uh.phone = u.phone and uh.linkman = u.name
@@ -34,7 +34,7 @@
     </select>
 
     <select id="getAllOutUserLY" resultType="com.bofeng.entity.OutUser">
-        select u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,CONCAT(uu.ridgepole,uu.unit) as unit,u.name,u.phone,suh.doorplate,
+        select u.time_update as timeUpdate,u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,CONCAT(uu.ridgepole,uu.unit) as unit,u.name,u.phone,suh.doorplate,
         DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as createName,sur1.staff_name as updateName
         from out_user u
         left join sys_uptown_home uh on uh.phone = u.phone and uh.linkman = u.name