修改最近三天是否出行

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

@@ -33,16 +33,15 @@ public class ReturnWorkLy {
     @ExcelProperty(value = "部门", index = 0)
     @TableField(exist = false)
     private String unit;
-    @ExcelProperty(value = "二级部门", index = 1)
     @TableField(exist = false)
     private String departmentName;
-    @ExcelProperty(value = "姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 1)
     @TableField(exist = false)
     private String linkman;
-    @ExcelProperty(value = "电话", index = 3)
+    @ExcelProperty(value = "电话", index = 2)
     @TableField(exist = false)
     private String phone;
-    @ExcelProperty(value = "工号", index = 4)
+    @ExcelProperty(value = "工号", index = 3)
     @TableField(exist = false)
     private String doorplate;
 }

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

@@ -67,4 +67,6 @@ public class UserOpen {
     private String ridgepole = "";
     @TableField(exist = false)
     private String unit = "";
+    @TableField(exist = false)
+    private String workAddr = "";
 }

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

@@ -157,6 +157,20 @@ public class ScanService {
                     if (msReports3.size() > 0) {
                         continue;
                     }
+
+                    List<MsReport> msReports4 = msReportMapper.selectMsReportThirtyError(opens.get(i).getUserId());
+                    if (msReports4.size() > 0) {
+                        continue;
+                    }
+                    MsReport msReport1 = msReportMapper.msAddr(opens.get(i).getUserId());
+                    if (msReport1 != null && !msReport1.getAutoLocal().equals(opens.get(i).getWorkAddr())) {
+                        continue;
+                    }
+                    // 最近三天是否出行
+                    MsTripDet work = msReportMapper.returnWork(opens.get(i).getUserId());
+                    if (work != null && sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                        continue;
+                    }
 //                    MsTripDet work = msReportMapper.returnWork(opens.get(i).getUserId());
 //                    if (work != null) {
 //                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
@@ -245,10 +259,8 @@ public class ScanService {
         }
         // 最近三天是否出行
         MsTripDet work = msReportMapper.returnWork(userId);
-        if (work != null && (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime())) {
-            if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-                return 0;
-            }
+        if (work != null && sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+            return 0;
         }
 //        MsReport msReport1 = msReportMapper.msAddr(userId);
 //        if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {

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

@@ -723,14 +723,12 @@ public class ScanController {
             }
             // 最近三天是否出行
             MsTripDet work = msReportMapper.returnWork(userId);
-            if (work != null && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
-                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-                    model.put("collor", "red");
-                    model.put("collor2", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "您返回工作驻地后未满3日，不可复工。" + dayHow(s.parse(work.getReturnWork()), 3) + "起方可进入！");
-                    return new ModelAndView("/user/returnWork.ftl", model);
-                }
+            if (work != null && sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不可复工");
+                model.put("errorMsg", "您返回工作驻地后未满3日，不可复工。" + dayHow(s.parse(work.getReturnWork()), 3) + "起方可进入！");
+                return new ModelAndView("/user/returnWork.ftl", model);
             }
 //            if (work != null) {
 //                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {

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

@@ -32,7 +32,7 @@
 
     <select id="getUsersByunitId" resultType="com.bofeng.entity.UserOpen">
         SELECT
-        suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,ur.user_id AS userId
+        suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.work_addr as workAddr,suho.phone,ur.user_id AS userId
         FROM
         sys_uptown_house suh
         INNER JOIN sys_uptown_home suho ON suho.house_id = suh.house_id