|
|
|
@ -35,6 +35,7 @@ import com.yxt.messagecenter.api.message.MessagePushTransferDto; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
@ -78,6 +79,7 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public ResultBean<String> saveOrUpdate(BusVehicleInformationHandoverDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isNotBlank(dto.getSid())) { |
|
|
|
@ -109,19 +111,23 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
if (null != informationDto.getRecTime()) { |
|
|
|
twiceInformation.setRecTime(null); |
|
|
|
} |
|
|
|
if (null != information.getVehicleKeyNum() && information.getVehicleKeyNum() != 0) { |
|
|
|
twiceInformation.setVehicleKeyNum(information.getVehicleKeyNum()); |
|
|
|
if (StringUtils.isNotBlank(information.getVehicleKeyNum())) { |
|
|
|
if (!information.getVehicleKeyNum().equals("0")) { |
|
|
|
twiceInformation.setVehicleKeyNum(information.getVehicleKeyNum()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (information.getIsFuelVehicle() == 1) { |
|
|
|
twiceInformation.setGasCertificate(1); |
|
|
|
} else { |
|
|
|
twiceInformation.setGasCertificate(0); |
|
|
|
if (StringUtils.isNotBlank(information.getIsFuelVehicle())) { |
|
|
|
if (information.getIsFuelVehicle().equals("1")) { |
|
|
|
twiceInformation.setGasCertificate("1"); |
|
|
|
} else if (information.getIsFuelVehicle().equals("0")) { |
|
|
|
twiceInformation.setGasCertificate("0"); |
|
|
|
} |
|
|
|
} |
|
|
|
twiceInformation.setCertificate(1); |
|
|
|
twiceInformation.setApplyForm(1); |
|
|
|
twiceInformation.setManual(1); |
|
|
|
twiceInformation.setEnvironmentalList(1); |
|
|
|
twiceInformation.setDirverCard(1); |
|
|
|
twiceInformation.setCertificate("1"); |
|
|
|
twiceInformation.setApplyForm("1"); |
|
|
|
twiceInformation.setManual("1"); |
|
|
|
twiceInformation.setEnvironmentalList("1"); |
|
|
|
twiceInformation.setDirverCard("1"); |
|
|
|
twiceInformation.setHandoverNum("002"); |
|
|
|
twiceInformation.setTransferRemarks(informationDto.getTransferRemarks()); |
|
|
|
twiceInformation.setTransferName(informationDto.getTransferName()); |
|
|
|
@ -148,8 +154,8 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
//一次交接
|
|
|
|
BusVehicleInformation newInformation = new BusVehicleInformation(); |
|
|
|
BeanUtil.copyProperties(informationDto, newInformation, "id", "sid"); |
|
|
|
if (null == informationDto.getGasCertificate()) { |
|
|
|
newInformation.setGasCertificate(0); |
|
|
|
if (StringUtils.isBlank(informationDto.getGasCertificate())) { |
|
|
|
newInformation.setGasCertificate("0"); |
|
|
|
} |
|
|
|
//移交状态改为移交中
|
|
|
|
entity.setTransferStateKey("003"); |
|
|
|
@ -163,44 +169,55 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
newInformation.setTransferName(informationDto.getTransferName()); |
|
|
|
newInformation.setTransferRemarks(informationDto.getTransferRemarks()); |
|
|
|
newInformation.setHandoverSid(sid); |
|
|
|
if (null != fetchBySid(sid).getIsFuelVehicle()) { |
|
|
|
newInformation.setIsFuelVehicle(fetchBySid(sid).getIsFuelVehicle()); |
|
|
|
BusVehicleInformationHandover informationHandover = fetchBySid(sid); |
|
|
|
if (null != informationHandover) { |
|
|
|
if (StringUtils.isNotBlank(informationHandover.getIsFuelVehicle())) { |
|
|
|
newInformation.setIsFuelVehicle(informationHandover.getIsFuelVehicle()); |
|
|
|
} |
|
|
|
} |
|
|
|
busVehicleInformationService.insert(newInformation); |
|
|
|
BusVehicleInformation busVehicleInformation = busVehicleInformationService.fetchBySid(newInformation.getSid()); |
|
|
|
StringBuffer str = new StringBuffer(); |
|
|
|
//车钥匙
|
|
|
|
if (busVehicleInformation.getVehicleKeyNum() > 0) { |
|
|
|
Integer num = busVehicleInformation.getVehicleKeyNum(); |
|
|
|
int value = num.intValue(); |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getVehicleKeyNum())) { |
|
|
|
String vehicleKeyNum = busVehicleInformation.getVehicleKeyNum(); |
|
|
|
int value = Integer.parseInt(vehicleKeyNum); |
|
|
|
str.append("车钥匙" + value + "把、"); |
|
|
|
} |
|
|
|
//一致性证书
|
|
|
|
if (busVehicleInformation.getCertificate() > 0) { |
|
|
|
str.append("一致性证书、"); |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getCertificate())) { |
|
|
|
if (busVehicleInformation.getCertificate().equals("1")) { |
|
|
|
str.append("一致性证书、"); |
|
|
|
} |
|
|
|
} |
|
|
|
//申请表
|
|
|
|
if (busVehicleInformation.getApplyForm() > 0) { |
|
|
|
str.append("申请表、"); |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getApplyForm())) { |
|
|
|
if (busVehicleInformation.getApplyForm().equals("1")) { |
|
|
|
str.append("申请表、"); |
|
|
|
} |
|
|
|
} |
|
|
|
//保修手册、说明书
|
|
|
|
if (busVehicleInformation.getManual() > 0) { |
|
|
|
str.append("保修手册、说明书、"); |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getManual())) { |
|
|
|
if (busVehicleInformation.getManual().equals("1")) { |
|
|
|
str.append("保修手册、说明书、"); |
|
|
|
} |
|
|
|
} |
|
|
|
//环保清单
|
|
|
|
|
|
|
|
if (busVehicleInformation.getEnvironmentalList() > 0) { |
|
|
|
str.append("环保清单、"); |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getEnvironmentalList())) { |
|
|
|
if (busVehicleInformation.getEnvironmentalList().equals("1")) { |
|
|
|
str.append("环保清单、"); |
|
|
|
} |
|
|
|
} |
|
|
|
//驾驶员卡
|
|
|
|
if (busVehicleInformation.getDirverCard() > 0) { |
|
|
|
str.append("驾驶员卡、"); |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getDirverCard())) { |
|
|
|
if (busVehicleInformation.getDirverCard().equals("1")) { |
|
|
|
str.append("驾驶员卡、"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != busVehicleInformation.getGasCertificate()) { |
|
|
|
if (busVehicleInformation.getGasCertificate() > 0) { |
|
|
|
if (busVehicleInformation.getIsFuelVehicle() == 0) { |
|
|
|
str.append("气瓶检测合格证、"); |
|
|
|
} |
|
|
|
//气瓶合格证
|
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getGasCertificate())) { |
|
|
|
if (busVehicleInformation.getGasCertificate().equals("1")) { |
|
|
|
str.append("气瓶质量证明书、LNG/CNG 汽车气瓶及供气系统安装检验合格证、车用气瓶安装监督检验证书、"); |
|
|
|
} |
|
|
|
} |
|
|
|
str.delete(str.length() - 1, str.length()); |
|
|
|
@ -223,25 +240,22 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
messageFeign.pushTransferMessage(messagePushTransferDto); |
|
|
|
} |
|
|
|
List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(dto.getSid()); |
|
|
|
if (null != informationList && informationList.size() > 0) { |
|
|
|
informationList.removeAll(Collections.singleton(null)); |
|
|
|
if (!informationList.isEmpty()) { |
|
|
|
for (BusVehicleInformation busVehicleInformation : informationList) { |
|
|
|
if ("001".equals(busVehicleInformation.getHandoverNum())) { |
|
|
|
if (busVehicleInformation.getVehicleKeyNum() < 1 |
|
|
|
|| busVehicleInformation.getCertificate() < 1 |
|
|
|
|| busVehicleInformation.getApplyForm() < 1 |
|
|
|
|| busVehicleInformation.getManual() < 1 |
|
|
|
|| busVehicleInformation.getEnvironmentalList() < 1 |
|
|
|
|| busVehicleInformation.getDirverCard() < 1 |
|
|
|
if ((StringUtils.isNotBlank(busVehicleInformation.getVehicleKeyNum()) && busVehicleInformation.getVehicleKeyNum().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getCertificate()) && busVehicleInformation.getCertificate().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getManual()) && busVehicleInformation.getManual().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getApplyForm()) && busVehicleInformation.getApplyForm().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getEnvironmentalList()) && busVehicleInformation.getEnvironmentalList().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getDirverCard()) && busVehicleInformation.getDirverCard().equals("0")) |
|
|
|
) { |
|
|
|
entity.setCompleteState(0); |
|
|
|
} else { |
|
|
|
if (null != busVehicleInformation.getGasCertificate()) { |
|
|
|
if (busVehicleInformation.getGasCertificate() < 1) { |
|
|
|
if (busVehicleInformation.getIsFuelVehicle() == 0) { |
|
|
|
entity.setCompleteState(0); |
|
|
|
} else { |
|
|
|
entity.setCompleteState(1); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getGasCertificate()) && busVehicleInformation.getGasCertificate().equals("0")) { |
|
|
|
if (busVehicleInformation.getIsFuelVehicle().equals("0")) { |
|
|
|
entity.setCompleteState(0); |
|
|
|
} else { |
|
|
|
entity.setCompleteState(1); |
|
|
|
} |
|
|
|
@ -262,9 +276,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
if (null != model) { |
|
|
|
if (StringUtils.isNotBlank(model.getFuelType())) { |
|
|
|
if ("004".equals(model.getFuelType()) || "04".equals(model.getFuelType())) { |
|
|
|
entity.setIsFuelVehicle(0); |
|
|
|
entity.setIsFuelVehicle("0"); |
|
|
|
} else { |
|
|
|
entity.setIsFuelVehicle(1); |
|
|
|
entity.setIsFuelVehicle("1"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -364,31 +378,32 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
recName = vo.getRecName(); |
|
|
|
} |
|
|
|
List<BusVehicleInformation> busVehicleInformations = busVehicleInformationService.getByHandoverSid(sid); |
|
|
|
if (null != busVehicleInformations && busVehicleInformations.size() > 0) { |
|
|
|
busVehicleInformations.removeAll(Collections.singleton(null)); |
|
|
|
if (!busVehicleInformations.isEmpty()) { |
|
|
|
for (BusVehicleInformation informationServiceByHandoverSid : busVehicleInformations) { |
|
|
|
//第一次的记录编辑回显
|
|
|
|
if (times.equals("1") && informationServiceByHandoverSid.getHandoverNum().equals("001")) { |
|
|
|
BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); |
|
|
|
BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); |
|
|
|
if (null == informationServiceByHandoverSid.getApplyForm()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getApplyForm())) { |
|
|
|
informationVo.setApplyForm(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getCertificate()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getCertificate())) { |
|
|
|
informationVo.setCertificate(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getVehicleKeyNum())) { |
|
|
|
informationVo.setVehicleKeyNum(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getManual()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getManual())) { |
|
|
|
informationVo.setManual(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getEnvironmentalList()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getEnvironmentalList())) { |
|
|
|
informationVo.setEnvironmentalList(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getDirverCard()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getDirverCard())) { |
|
|
|
informationVo.setDirverCard(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getGasCertificate()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getGasCertificate())) { |
|
|
|
informationVo.setGasCertificate(""); |
|
|
|
} |
|
|
|
informationVo.setVehicleHandoverData(informationServiceByHandoverSid.getVehicleHandoverData()); |
|
|
|
@ -399,59 +414,57 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
if (times.equals("2")) { |
|
|
|
BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); |
|
|
|
BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); |
|
|
|
if (null == informationServiceByHandoverSid.getApplyForm()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getApplyForm())) { |
|
|
|
informationVo.setApplyForm(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getCertificate()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getCertificate())) { |
|
|
|
informationVo.setCertificate(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getVehicleKeyNum())) { |
|
|
|
informationVo.setVehicleKeyNum(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getManual()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getManual())) { |
|
|
|
informationVo.setManual(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getEnvironmentalList()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getEnvironmentalList())) { |
|
|
|
informationVo.setEnvironmentalList(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getDirverCard()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getDirverCard())) { |
|
|
|
informationVo.setDirverCard(""); |
|
|
|
} |
|
|
|
if (null == informationServiceByHandoverSid.getGasCertificate()) { |
|
|
|
if (StringUtils.isBlank(informationServiceByHandoverSid.getGasCertificate())) { |
|
|
|
informationVo.setGasCertificate(""); |
|
|
|
} |
|
|
|
String handoverNum = "001"; |
|
|
|
StringBuffer str = new StringBuffer(); |
|
|
|
BusVehicleInformation infor = busVehicleInformationService.selectByHandoverNumAndHandoverSid(handoverNum, sid); |
|
|
|
//车钥匙
|
|
|
|
if (infor.getVehicleKeyNum() < 1) { |
|
|
|
if (infor.getVehicleKeyNum().equals("0")) { |
|
|
|
str.append("车钥匙、"); |
|
|
|
} |
|
|
|
//一致性证书
|
|
|
|
if (infor.getCertificate() < 1) { |
|
|
|
if (infor.getCertificate().equals("0")) { |
|
|
|
str.append("一致性证书、"); |
|
|
|
} |
|
|
|
//申请表
|
|
|
|
if (infor.getApplyForm() < 1) { |
|
|
|
if (infor.getApplyForm().equals("0")) { |
|
|
|
str.append("申请表、"); |
|
|
|
} |
|
|
|
//保修手册、说明书
|
|
|
|
if (infor.getManual() < 1) { |
|
|
|
if (infor.getManual().equals("0")) { |
|
|
|
str.append("保修手册、说明书、"); |
|
|
|
} |
|
|
|
//环保清单
|
|
|
|
if (infor.getEnvironmentalList() < 1) { |
|
|
|
if (infor.getEnvironmentalList().equals("0")) { |
|
|
|
str.append("环保清单、"); |
|
|
|
} |
|
|
|
//驾驶员卡
|
|
|
|
if (infor.getDirverCard() < 1) { |
|
|
|
if (infor.getDirverCard().equals("0")) { |
|
|
|
str.append("驾驶员卡、"); |
|
|
|
} |
|
|
|
if (null != infor.getGasCertificate()) { |
|
|
|
if (infor.getGasCertificate() < 1) { |
|
|
|
if (infor.getIsFuelVehicle() == 0) { |
|
|
|
str.append("气瓶检测合格证、"); |
|
|
|
} |
|
|
|
if (infor.getGasCertificate().equals("0")) { |
|
|
|
if (infor.getIsFuelVehicle().equals("0")) { |
|
|
|
str.append("气瓶质量证明书、LNG/CNG 汽车气瓶及供气系统安装检验合格证、车用气瓶安装监督检验证书、"); |
|
|
|
} |
|
|
|
} |
|
|
|
str.delete(str.length() - 1, str.length()); |
|
|
|
@ -714,64 +727,62 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
List<AppManiFestBean> maniFestBeanList = dto.getManiFestBeanList(); |
|
|
|
for (AppManiFestBean appManiFestBean : maniFestBeanList) { |
|
|
|
if (appManiFestBean.getKey().equals("vehicLeKeyNum")) { |
|
|
|
dto.setVehicleKeyNum(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setVehicleKeyNum(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
if (appManiFestBean.getKey().equals("certificate")) { |
|
|
|
dto.setCertificate(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setCertificate(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
if (appManiFestBean.getKey().equals("applyForm")) { |
|
|
|
dto.setApplyForm(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setApplyForm(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
if (appManiFestBean.getKey().equals("manual")) { |
|
|
|
dto.setManual(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setManual(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
if (appManiFestBean.getKey().equals("environmentalList")) { |
|
|
|
dto.setEnvironmentalList(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setEnvironmentalList(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
if (appManiFestBean.getKey().equals("dirverCard")) { |
|
|
|
dto.setDirverCard(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setDirverCard(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
if (appManiFestBean.getKey().equals("gasCertificate")) { |
|
|
|
dto.setGasCertificate(Integer.parseInt(appManiFestBean.getValue())); |
|
|
|
dto.setGasCertificate(appManiFestBean.getValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getRemarks())) { |
|
|
|
dto.setTransferRemarks(dto.getRemarks()); |
|
|
|
} |
|
|
|
if (null == dto.getGasCertificate()) { |
|
|
|
dto.setGasCertificate(0); |
|
|
|
if (StringUtils.isBlank(dto.getGasCertificate())) { |
|
|
|
dto.setGasCertificate("0"); |
|
|
|
} |
|
|
|
StringBuffer str = new StringBuffer(); |
|
|
|
//车钥匙
|
|
|
|
if (dto.getVehicleKeyNum() > 0) { |
|
|
|
Integer num = dto.getVehicleKeyNum(); |
|
|
|
int value = num.intValue(); |
|
|
|
if (dto.getVehicleKeyNum().equals("1")) { |
|
|
|
int value = Integer.parseInt(dto.getVehicleKeyNum()); |
|
|
|
str.append("车钥匙" + value + "把、"); |
|
|
|
} |
|
|
|
//一致性证书
|
|
|
|
if (dto.getCertificate() > 0) { |
|
|
|
if (dto.getCertificate().equals("1")) { |
|
|
|
str.append("一致性证书、"); |
|
|
|
} |
|
|
|
//申请表
|
|
|
|
if (dto.getApplyForm() > 0) { |
|
|
|
if (dto.getApplyForm().equals("1")) { |
|
|
|
str.append("申请表、"); |
|
|
|
} |
|
|
|
//保修手册、说明书
|
|
|
|
if (dto.getManual() > 0) { |
|
|
|
str.append("保修手册、说明书、"); |
|
|
|
if (dto.getManual().equals("1")) { |
|
|
|
str.append("申请表、"); |
|
|
|
} |
|
|
|
//环保清单
|
|
|
|
|
|
|
|
if (dto.getEnvironmentalList() > 0) { |
|
|
|
if (dto.getEnvironmentalList().equals("1")) { |
|
|
|
str.append("环保清单、"); |
|
|
|
} |
|
|
|
//驾驶员卡
|
|
|
|
if (dto.getDirverCard() > 0) { |
|
|
|
if (dto.getDirverCard().equals("1")) { |
|
|
|
str.append("驾驶员卡、"); |
|
|
|
} |
|
|
|
if (dto.getGasCertificate() > 0) { |
|
|
|
if (entity.getIsFuelVehicle() == 0) { |
|
|
|
str.append("气瓶检测合格证、"); |
|
|
|
if (dto.getGasCertificate().equals("1")) { |
|
|
|
if (entity.getIsFuelVehicle().equals("0")) { |
|
|
|
str.append("气瓶质量证明书、LNG/CNG 汽车气瓶及供气系统安装检验合格证、车用气瓶安装监督检验证书、"); |
|
|
|
} |
|
|
|
} |
|
|
|
str.delete(str.length() - 1, str.length()); |
|
|
|
@ -795,24 +806,26 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
entity.setTransferStateKey("003"); |
|
|
|
entity.setTransferStateValue("移交中"); |
|
|
|
List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(dto.getSid()); |
|
|
|
if (null != informationList && informationList.size() > 0) { |
|
|
|
if (!informationList.isEmpty()) { |
|
|
|
for (BusVehicleInformation busVehicleInformation : informationList) { |
|
|
|
if ("001".equals(busVehicleInformation.getHandoverNum())) { |
|
|
|
if (busVehicleInformation.getVehicleKeyNum() < 1 |
|
|
|
|| busVehicleInformation.getCertificate() < 1 |
|
|
|
|| busVehicleInformation.getApplyForm() < 1 |
|
|
|
|| busVehicleInformation.getManual() < 1 |
|
|
|
|| busVehicleInformation.getEnvironmentalList() < 1 |
|
|
|
|| busVehicleInformation.getDirverCard() < 1 |
|
|
|
if ((StringUtils.isNotBlank(busVehicleInformation.getVehicleKeyNum()) && busVehicleInformation.getVehicleKeyNum().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getCertificate()) && busVehicleInformation.getCertificate().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getManual()) && busVehicleInformation.getManual().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getApplyForm()) && busVehicleInformation.getApplyForm().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getEnvironmentalList()) && busVehicleInformation.getEnvironmentalList().equals("0")) |
|
|
|
|| (StringUtils.isNotBlank(busVehicleInformation.getDirverCard()) && busVehicleInformation.getDirverCard().equals("0")) |
|
|
|
) { |
|
|
|
entity.setCompleteState(0); |
|
|
|
} else { |
|
|
|
if (busVehicleInformation.getGasCertificate() < 1) { |
|
|
|
if (busVehicleInformation.getIsFuelVehicle() == 0) { |
|
|
|
if (StringUtils.isNotBlank(busVehicleInformation.getGasCertificate()) && busVehicleInformation.getGasCertificate().equals("0")) { |
|
|
|
if (busVehicleInformation.getIsFuelVehicle().equals("0")) { |
|
|
|
entity.setCompleteState(0); |
|
|
|
} else { |
|
|
|
entity.setCompleteState(1); |
|
|
|
} |
|
|
|
} else { |
|
|
|
entity.setCompleteState(1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -864,31 +877,31 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
StringBuffer str = new StringBuffer(); |
|
|
|
BusVehicleInformation infor = busVehicleInformationService.selectByHandoverNumAndHandoverSid(handoverNum, sid); |
|
|
|
//车钥匙
|
|
|
|
if (infor.getVehicleKeyNum() < 1) { |
|
|
|
if (infor.getVehicleKeyNum().equals("0")) { |
|
|
|
str.append("车钥匙、"); |
|
|
|
} |
|
|
|
//一致性证书
|
|
|
|
if (infor.getCertificate() < 1) { |
|
|
|
if (infor.getCertificate().equals("0")) { |
|
|
|
str.append("一致性证书、"); |
|
|
|
} |
|
|
|
//申请表
|
|
|
|
if (infor.getApplyForm() < 1) { |
|
|
|
if (infor.getApplyForm().equals("0")) { |
|
|
|
str.append("申请表、"); |
|
|
|
} |
|
|
|
//保修手册、说明书
|
|
|
|
if (infor.getManual() < 1) { |
|
|
|
if (infor.getManual().equals("0")) { |
|
|
|
str.append("保修手册、说明书、"); |
|
|
|
} |
|
|
|
//环保清单
|
|
|
|
if (infor.getEnvironmentalList() < 1) { |
|
|
|
if (infor.getEnvironmentalList().equals("0")) { |
|
|
|
str.append("环保清单、"); |
|
|
|
} |
|
|
|
//驾驶员卡
|
|
|
|
if (infor.getDirverCard() < 1) { |
|
|
|
if (infor.getDirverCard().equals("0")) { |
|
|
|
str.append("驾驶员卡、"); |
|
|
|
} |
|
|
|
if (infor.getGasCertificate() < 1) { |
|
|
|
if (infor.getIsFuelVehicle() == 0) { |
|
|
|
if (infor.getGasCertificate().equals("0")) { |
|
|
|
if (infor.getIsFuelVehicle().equals("0")) { |
|
|
|
str.append("气瓶检测合格证、"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -927,18 +940,18 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus |
|
|
|
entity.setIsFuelVehicle(handover.getIsFuelVehicle()); |
|
|
|
entity.setHandoverSid(sid); |
|
|
|
entity.setVehicleKeyNum(information.getVehicleKeyNum()); |
|
|
|
entity.setCertificate(1); |
|
|
|
entity.setApplyForm(1); |
|
|
|
entity.setManual(1); |
|
|
|
entity.setEnvironmentalList(1); |
|
|
|
entity.setDirverCard(1); |
|
|
|
entity.setCertificate("1"); |
|
|
|
entity.setApplyForm("1"); |
|
|
|
entity.setManual("1"); |
|
|
|
entity.setEnvironmentalList("1"); |
|
|
|
entity.setDirverCard("1"); |
|
|
|
entity.setTransferSid(dto.getUserSid()); |
|
|
|
entity.setReceiverSid(receiverSid); |
|
|
|
entity.setRecName(handover.getRecName()); |
|
|
|
if (entity.getIsFuelVehicle() == 0) { |
|
|
|
entity.setGasCertificate(1); |
|
|
|
if (entity.getIsFuelVehicle().equals("0")) { |
|
|
|
entity.setGasCertificate("1"); |
|
|
|
} else { |
|
|
|
entity.setGasCertificate(0); |
|
|
|
entity.setGasCertificate("0"); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getUserSid())) { |
|
|
|
SysUserInfoVo data = sysUserFeign.selectUserInfoByUserSid(dto.getUserSid()).getData(); |
|
|
|
|
