diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppInformationHandoverInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppInformationHandoverInfoVo.java index 9883dba5a0..ee3006fdfa 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppInformationHandoverInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppInformationHandoverInfoVo.java @@ -17,6 +17,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class AppInformationHandoverInfoVo implements Vo { + private Integer isFuelVehicle; private String sid; private String contractId; private String customerName; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppSaveDataDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppSaveDataDto.java index 153e48efbd..a7c4ed2ded 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppSaveDataDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppSaveDataDto.java @@ -29,7 +29,7 @@ public class AppSaveDataDto implements Dto { private String modelSid; private String modelOrgPath; private List maniFestBeanList; - + private String orgPath; @ApiModelProperty("车钥匙个数") private Integer vehicleKeyNum; // 车钥匙个数 @ApiModelProperty("一致性证书0无1有") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppTwoDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppTwoDto.java index 4353651adb..a9e8f5fc7d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppTwoDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/AppTwoDto.java @@ -21,4 +21,5 @@ public class AppTwoDto implements Dto { private String modelSid; private String modelOrgPath; private String docs; + private String orgPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java index 180d345930..e08a05cb65 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java @@ -36,5 +36,4 @@ public class BusVehicleInformationHandoverDetailsVo implements Vo { private String recName; // 接收人 @ApiModelProperty("随车资料") private BusVehicleInformationVo busVehicleInformation; - } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml index 59f8c0f168..83c5775b3a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml @@ -95,7 +95,8 @@ model, contractNo as contractId, customerName, - remarks + remarks, + isFuelVehicle FROM bus_vehicle_information_handover where sid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index ee2877faa5..56a1b2c2dc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -148,6 +148,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService())); list.add(new AppManiFestBean(0, "环保清单", "environmentalList", "", new ArrayList<>())); list.add(new AppManiFestBean(0, "驾驶员卡", "dirverCard", "", new ArrayList<>())); - list.add(new AppManiFestBean(0, "气瓶产品质量证明书(燃气车)", "gasCertificate", "", new ArrayList<>())); + if (vo.getIsFuelVehicle() == 0) { + list.add(new AppManiFestBean(0, "气瓶产品质量证明书(燃气车)", "gasCertificate", "", new ArrayList<>())); + } vo.setManiFestBeanList(list); return rb.success().setData(vo); } @@ -696,7 +701,7 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService maniFestBeanList = dto.getManiFestBeanList(); for (AppManiFestBean appManiFestBean : maniFestBeanList) { @@ -725,6 +730,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService 0) { @@ -797,8 +805,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService informations = busVehicleInformationService.getByHandoverSid(sid); if (informations.size() == 1) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/BusTwoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/BusTwoDto.java index a7826b994e..0e7859ae7a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/BusTwoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/BusTwoDto.java @@ -21,4 +21,5 @@ public class BusTwoDto implements Dto { private String modelSid; private String modelOrgPath; private String docs; + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/SaveDataDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/SaveDataDto.java index e15102e24d..6c3fdd83ae 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/SaveDataDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/SaveDataDto.java @@ -28,6 +28,6 @@ public class SaveDataDto implements Dto { private String modelSid; private String modelOrgPath; private List maniFestBeanList; - + private String orgPath; }