同意入场bug

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

@@ -23,6 +23,8 @@ public class FactoryDirectorVo {
     private Integer vistitType;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime vistitDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
     private String destName;
     private Integer type;
 }

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

@@ -33,8 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.DateFormat;
@@ -42,8 +41,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -172,6 +169,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             default: break;
         }
         queryWrapper.orderByDesc("sub_date").eq("farm_id",farmId);
+        List<BaseLocation> baseLocations = baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("serial_number", 0));
+        List<Integer> locationIds = new ArrayList<>();
+        for (BaseLocation baseLocation : baseLocations) {
+            locationIds.add(baseLocation.getId());
+        }
+        if (!locationIds.contains(Integer.parseInt(TokenSign.getWorkIdByJwtToken(httpServletRequest)))){
+            queryWrapper.eq("id",0);
+        }
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page,queryWrapper);
         return new Result(ResultCode.SUCCESS,billPersonnelAdmissionPage);
@@ -189,6 +194,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billPersonnelAdmission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
         BaseProcess baseProcess = baseProcessMapper.selectById(billPersonnelAdmission.getProcessId());
+        List<BaseLocation> baseLocations = baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("serial_number", 0));
+        List<Integer> locationIds = new ArrayList<>();
+        for (BaseLocation baseLocation : baseLocations) {
+            locationIds.add(baseLocation.getId());
+        }
         if (StringUtils.isBlank(baseProcess.getUpdateDate())){
             baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
         }else {
@@ -206,6 +216,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             BaseLocation laseLocation = baseLocationMapper.selectById(laseLocationId);
             BaseLocation baseLocation = baseLocationMapper.selectById(laseLocation.getNextId());
             if (userType == 3){
+                if (locationIds.contains(billPersonnelAdmission.getDestId())){
+                    baseProcess.setCurrentStatus("1");
+                    baseProcess.setProcessType(1);
+                }
                 baseProcess.setCurrentStatus("1,0");
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() +","+baseLocation.getId());

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.xml

@@ -27,23 +27,24 @@
         <result column="process_id" property="processId" />
     </resultMap>
     <select id="listAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
-        SELECT id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type'
+        SELECT id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
 FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type'
+SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
 FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, NULL, NULL, NULL,1 AS 'type'
+SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, NULL, NULL, NULL,1 AS 'type',sub_date
 FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName', bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type'
+SELECT id,admission_user_name AS 'userName', bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
 FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
+ORDER BY sub_date DESC
     </select>
 
 </mapper>