凌云集团更改公司

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

@@ -100,4 +100,22 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     @Select("select b.medical from ms_report a LEFT JOIN ms_suspected b on a.report_id=b.report_id where a.report_status=1 and a.user_create=#{userId} ORDER BY report_date desc LIMIT 1")
     Integer queryLateStatus(@Param("userId") Long userId);
 
+    /**
+     * 最近去工作驻地的时间
+     * @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);
+
+    /**
+     * 最近去工作驻地的时间
+     * @param userId
+     * @return
+     */
+    @Select("select a.* 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} and a.report_date>#{reportDate} ORDER BY a.report_date desc LIMIT 15")
+    List<MsReport> returnWorkTime(@Param("reportDate") String reportDate, @Param("userId") Long userId);
+
 }

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

@@ -146,6 +146,17 @@ public class ScanController {
                             return new ModelAndView("/user/scan.ftl", model);
                         }
                     }
+                    String returnWork = msReportMapper.returnWork(userOpen.getUserId());
+                    if (returnWork != null) {
+                        List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
+                        if (msReports2.size() < 15) {
+                            model.put("collor", "red");
+                            model.put("into", "不许进入");
+                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2)+"起方可进入！");
+                            scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                            return new ModelAndView("/user/scan.ftl", model);
+                        }
+                    }
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                     if (msReports.size() == 0) {
                         model.put("collor", "red");
@@ -393,10 +404,10 @@ public class ScanController {
     @ApiOperation("复工查询")
     @GetMapping("/user/returnWork.html")
     public ModelAndView returnWork(HttpServletRequest request, ModelMap model) throws ParseException {
-        UserOpen userOpen = homeService.getUserOpen();
-        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
-//        UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
+//        UserOpen userOpen = homeService.getUserOpen();
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
+        UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
         model.put("user", userOpen);
         model.put("user_id", "\"" + userOpen.getUserId() + "\"");
         if (list.size() == 0) {
@@ -421,6 +432,16 @@ public class ScanController {
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
+                String returnWork = msReportMapper.returnWork(userOpen.getUserId());
+                if (returnWork != null) {
+                    List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
+                    if (msReports2.size() < 15) {
+                        model.put("collor", "red");
+                        model.put("into", "不许进入");
+                        model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2)+"起方可进入！");
+                        return new ModelAndView("/user/returnWork.ftl", model);
+                    }
+                }
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                 if (msReports.size() == 0) {
                     model.put("collor", "red");
@@ -498,6 +519,17 @@ public class ScanController {
         return time.substring(0, time.length() - 1);
     }
 
+    public String day15(List<MsReport> list) {
+        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
+        Date time1 = null;
+        if(list.size() == 0) {
+            time1 = new Date();
+        } else {
+            time1 = list.get(0).getReportDate();
+        }
+        return sdf.format(new Date(time1.getTime() + 1000L*3600*24*14));
+    }
+
 //    /**
 //     * 生成进出门二维码
 //     * @param doorId 小区大门ID