凌云集团更改公司

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

@@ -81,7 +81,7 @@ public class ScanController {
     @ApiOperation("进出扫码页面")
     @GetMapping("/user/scan.html")
     public ModelAndView scan(HttpServletRequest request, ModelMap model, @RequestParam(value = "doorId", required = false, defaultValue = "0") Long doorId,
-                             @RequestParam(value = "inType", required = false, defaultValue = "0") Integer inType) {
+                             @RequestParam(value = "inType", required = false, defaultValue = "0") Integer inType) throws ParseException {
         UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
         List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
 //        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
@@ -152,7 +152,7 @@ public class ScanController {
                         if (msReports2.size() < 14) {
                             model.put("collor", "red");
                             model.put("into", "不许进入");
-                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2)+"起方可进入！");
+                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2, returnWork)+"起方可进入！");
                             scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                             return new ModelAndView("/user/scan.ftl", model);
                         }
@@ -438,7 +438,7 @@ public class ScanController {
                     if (msReports2.size() < 14) {
                         model.put("collor", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2)+"起方可进入！");
+                        model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2, returnWork)+"起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
@@ -519,13 +519,14 @@ public class ScanController {
         return time.substring(0, time.length() - 1);
     }
 
-    public String day15(List<MsReport> list) {
+    public String day15(List<MsReport> list, String returnWork) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
         Date time1 = null;
         if(list.size() == 0) {
             time1 = new Date();
         } else {
-            time1 = list.get(0).getReportDate();
+            SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+            time1 = s.parse(returnWork);
         }
         return sdf.format(new Date(time1.getTime() + 1000L*3600*24*14));
     }