旅客查验bug修复

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/passenger/passengercheck/service/impl/PassengerCheckServiceImpl.java

@@ -126,7 +126,7 @@ public class PassengerCheckServiceImpl extends ServiceImpl<PassengerCheckMapper,
             queryWrapper.lambda().ge(PassengerCheck::getCheckTime, passengerCheckPageParam.getCheckTimeStart());
         }
         if(ObjectUtil.isNotEmpty(passengerCheckPageParam.getCheckTimeEnd())) {
-            queryWrapper.lambda().ge(PassengerCheck::getCheckTime, passengerCheckPageParam.getCheckTimeEnd());
+            queryWrapper.lambda().le(PassengerCheck::getCheckTime, passengerCheckPageParam.getCheckTimeEnd());
         }
 
         if(ObjectUtil.isAllNotEmpty(passengerCheckPageParam.getSortField(), passengerCheckPageParam.getSortOrder())) {
@@ -191,13 +191,13 @@ public class PassengerCheckServiceImpl extends ServiceImpl<PassengerCheckMapper,
     @Transactional(rollbackFor = Exception.class)
     public void saveExcelData(List<PassengerCheckImportExcelDto> importExcelDtos) {
 
-        Date currentDate = new Date();
-        int releaseCount = 5;
+
+        int releaseCount = -5;
         int xlsbSjCount = -1;
         int cyZlJsSjCount = 1;
         int xlWpSjCount = -1;
         for (PassengerCheckImportExcelDto item : importExcelDtos) {
-
+            Date currentDate = new Date();
             PassengerCheck passengerCheck = new PassengerCheck();
             BeanUtil.copyProperties(item,passengerCheck);
             //根据身份证号计算年龄
@@ -217,7 +217,7 @@ public class PassengerCheckServiceImpl extends ServiceImpl<PassengerCheckMapper,
             //设置查验状态
             passengerCheck.setCheckStatus(bizDictService.getNameByLabel("lvke_checkStatus",item.getCheckStatus()));
             //发布时间
-            passengerCheck.setReleaseTime(DateUtil.offsetMinute(currentDate,releaseCount++));
+            passengerCheck.setReleaseTime(DateUtil.offsetMinute(currentDate,releaseCount--));
             //查验时间 已查验就有添加查验时间
             if(!"0".equals(passengerCheck.getCheckStatus()) ){
                 passengerCheck.setCheckTime(DateUtil.offsetMinute(passengerCheck.getReleaseTime(),5));
@@ -268,7 +268,7 @@ public class PassengerCheckServiceImpl extends ServiceImpl<PassengerCheckMapper,
             step4.setPassengerId(passengerCheck.getId());
             step4.setType("2");
             step4.setCheckStep("行李物品查验");
-            step4.setCreateTime(DateUtil.offsetMinute(passengerCheck.getReleaseTime(),xlWpSjCount--));
+            step4.setCreateTime(DateUtil.offsetMinute(currentDate,xlWpSjCount--));
 
             allStep.add(step1);
             allStep.add(step2);

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/passenger/passengerinfo/param/PassengerRootPageParam.java

@@ -117,22 +117,22 @@ public class PassengerRootPageParam {
 
     /** 入场时间 */
     @Schema(description = "入场开始时间")
-    private Date admissionTimeStart;
+    private String admissionTimeStart;
 
     @Schema(description = "入场结束时间")
-    private Date admissionTimeEnd;
+    private String admissionTimeEnd;
 
     /** 放行时间 */
     @Schema(description = "放行开始时间")
-    private Date passTimeStart;
+    private String passTimeStart;
 
     /** 放行时间 */
     @Schema(description = "放行结束时间")
-    private Date passTimeEnd;
+    private String passTimeEnd;
 
     /** 查验类型 */
     @Schema(description = "查验类型")
-    private Date checkType;
+    private String checkType;
 
     @Schema(description = "查询类型 1 基本信息  2 旅客信息  3放行")
     private String queryType;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/passenger/passengerinfo/vo/PassengerInfoDetailVo.java

@@ -207,4 +207,7 @@ public class PassengerInfoDetailVo {
 
     @Schema(description = "查验过程记录")
     private List<PassengerCheckRecord> checks;
+
+    @Schema(description = "查验结果说明")
+    private String checkResultSm;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/passenger/passengerpass/service/impl/PassengerPassServiceImpl.java

@@ -183,10 +183,11 @@ public class PassengerPassServiceImpl extends ServiceImpl<PassengerPassMapper, P
         }
     }
     public void saveExcelData(List<PassengerPassImportExcelDto> importExcelDtos){
-        Date currentDate = new Date();
+
         int rcSjCount = -10;
         int fxSjCount = -5;
         for (PassengerPassImportExcelDto item : importExcelDtos) {
+            Date currentDate = new Date();
             PassengerPass passengerPass = new PassengerPass();
             BeanUtil.copyProperties(item,passengerPass);
             //根据身份证号计算年龄