|
|
@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basevehiclecertificate; |
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; |
|
|
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo; |
|
|
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo; |
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.*; |
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.*; |
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
@ -70,6 +71,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
private BaseVehicleAppendixService baseVehicleAppendixService; |
|
|
private BaseVehicleAppendixService baseVehicleAppendixService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private BaseVehicleService baseVehicleService; |
|
|
private BaseVehicleService baseVehicleService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 台账信息条件分页查询 |
|
|
* 台账信息条件分页查询 |
|
|
* |
|
|
* |
|
|
@ -252,8 +254,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) { |
|
|
public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) { |
|
|
ResultBean<HandoverCertVo> rb = ResultBean.fireFail(); |
|
|
ResultBean<HandoverCertVo> rb = ResultBean.fireFail(); |
|
|
HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid); |
|
|
HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid); |
|
|
if(handoverCertVo != null){ |
|
|
if (handoverCertVo != null) { |
|
|
if(StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())){ |
|
|
if (StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())) { |
|
|
List<String> photoList = Arrays.asList(handoverCertVo.getCertificatePhoto().split(",")); |
|
|
List<String> photoList = Arrays.asList(handoverCertVo.getCertificatePhoto().split(",")); |
|
|
handoverCertVo.setCertificatePhotoList(photoList); |
|
|
handoverCertVo.setCertificatePhotoList(photoList); |
|
|
} |
|
|
} |
|
|
@ -270,10 +272,10 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); |
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); |
|
|
for (String sid : sids) { |
|
|
for (String sid : sids) { |
|
|
BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid); |
|
|
BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid); |
|
|
if (CertificState.CertificateState.CERSTATE_ZS.getCode().equals(baseVehicleCertificate.getCertificateState()) && CertificState.TransferState.TRANSTATE_DYJ.getCode().equals(baseVehicleCertificate.getTransferStateKey())){ |
|
|
if (CertificState.CertificateState.CERSTATE_ZS.getCode().equals(baseVehicleCertificate.getCertificateState()) && CertificState.TransferState.TRANSTATE_DYJ.getCode().equals(baseVehicleCertificate.getTransferStateKey())) { |
|
|
String vehicleSid = baseVehicleCertificate.getVehicleSid(); |
|
|
String vehicleSid = baseVehicleCertificate.getVehicleSid(); |
|
|
BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData(); |
|
|
BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData(); |
|
|
if (busSalesOrderDetailsVo == null){ |
|
|
if (busSalesOrderDetailsVo == null) { |
|
|
return rb.setMsg("暂无销售订单，不可移交"); |
|
|
return rb.setMsg("暂无销售订单，不可移交"); |
|
|
} |
|
|
} |
|
|
String staffSid = busSalesOrderDetailsVo.getStaffSid(); |
|
|
String staffSid = busSalesOrderDetailsVo.getStaffSid(); |
|
|
@ -303,13 +305,13 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
//移交附件
|
|
|
//移交附件
|
|
|
List<String> transferFiles = baseVehicleAppendixService.selectList(sid); |
|
|
List<String> transferFiles = baseVehicleAppendixService.selectList(sid); |
|
|
String transferFilesString = ""; |
|
|
String transferFilesString = ""; |
|
|
if (!transferFiles.isEmpty()){ |
|
|
if (!transferFiles.isEmpty()) { |
|
|
for (String transferFile : transferFiles) { |
|
|
for (String transferFile : transferFiles) { |
|
|
transferFilesString = transferFilesString + transferFile + ","; |
|
|
transferFilesString = transferFilesString + transferFile + ","; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(transferFilesString)){ |
|
|
if (StringUtils.isNotBlank(transferFilesString)) { |
|
|
busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0,transferFilesString.length() - 1)); |
|
|
busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0, transferFilesString.length() - 1)); |
|
|
} |
|
|
} |
|
|
busTransferRecordsFeign.saveRecords(busTransferRecordsDto); |
|
|
busTransferRecordsFeign.saveRecords(busTransferRecordsDto); |
|
|
//消息推送
|
|
|
//消息推送
|
|
|
@ -327,8 +329,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
messagePushTransferDto.setReceiveSids(sysUserVo1.getSid()); |
|
|
messagePushTransferDto.setReceiveSids(sysUserVo1.getSid()); |
|
|
messagePushTransferDto.setReceiveNames(sysUserVo1.getName()); |
|
|
messagePushTransferDto.setReceiveNames(sysUserVo1.getName()); |
|
|
messageFeign.pushTransferMessage(messagePushTransferDto); |
|
|
messageFeign.pushTransferMessage(messagePushTransferDto); |
|
|
baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(),CertificState.TransferState.TRANSTATE_YJZ.getRemarks()); |
|
|
baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(), CertificState.TransferState.TRANSTATE_YJZ.getRemarks()); |
|
|
}else { |
|
|
} else { |
|
|
return rb.setMsg("不符合移交条件"); |
|
|
return rb.setMsg("不符合移交条件"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -338,7 +340,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
public ResultBean updateYjState(CertificateStateQuery query) { |
|
|
public ResultBean updateYjState(CertificateStateQuery query) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
BaseVehicleCertificate baseVehicleCertificate = baseMapper.selectByVinSid(query.getVinSid()); |
|
|
BaseVehicleCertificate baseVehicleCertificate = baseMapper.selectByVinSid(query.getVinSid()); |
|
|
if(baseVehicleCertificate != null){ |
|
|
if (baseVehicleCertificate != null) { |
|
|
baseVehicleCertificate.setTransferStateKey(query.getTransferStateKey()); |
|
|
baseVehicleCertificate.setTransferStateKey(query.getTransferStateKey()); |
|
|
baseVehicleCertificate.setTransferStateValue(query.getTransferStateValue()); |
|
|
baseVehicleCertificate.setTransferStateValue(query.getTransferStateValue()); |
|
|
baseMapper.updateById(baseVehicleCertificate); |
|
|
baseMapper.updateById(baseVehicleCertificate); |
|
|
@ -346,19 +348,24 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl |
|
|
return rb.success(); |
|
|
return rb.success(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public ResultBean updateVinNo(String vinNo, String sid) { |
|
|
public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
if (vinNo.length() != 17){ |
|
|
if (vinNo.length() != 17) { |
|
|
return rb.setMsg("字符串长度不是17位"); |
|
|
return rb.setMsg("字符串长度不是17位"); |
|
|
} |
|
|
} |
|
|
BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid); |
|
|
BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid); |
|
|
|
|
|
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid()); |
|
|
|
|
|
String tzVinNo = baseVehicle.getVinNo(); |
|
|
|
|
|
if (!vinNo.substring(vinNo.length() - 8).equals(tzVinNo.substring(tzVinNo.length() - 8)) && StringUtils.isBlank(smRemarks)) { |
|
|
|
|
|
return rb.success().setMsg("该车架号后八位与车辆台账中车架号不符，请填写说明原因"); |
|
|
|
|
|
} |
|
|
String remarks = baseVehicleCertificate.getRemarks(); |
|
|
String remarks = baseVehicleCertificate.getRemarks(); |
|
|
if (StringUtils.isBlank(remarks)) { |
|
|
if (StringUtils.isBlank(remarks)) { |
|
|
remarks = "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo; |
|
|
remarks = smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo; |
|
|
}else { |
|
|
} else { |
|
|
remarks = remarks + "，" + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo; |
|
|
remarks = remarks + "，" + smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo; |
|
|
} |
|
|
} |
|
|
baseMapper.updateVinNo(vinNo,remarks,sid); |
|
|
baseMapper.updateVinNo(vinNo, remarks, sid); |
|
|
baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid()); |
|
|
baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid()); |
|
|
return rb.success(); |
|
|
return rb.success(); |
|
|
} |
|
|
} |
|
|
|
dimengzhe
1 year ago