时间精确到分

huimv-admin/src/main/java/com/huimv/admin/controller/BillPersonnelAdmissionController.java

@@ -2,6 +2,7 @@ package com.huimv.admin.controller;
 
 
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BillIsolate;
 import com.huimv.admin.service.IBillPersonnelAdmissionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,11 @@ public class BillPersonnelAdmissionController {
         return billPersonnelAdmissionService.getDetail(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/getById")
+    public Result getById(@RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billPersonnelAdmissionService.getById(paramsMap.get("id")));
+    }
+
     @Autowired
     private IBillPersonnelAdmissionService admissionService;
 

huimv-admin/src/main/java/com/huimv/admin/entity/BaseProcess.java

@@ -54,7 +54,7 @@ public class BaseProcess implements Serializable {
     /**
      * 提交时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date subDate;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/BillClean.java

@@ -60,13 +60,13 @@ public class BillClean implements Serializable {
     /**
      * 来访时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private Integer farmId;
@@ -79,7 +79,7 @@ public class BillClean implements Serializable {
     /**
      * 处理时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/BillIsolate.java

@@ -62,13 +62,13 @@ public class BillIsolate implements Serializable {
     /**
      * 来访时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     private Integer farmId;
@@ -81,6 +81,7 @@ public class BillIsolate implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
     /**
@@ -109,13 +110,13 @@ public class BillIsolate implements Serializable {
      * 隔离开始时间
      */
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date isolateStartDate;
 
     /**
      * 隔离结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date isolateEndDate;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/BillLuggage.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -40,6 +42,7 @@ public class BillLuggage implements Serializable {
     /**
      * 寄存日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime luggageDate;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/BillPcr.java

@@ -70,14 +70,14 @@ public class BillPcr implements Serializable {
     /**
      * 提交时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     /**
      * 检测时间
      */
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date checkDate;
 
     /**
@@ -89,7 +89,7 @@ public class BillPcr implements Serializable {
      * 处理时间
      */
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date passDate;
 
     /**
@@ -115,4 +115,6 @@ public class BillPcr implements Serializable {
 
     private Integer admissionId;
 
+    private String phone;
+
 }

huimv-admin/src/main/java/com/huimv/admin/entity/BillPersonnelAdmission.java

@@ -63,13 +63,13 @@ public class BillPersonnelAdmission implements Serializable {
     /**
      * 来访时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
 
     /**
      * 提交时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
     /**
@@ -112,7 +112,7 @@ public class BillPersonnelAdmission implements Serializable {
     /**
      * 处理时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime passDate;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/vo/FactoryDirectorVo.java

@@ -12,16 +12,16 @@ public class FactoryDirectorVo {
     private String userName;
     private Integer billStatus;
     private String isolateLocation;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime startTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime endTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime checkDate;
 
     private String testLocation;
     private Integer vistitType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
     private String destName;
     private Integer type;

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -181,7 +181,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result handleAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String id = paramsMap.get("id");
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
         Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
         billPersonnelAdmission.setPassDate(LocalDateTime.now());
@@ -204,14 +204,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String laseLocationId = baseProcess.getCurrentLocationId();
             BaseLocation laseLocation = baseLocationMapper.selectById(laseLocationId);
             BaseLocation baseLocation = baseLocationMapper.selectById(laseLocation.getNextId());
-            baseProcess.setCurrentStatus("1,0");
-            baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
-            baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
             if (userType == 3){
+                baseProcess.setCurrentStatus("1,0");
+                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
+                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
                 BillPcr billPcr = new BillPcr();
                 billPcr.setVistitType(billPersonnelAdmission.getVistitType());
                 billPcr.setDestName(billPersonnelAdmission.getDestName());
                 billPcr.setDestId(billPersonnelAdmission.getDestId());
+                billPcr.setPhone(billPersonnelAdmission.getPhone());
                 billPcr.setAdmissionUserId(billPersonnelAdmission.getAdmissionUserId());
                 billPcr.setAdmissionUserName(billPersonnelAdmission.getAdmissionUserName());
                 billPcr.setSubDate(LocalDateTime.now());
@@ -223,6 +224,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billPcr.setTestLocationId(baseLocation.getId());
                 billPcrMapper.insert(billPcr);
             }else {
+                baseProcess.setCurrentStatus("1");
+//                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
+//                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());
                 //TODO 紧急入场通过先不处理
             }
         }