交车准备

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java

@@ -150,8 +150,8 @@ public interface BusHandoverPrepareFeign {
     ResultBean<HandoverInformationVo> getVehicleInformationInfo(@RequestParam("sid") String sid);
 
     @ApiOperation("随车资料确认")
-    @PostMapping("/updateVehicleInformation")
+    @PostMapping("/saveHandoverMaterials")
     @ResponseBody
-    ResultBean updateVehicleInformation(@RequestParam("sid") String sid);
+    ResultBean updateVehicleInformation(@RequestBody MaterialsQuery query);
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java

@@ -150,7 +150,7 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 	}
 
 	@Override
-	public ResultBean updateVehicleInformation(String sid) {
+	public ResultBean updateVehicleInformation(MaterialsQuery query) {
 		return null;
 	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/MaterialsQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 随车资料确认
+ * @author: dimengzhe
+ * @date: 2023/6/8
+ **/
+@Data
+public class MaterialsQuery implements Query {
+    private static final long serialVersionUID = 2110084784614541807L;
+
+    private String sid;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+
+    @ApiModelProperty("交车准备车辆sid")
+    private String busSid;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.MaterialsQuery;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.RemarkDto;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.common.core.query.PagerQuery;
@@ -176,7 +177,7 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
     }
 
     @Override
-    public ResultBean updateVehicleInformation(String sid) {
-        return busHandoverPrepareService.updateVehicleInformation(sid);
+    public ResultBean updateVehicleInformation(MaterialsQuery query) {
+        return busHandoverPrepareService.updateVehicleInformation(query);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -278,7 +278,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         String sid = query.getSid();
         AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo();
         BusHandoverPrepare busHandoverPrepare = fetchBySid(sid);
-        if(busHandoverPrepare == null){
+        if (busHandoverPrepare == null) {
             return rb.setMsg("该交车准备记录不存在");
         }
         BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo);
@@ -320,6 +320,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             vo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
             vo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
             vo.setInvoiceType(finVehicleInvoice.getInvoiceType());
+            vo.setInvoicingName(finVehicleInvoice.getInvoicingName());
             vo.setDrawer(finVehicleInvoice.getDrawer());
             if (finVehicleInvoice.getInvoiceDate() != null) {
                 vo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(), "yyyy-MM-dd"));
@@ -329,6 +330,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 vo.setInvoiceImages(filePathList);
             }
         }
+        vo.setVinNo(busHandoverPrepareVehicle.getVinNo());
         vo.setSid(busHandoverPrepareVehicle.getVinSid());
         return rb.success().setData(vo);
     }
