凌云集团更改公司

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

@@ -157,18 +157,18 @@ public class ScanService {
                     if (msReports3.size() > 0) {
                         continue;
                     }
-                    MsTripDet work = msReportMapper.returnWork(opens.get(i).getUserId());
-                    if (work != null) {
-                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
-                            if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-                                continue;
-                            }
-                        } else if (!ly2) {
-                            if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > 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()) {
+//                            if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+//                                continue;
+//                            }
+//                        } else if (!ly2) {
+//                            if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+//                                continue;
+//                            }
+//                        }
+//                    }
                     MsReport msReport1 = msReportMapper.msAddr(opens.get(i).getUserId());
                     if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
                         continue;
@@ -235,18 +235,18 @@ public class ScanService {
         if (msReports3.size() > 0) {
             return 0;
         }
-        MsTripDet work = msReportMapper.returnWork(userId);
-        if (work != null) {
-            if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
-                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-                    return 0;
-                }
-            } else if (!ly2) {
-                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-                    return 0;
-                }
-            }
-        }
+//        MsTripDet work = msReportMapper.returnWork(userId);
+//        if (work != null) {
+//            if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
+//                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+//                    return 0;
+//                }
+//            } else if (!ly2) {
+//                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > 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())) {
             return 0;

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

@@ -4,30 +4,19 @@ import com.bofeng.dao.*;
 import com.bofeng.entity.*;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.ScanService;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageConfig;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
 import com.yvan.mvc.Pd;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.Cleanup;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;
@@ -292,28 +281,28 @@ 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);
                     }
-                    MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
-                    if (work != null) {
-                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
-                            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(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(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(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);
-                            }
-                        }
-                    }
+//                    MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
+//                    if (work != null) {
+//                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
+//                            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(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(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(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);
+//                            }
+//                        }
+//                    }
                     //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
                     model.put("collor", "green");
                     model.put("collor2", "green");
@@ -756,26 +745,26 @@ public class ScanController {
                 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()) {
-                    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(work.getReturnWork())) + "起方可进入！");
-                        return new ModelAndView("/user/returnWork.ftl", model);
-                    }
-                } else if (!ly2)  {
-                    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(work.getReturnWork())) + "起方可进入！");
-                        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()) {
+//                    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(work.getReturnWork())) + "起方可进入！");
+//                        return new ModelAndView("/user/returnWork.ftl", model);
+//                    }
+//                } else if (!ly2)  {
+//                    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(work.getReturnWork())) + "起方可进入！");
+//                        return new ModelAndView("/user/returnWork.ftl", model);
+//                    }
+//                }
+//            }
             model.put("collor", "blue-ly");
             model.put("collor2", "blue-ly");
             model.put("into", "允许复工");