|
@@ -23,20 +23,22 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengercheck.entity.PassengerCheck;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengercheck.param.PassengerCheckPageParam;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengercheck.service.PassengerCheckService;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengercheckrecord.entity.PassengerCheckRecord;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengercheckrecord.service.PassengerCheckRecordService;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengergood.entity.PassengerGood;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengergood.service.PassengerGoodService;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengerinfo.param.*;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengerinfo.vo.PassengerInfoDetailVo;
|
|
|
-import vip.xiaonuo.biz.modular.qysecondlinehzdrqtz.entity.QySecondlineHzdRqTz;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengerinfo.vo.PassengerRoot;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengerpass.entity.PassengerPass;
|
|
|
+import vip.xiaonuo.biz.modular.passenger.passengerpass.service.PassengerPassService;
|
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengerinfo.entity.PassengerInfo;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengerinfo.mapper.PassengerInfoMapper;
|
|
|
-import vip.xiaonuo.biz.modular.passenger.passengerinfo.param.PassengerInfoAddParam;
|
|
|
-import vip.xiaonuo.biz.modular.passenger.passengerinfo.param.PassengerInfoEditParam;
|
|
|
-import vip.xiaonuo.biz.modular.passenger.passengerinfo.param.PassengerInfoIdParam;
|
|
|
-import vip.xiaonuo.biz.modular.passenger.passengerinfo.param.PassengerInfoPageParam;
|
|
|
import vip.xiaonuo.biz.modular.passenger.passengerinfo.service.PassengerInfoService;
|
|
|
|
|
|
import java.util.List;
|
|
@@ -52,102 +54,79 @@ public class PassengerInfoServiceImpl extends ServiceImpl<PassengerInfoMapper, P
|
|
|
@Autowired
|
|
|
private PassengerGoodService passengerGoodService;
|
|
|
@Autowired
|
|
|
+ private PassengerCheckRecordService passengerCheckRecordService;
|
|
|
+ @Autowired
|
|
|
private PassengerCheckService passengerCheckService;
|
|
|
- @Override
|
|
|
- public Page<PassengerInfo> page(PassengerInfoPageParam passengerInfoPageParam) {
|
|
|
- QueryWrapper<PassengerInfo> queryWrapper = new QueryWrapper<PassengerInfo>().checkSqlInjection();
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getName())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getName, passengerInfoPageParam.getName());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getGender())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getGender, passengerInfoPageParam.getGender());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getIdNo())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getIdNo, passengerInfoPageParam.getIdNo());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getNationality())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getNationality, passengerInfoPageParam.getNationality());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getAddress())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getAddress, passengerInfoPageParam.getAddress());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getTravelNo())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getTravelNo, passengerInfoPageParam.getTravelNo());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckPlace())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getCheckPlace, passengerInfoPageParam.getCheckPlace());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckStatus())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getCheckStatus, passengerInfoPageParam.getCheckStatus());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getBaggage())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getBaggage, passengerInfoPageParam.getBaggage());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getFromPort())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getFromPort, passengerInfoPageParam.getFromPort());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getToPort())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getToPort, passengerInfoPageParam.getToPort());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckReason())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getCheckReason, passengerInfoPageParam.getCheckReason());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckBy())) {
|
|
|
- queryWrapper.lambda().like(PassengerInfo::getCheckBy, passengerInfoPageParam.getCheckBy());
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getPass())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getPass, passengerInfoPageParam.getPass());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckType())) {
|
|
|
- queryWrapper.lambda().eq(PassengerInfo::getCheckType, passengerInfoPageParam.getCheckType());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getTravelTimeStart())) {
|
|
|
- queryWrapper.lambda().ge(PassengerInfo::getTravelTime, passengerInfoPageParam.getTravelTimeStart());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getTravelTimeEnd())) {
|
|
|
- queryWrapper.lambda().le(PassengerInfo::getTravelTime,passengerInfoPageParam.getTravelTimeEnd());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckTimeStart())) {
|
|
|
- queryWrapper.lambda().ge(PassengerInfo::getCheckTime, passengerInfoPageParam.getCheckTimeStart());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getCheckTimeEnd())) {
|
|
|
- queryWrapper.lambda().ge(PassengerInfo::getCheckTime, passengerInfoPageParam.getCheckTimeEnd());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getAdmissionTimeStart())) {
|
|
|
- queryWrapper.lambda().ge(PassengerInfo::getAdmissionTime, passengerInfoPageParam.getAdmissionTimeStart());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getAdmissionTimeEnd())) {
|
|
|
- queryWrapper.lambda().le(PassengerInfo::getAdmissionTime,passengerInfoPageParam.getAdmissionTimeEnd());
|
|
|
- }
|
|
|
-
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getPassTimeStart())) {
|
|
|
- queryWrapper.lambda().ge(PassengerInfo::getPassTime, passengerInfoPageParam.getPassTimeStart());
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(passengerInfoPageParam.getPassTimeEnd())) {
|
|
|
- queryWrapper.lambda().le(PassengerInfo::getPassTime,passengerInfoPageParam.getPassTimeEnd());
|
|
|
- }
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private PassengerPassService passengerPassService;
|
|
|
|
|
|
- if(ObjectUtil.isAllNotEmpty(passengerInfoPageParam.getSortField(), passengerInfoPageParam.getSortOrder())) {
|
|
|
- CommonSortOrderEnum.validate(passengerInfoPageParam.getSortOrder());
|
|
|
- queryWrapper.orderBy(true, passengerInfoPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
|
|
|
- StrUtil.toUnderlineCase(passengerInfoPageParam.getSortField()));
|
|
|
- } else {
|
|
|
- queryWrapper.lambda().orderByAsc(PassengerInfo::getId);
|
|
|
- }
|
|
|
- return this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
+ @Override
|
|
|
+ public Object page(PassengerRootPageParam rootPageParam) {
|
|
|
+ if("1".equals(rootPageParam.getQueryType())){
|
|
|
+ QueryWrapper<PassengerInfo> queryWrapper = new QueryWrapper<PassengerInfo>().checkSqlInjection();
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getName())) {
|
|
|
+ queryWrapper.lambda().like(PassengerInfo::getName, rootPageParam.getName());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getGender())) {
|
|
|
+ queryWrapper.lambda().eq(PassengerInfo::getGender, rootPageParam.getGender());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getIdNo())) {
|
|
|
+ queryWrapper.lambda().like(PassengerInfo::getIdNo, rootPageParam.getIdNo());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getNationality())) {
|
|
|
+ queryWrapper.lambda().eq(PassengerInfo::getNationality, rootPageParam.getNationality());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getAddress())) {
|
|
|
+ queryWrapper.lambda().like(PassengerInfo::getAddress, rootPageParam.getAddress());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getTravelNo())) {
|
|
|
+ queryWrapper.lambda().like(PassengerInfo::getTravelNo, rootPageParam.getTravelNo());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getBaggage())) {
|
|
|
+ queryWrapper.lambda().eq(PassengerInfo::getBaggage, rootPageParam.getBaggage());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getFromPort())) {
|
|
|
+ queryWrapper.lambda().eq(PassengerInfo::getFromPort, rootPageParam.getFromPort());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getToPort())) {
|
|
|
+ queryWrapper.lambda().eq(PassengerInfo::getToPort, rootPageParam.getToPort());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getTravelTimeStart())) {
|
|
|
+ queryWrapper.lambda().ge(PassengerInfo::getTravelTime, rootPageParam.getTravelTimeStart());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(rootPageParam.getTravelTimeEnd())) {
|
|
|
+ queryWrapper.lambda().le(PassengerInfo::getTravelTime,rootPageParam.getTravelTimeEnd());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ if(ObjectUtil.isAllNotEmpty(rootPageParam.getSortField(), rootPageParam.getSortOrder())) {
|
|
|
+ CommonSortOrderEnum.validate(rootPageParam.getSortOrder());
|
|
|
+ queryWrapper.orderBy(true, rootPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
|
|
|
+ StrUtil.toUnderlineCase(rootPageParam.getSortField()));
|
|
|
+ } else {
|
|
|
+ queryWrapper.lambda().orderByAsc(PassengerInfo::getId);
|
|
|
+ }
|
|
|
+ Page<PassengerInfo> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
+
|
|
|
+ return page;
|
|
|
+ }else if("2".equals(rootPageParam.getQueryType())){
|
|
|
+ Page<PassengerCheck> page = passengerCheckService.page(rootPageParam);
|
|
|
+ return page;
|
|
|
+ }else if("3".equals(rootPageParam.getQueryType())){
|
|
|
+ Page<PassengerPass> page = passengerPassService.page(rootPageParam);
|
|
|
+ return page;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -180,8 +159,8 @@ public class PassengerInfoServiceImpl extends ServiceImpl<PassengerInfoMapper, P
|
|
|
QueryWrapper<PassengerGood> goodWrapper = new QueryWrapper<PassengerGood>().checkSqlInjection();
|
|
|
List<PassengerGood> goods = passengerGoodService.list(goodWrapper.lambda().eq(PassengerGood::getPassengerId, passengerInfoIdParam.getId()));
|
|
|
|
|
|
- QueryWrapper<PassengerCheck> checkWrapper = new QueryWrapper<PassengerCheck>().checkSqlInjection();
|
|
|
- List<PassengerCheck> checks = passengerCheckService.list(checkWrapper.lambda().eq(PassengerCheck::getPassengerId, passengerInfoIdParam.getId()));
|
|
|
+ QueryWrapper<PassengerCheckRecord> checkWrapper = new QueryWrapper<PassengerCheckRecord>().checkSqlInjection();
|
|
|
+ List<PassengerCheckRecord> checks = passengerCheckRecordService.list(checkWrapper.lambda().eq(PassengerCheckRecord::getPassengerId, passengerInfoIdParam.getId()));
|
|
|
BeanUtil.copyProperties(passengerInfo,detailVo);
|
|
|
detailVo.setGoods(goods);
|
|
|
detailVo.setChecks(checks);
|