@@ -370,7 +372,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     public ResultBean<AppPolicyInfoVo> getPolicyInfo(AppPolicyInfoQuery query) {
         ResultBean<AppPolicyInfoVo> rb = new ResultBean<>();
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
-        if(busHandoverPrepareVehicle == null){
+        if (busHandoverPrepareVehicle == null) {
             return rb.setMsg("该交车准备的车辆记录不存在");
         }
         AppPolicyInfoVo vo = new AppPolicyInfoVo();
@@ -404,7 +406,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     public ResultBean savePolicyInfo(AppPolicyDto dto) {
         ResultBean rb = new ResultBean<>();
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
-        if(busHandoverPrepareVehicle == null){
+        if (busHandoverPrepareVehicle == null) {
             return rb.setMsg("该交车准备车辆记录不存在");
         }
         busHandoverPrepareVehicle.setPolicyState(1);
@@ -433,7 +435,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     public ResultBean<AppOtherDataInfoVo> getOtherDataInfo(AppOtherDataInfoQuery query) {
         ResultBean<AppOtherDataInfoVo> rb = new ResultBean<>();
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
-        if(busHandoverPrepareVehicle == null){
+        if (busHandoverPrepareVehicle == null) {
             return rb.setMsg("该交车准备的车辆记录不存在");
         }
         AppOtherDataInfoVo vo = new AppOtherDataInfoVo();
@@ -463,7 +465,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         }
         //修改该车辆的状态
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
-        if(busHandoverPrepareVehicle == null){
+        if (busHandoverPrepareVehicle == null) {
             return rb.setMsg("该交车准备的车辆记录不存在");
         }
         busHandoverPrepareVehicle.setOtherDataState(1);
@@ -596,17 +598,17 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         if (busVehicleInformationHandover != null) {
             List<BusVehicleInformation> busVehicleInformationList = busVehicleInformationService.selectByMainSids(busVehicleInformationHandover.getSid());
             busVehicleInformationList.removeAll(Collections.singleton(null));
-            if(busVehicleInformationList.isEmpty()){
+            if (busVehicleInformationList.isEmpty()) {
                 return rb.setMsg("该交车准备的车辆信息的随车资料未准备好");
-            }else{
+            } else {
                 //根据随车资料主表sid查询随车资料的记录
                 List<HandoverInformationIntemVo> list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
                 list.removeAll(Collections.singleton(null));
                 for (int i = 0; i < list.size(); i++) {
                     HandoverInformationIntemVo handoverInformationIntemVo = list.get(i);
-                    if(StringUtils.isNotBlank(handoverInformationIntemVo.getRecTime())){
+                    if (StringUtils.isNotBlank(handoverInformationIntemVo.getRecTime())) {
                         handoverInformationIntemVo.setShowBtn(false);
-                    }else{
+                    } else {
                         handoverInformationIntemVo.setShowBtn(true);
                     }
                 }
@@ -619,24 +621,41 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     /**
      * 随车资料确认
      *
-     * @param sid
      * @return
      */
-    public ResultBean updateVehicleInformation(String sid) {
+    public ResultBean updateVehicleInformation(MaterialsQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid);
-        BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
-        if (busVehicleInformationHandover != null) {
-            //根据随车资料主表sid查询随车资料的记录
-            busVehicleInformationService.updateDate(busVehicleInformationHandover.getSid(), new Date());
+        String sid = query.getSid();
+        String remarks = query.getRemarks();
+        boolean isTrue = false;
+        BusVehicleInformation busVehicleInformation = busVehicleInformationService.fetchBySid(sid);
+        if(busVehicleInformation != null){
+            busVehicleInformation.setRecTime(new Date());
+            if(StringUtils.isNotBlank(remarks)){
+                busVehicleInformation.setRemarks(remarks);
+            }
+            busVehicleInformationService.updateById(busVehicleInformation);
+            BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.fetchBySid(busVehicleInformation.getHandoverSid());
+            if(busVehicleInformationHandover.getCompleteState() == 1){//已完成
+                isTrue = true;
+            }
+            busVehicleInformationHandover.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode());
+            busVehicleInformationHandover.setTransferStateValue(CertificState.TransferState.TRANSTATE_YYJ.getRemarks());
+            busVehicleInformationHandoverService.updateById(busVehicleInformationHandover);
         }
+        if(isTrue){//若已完成，则更新状态为已确认
+            BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getBusSid());
+            busHandoverPrepareVehicle.setOnBoardDataState(1);
+            busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
+        }
+
         return rb.success();
     }
 
     public ResultBean saveRemarks(RemarkDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
-        if(busHandoverPrepareVehicle == null){
+        if (busHandoverPrepareVehicle == null) {
             return rb.setMsg("该记录不存在");
         }
         busHandoverPrepareVehicle.setRemarks(dto.getRemarks());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java

@@ -22,7 +22,5 @@ public interface BusVehicleInformationMapper extends BaseMapper<BusVehicleInform
 
     List<HandoverInformationIntemVo> selectByMainSid(String sid);
 
-    int selectByMainSidUpdate(@Param("sid") String sid, @Param("date") Date date);
-
     List<BusVehicleInformation> selectByMainSids(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml

@@ -24,10 +24,6 @@
         select sid,vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime from bus_vehicle_information where handoverSid = #{sid}
     </select>
 
-    <select id="selectByMainSidUpdate" resultType="int">
-        update bus_vehicle_information set recTime = #{date} where handoverSid = #{sid}
-    </select>
-
     <select id="selectByMainSids" resultType="com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation">
         select * from bus_vehicle_information where handoverSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java

@@ -28,10 +28,6 @@ public class BusVehicleInformationService extends MybatisBaseService<BusVehicleI
         return baseMapper.selectByMainSid(sid);
     }
 
-    public int updateDate(String sid, Date date) {
-        return baseMapper.selectByMainSidUpdate(sid, date);
-    }
-
     public List<BusVehicleInformation> selectByMainSids(String sid) {
         return baseMapper.selectByMainSids(sid);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java

@@ -20,7 +20,7 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
 
     BusVehicleInformationHandover selectByVehicleSid(@Param("vehicleSid") String vehicleSid);
 
-    BusVehicleInformationHandover getVehicleInformationInfo(String sid);
+    BusVehicleInformationHandover getVehicleInformationInfo(@Param("sid") String sid);
 
     BusVehicleInformationHandover detailsByVinSid(@Param("sid")String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -37,7 +37,7 @@
 
     <select id="getVehicleInformationInfo"
             resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover">
-        select * from bus_vehicle_information_handover where vehicleSid = #{sid}
+        select * from bus_vehicle_information_handover where vehicleSid = #{sid} order by id desc limit 1
     </select>
     <select id="detailsByVinSid"
             resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover">

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java

@@ -130,4 +130,9 @@ public interface AppBusHandoverPrepareFeign {
     @ResponseBody
     ResultBean saveState(@RequestBody StateDateDto dto);
 
+    @ApiOperation("随车资料确认")
+    @PutMapping("/saveHandoverMaterials")
+    @ResponseBody
+    ResultBean saveHandoverMaterials(@RequestBody HandoverMaterialsQuery query);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeignFallback.java

@@ -122,5 +122,10 @@ public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepare
         return null;
     }
 
+    @Override
+    public ResultBean saveHandoverMaterials(HandoverMaterialsQuery query) {
+        return null;
+    }
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverMaterialsQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 随车资料确认
+ * @author: dimengzhe
+ * @date: 2023/6/8
+ **/
+@Data
+public class HandoverMaterialsQuery implements Query {
+    private static final long serialVersionUID = 1951770923300861771L;
+    @ApiModelProperty("随车资料交接记录sid")
+    private String sid;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("交车准备车辆sid")
+    private String busSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/VehicleListInfo.java

@@ -26,6 +26,7 @@ public class VehicleListInfo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("交接日期")
+    @JsonProperty("date")
     private String recTime;
 
     private String sid;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareRest.java

@@ -130,4 +130,9 @@ public class AppBusHandoverPrepareRest implements AppBusHandoverPrepareFeign {
         return appBusHandoverPrepareService.saveState(dto);
     }
 
+    @Override
+    public ResultBean saveHandoverMaterials(HandoverMaterialsQuery query) {
+        return appBusHandoverPrepareService.saveHandoverMaterials(query);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

@@ -30,6 +30,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.MaterialsQuery;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.RemarkDto;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.*;
@@ -222,4 +223,11 @@ public class AppBusHandoverPrepareService {
         ResultBean resultBean = busHandoverPrepareFeign.saveState(appStateDateDto);
         return resultBean;
     }
+
+    public ResultBean saveHandoverMaterials(HandoverMaterialsQuery query) {
+        MaterialsQuery materialsQuery = new MaterialsQuery();
+        BeanUtil.copyProperties(query,materialsQuery);
+        ResultBean resultBean = busHandoverPrepareFeign.updateVehicleInformation(materialsQuery);
+        return resultBean;
+    }
 }