Merge remote-tracking branch 'origin/master'

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;

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<AppManiFestBean> maniFestBeanList;
-
+    private String orgPath;
     @ApiModelProperty("车钥匙个数")
     private Integer vehicleKeyNum; // 车钥匙个数
     @ApiModelProperty("一致性证书0无1有")

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;
 }

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;
-
 }

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}
     </select>

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<Bus
                 //一次交接
                 BusVehicleInformation newInformation = new BusVehicleInformation();
                 BeanUtil.copyProperties(informationDto, newInformation, "id", "sid");
+                if (null == informationDto.getGasCertificate()) {
+                    newInformation.setGasCertificate(0);
+                }
                 //移交状态改为移交中
                 entity.setTransferStateKey("003");
                 entity.setTransferStateValue("移交中");
@@ -679,7 +682,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         list.add(new AppManiFestBean(0, "保修手册、说明书", "manual", "", new ArrayList<>()));
         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<Bus
         BusVehicleInformationHandover entity = fetchBySid(sid);
         String receiverSid = entity.getReceiverSid();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
-        String orgPath = sysUserVo.getOrgSidPath();
+        String orgPath = dto.getOrgPath();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         List<AppManiFestBean> maniFestBeanList = dto.getManiFestBeanList();
         for (AppManiFestBean appManiFestBean : maniFestBeanList) {
@@ -725,6 +730,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         if (StringUtils.isNotBlank(dto.getRemarks())) {
             dto.setTransferRemarks(dto.getRemarks());
         }
+        if (null == dto.getGasCertificate()) {
+            dto.setGasCertificate(0);
+        }
         StringBuffer str = new StringBuffer();
         //车钥匙
         if (dto.getVehicleKeyNum() > 0) {
@@ -797,8 +805,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                             } else {
                                 entity.setCompleteState(1);
                             }
-                        } else {
-                            entity.setCompleteState(1);
                         }
                     }
                 }
@@ -902,7 +908,7 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         BusVehicleInformationHandover handover = fetchBySid(sid);
         String receiverSid = handover.getReceiverSid();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
-        String orgPath = sysUserVo.getOrgSidPath();
+        String orgPath = dto.getOrgPath();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         List<BusVehicleInformation> informations = busVehicleInformationService.getByHandoverSid(sid);
         if (informations.size() == 1) {

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;
 }

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<ManiFestBean> maniFestBeanList;
-
+    private String orgPath;
 
 }