Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -144,10 +144,15 @@ public interface BaseVehicleCertificateFeign {
     @ApiOperation("交车准备获取合格证信息")
     @GetMapping("/getCertificateInfo")
     @ResponseBody
-    ResultBean<HandoverCertVo> getCertificateInfoOne(@RequestParam("vinSid") String vinSid, @RequestParam("useOrgSid") String useOrgSid);
+    ResultBean<HandoverCertVo> getCertificateInfoOne(@RequestParam("vinSid") String vinSid);
 
     @ApiOperation("合格证移交")
     @PostMapping("/certificateYJ")
     @ResponseBody
     ResultBean certificateYJ(@RequestBody BaseVehicleCertificatePushTransferDto dto);
+
+    @ApiOperation("修改合格证的移交状态")
+    @PostMapping("/updateYjState")
+    @ResponseBody
+    ResultBean updateYjState(@RequestBody CertificateStateQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -83,7 +83,7 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
     }
 
     @Override
-    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid, String useOrgSid) {
+    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) {
         return null;
     }
 
@@ -92,4 +92,9 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
         return null;
     }
 
+    @Override
+    public ResultBean updateYjState(CertificateStateQuery query) {
+        return null;
+    }
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/CertificateStateQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basevehiclecertificate;
+
+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 CertificateStateQuery implements Query {
+    private static final long serialVersionUID = 616878382918214702L;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("移交状态key")
+    private String transferStateKey;
+    @ApiModelProperty("移交状态value")
+    private String transferStateValue;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -101,8 +101,10 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
 
     int updateCertificate(@Param("dto") CertificateDto dto);
 
-    HandoverCertVo getCertificateInfoOne(@Param("vinSid") String vinSid, @Param("useOrgSid") String useOrgSid);
+    HandoverCertVo getCertificateInfoOne(@Param("vinSid") String vinSid);
 
     @Update("update base_vehicle_certificate set transferStateKey = #{tranKey},transferStateValue = #{tranValue} where sid = #{sid}")
     void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue);
+
+    BaseVehicleCertificate selectByVinSid(String vinSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -272,6 +272,11 @@
     </update>
 
     <select id="getCertificateInfoOne" resultType="com.yxt.anrui.base.api.basevehiclecertificate.HandoverCertVo">
-        select vinNo,carModel,certificationNo, DATE_FORMAT(certificateDate, '%Y-%m-%d') as certificateDate,certificatePhoto from base_vehicle_certificate where vehicleSid = #{vinSid} and useOrgSid = #{useOrgSid}
+        select vinNo,carModel,certificationNo, DATE_FORMAT(certificateDate, '%Y-%m-%d') as certificateDate,certificatePhoto
+        from base_vehicle_certificate where vehicleSid = #{vinSid} order by id desc limit 1
+    </select>
+
+    <select id="selectByVinSid" resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate">
+        select * from base_vehicle_certificate where vehicleSid = #{vinSid} order by id limit 1
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -5,7 +5,6 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -305,8 +304,8 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
     }
 
     @Override
-    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid, String useOrgSid) {
-        return baseVehicleCertificateService.getCertificateInfoOne(vinSid, useOrgSid);
+    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) {
+        return baseVehicleCertificateService.getCertificateInfoOne(vinSid);
     }
 
     @Override
@@ -314,6 +313,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         return baseVehicleCertificateService.certificateYJ(dto);
     }
 
+    @Override
+    public ResultBean updateYjState(CertificateStateQuery query) {
+        return baseVehicleCertificateService.updateYjState(query);
+    }
+
    /* @Override
     public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
         return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -246,9 +246,9 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         return rb;
     }
 
-    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid, String useOrgSid) {
+    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) {
         ResultBean<HandoverCertVo> rb = ResultBean.fireFail();
-        HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid,useOrgSid);
+        HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid);
         if(handoverCertVo != null){
             if(StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())){
                 List<String> photoList = Arrays.asList(handoverCertVo.getCertificatePhoto().split(","));
@@ -327,4 +327,15 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         }
         return rb.success();
     }
+
+    public ResultBean updateYjState(CertificateStateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleCertificate baseVehicleCertificate = baseMapper.selectByVinSid(query.getVinSid());
+        if(baseVehicleCertificate != null){
+            baseVehicleCertificate.setTransferStateKey(query.getTransferStateKey());
+            baseVehicleCertificate.setTransferStateValue(query.getTransferStateValue());
+            baseMapper.updateById(baseVehicleCertificate);
+        }
+        return rb.success();
+    }
 }

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

@@ -89,10 +89,10 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
 
-/*    @ApiOperation("修改交车准备 各资料状态修改")
+    @ApiOperation("发票、合格证确认")
     @PutMapping("/saveState")
     @ResponseBody
-    ResultBean saveState(@RequestBody AppStateDateDto dto);*/
+    ResultBean saveState(@RequestBody AppStateDateDto dto);
 
     @ApiOperation("交车准备的发票信息")
     @GetMapping("/getInvoiceInfo")

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

@@ -84,6 +84,11 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean saveState(AppStateDateDto dto) {
+		return null;
+	}
+
 	/*@Override
 	public ResultBean saveState(AppStateDateDto dto) {
 		return null;

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

@@ -22,4 +22,8 @@ public class HandoverInformationIntemVo {
     @ApiModelProperty("交接日期")
     private String recTime;
 
+    private String sid;
+    @ApiModelProperty("确认按钮的展示")
+    private boolean showBtn;
+
 }

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

@@ -23,6 +23,15 @@ public class HandoverInformationVo {
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("交接记录")
-    private List<HandoverInformationIntemVo> itemList = new ArrayList<>();
+    private List<HandoverInformationIntemVo> recordList = new ArrayList<>();
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("出库申请创建人的的orgPath")
+    private String orgPath;
+
+    private String sid;
 
 }

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

@@ -8,8 +8,8 @@ import lombok.Data;
 public class AppCertificateInfoQuery implements Query {
     private static final long serialVersionUID = -2859982455028825375L;
 
-    @ApiModelProperty("车架号")
-    private String vin;
+   /* @ApiModelProperty("车架号")
+    private String vin;*/
     @ApiModelProperty("用户sid")
     private String userSid;
     private String sid;

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

@@ -10,8 +10,10 @@ public class AppStateDateDto implements Dto {
 
     @ApiModelProperty("sid")
     private String sid;
-    @ApiModelProperty("车架号")
-    private String vin;
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态值:01 保存发票接收状态 02合格证接收状态")
     private String key;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("接收备注")
+    private String remarks;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java

@@ -35,4 +35,6 @@ public class AppBusHandoverPrepareVehicleInfoVo implements Vo {
     @ApiModelProperty("其他资料状态")
     private boolean otherDataState; // 其他资料状态
 
+    private String remarks;
+
 }

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

@@ -115,6 +115,11 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
         return busHandoverPrepareService.getDeliveryPlanInfo(query);
     }
 
+    @Override
+    public ResultBean saveState(AppStateDateDto dto) {
+        return busHandoverPrepareService.saveState(dto);
+    }
+
    /* @Override
     public ResultBean saveState(AppStateDateDto dto) {
         return busHandoverPrepareService.saveState(dto);

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

@@ -32,7 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.CertificateStateQuery;
 import com.yxt.anrui.base.api.basevehiclecertificate.HandoverCertVo;
+import com.yxt.anrui.base.common.enums.CertificState;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
@@ -53,6 +55,7 @@ import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInfor
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.StateUpdateQuery;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -274,6 +277,9 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         String sid = query.getSid();
         AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo();
         BusHandoverPrepare busHandoverPrepare = fetchBySid(sid);
+        if(busHandoverPrepare == null){
+            return rb.setMsg("该交车准备记录不存在");
+        }
         BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo);
         List<AppBusHandoverPrepareVehicleInfoVo> list = busHandoverPrepareVehicleService.selByMainSid(sid);
         appBusHandoverPrepareInfoVo.setCarDataList(list);
@@ -359,9 +365,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
             vo.setRemarks(busTransferRecords.getReceiveRemarks());
         }
-        ResultBean<HandoverCertVo> resultBean = baseVehicleCertificateFeign.getCertificateInfoOne(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getUseOrgSid());
+        ResultBean<HandoverCertVo> resultBean = baseVehicleCertificateFeign.getCertificateInfoOne(busHandoverPrepareVehicle.getVinSid());
         HandoverCertVo handoverCertVo = resultBean.getData();
         BeanUtil.copyProperties(handoverCertVo, vo);
+        vo.setVinNo(busHandoverPrepareVehicle.getVinNo());
         return rb.success().setData(vo);
     }
 
@@ -373,6 +380,10 @@ 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){
+            return rb.setMsg("该交车准备的车辆记录不存在");
+        }
         AppPolicyInfoVo vo = new AppPolicyInfoVo();
         List<String> policyList = new ArrayList<>();// 保单照片
         List<String> licenceList = new ArrayList<>();// 临时牌照
@@ -405,6 +416,12 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      */
     public ResultBean savePolicyInfo(AppPolicyDto dto) {
         ResultBean rb = new ResultBean<>();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
+        if(busHandoverPrepareVehicle == null){
+            return rb.setMsg("该交车准备车辆记录不存在");
+        }
+        busHandoverPrepareVehicle.setPolicyState(1);
+        busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
         List<String> policyList = dto.getPolicyList();
         if (!policyList.isEmpty()) {
@@ -428,11 +445,15 @@ 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){
+            return rb.setMsg("该交车准备的车辆记录不存在");
+        }
         AppOtherDataInfoVo vo = new AppOtherDataInfoVo();
         List<BuscenterFile> otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
         otherFiles.removeAll(Collections.singleton(null));
         List<String> otherInfo = new ArrayList<>();
-        if(!otherFiles.isEmpty()){
+        if (!otherFiles.isEmpty()) {
             for (BuscenterFile file : otherFiles) {
                 otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
             }
@@ -453,10 +474,17 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         if (dto.getOtherInfo().isEmpty()) {
             return rb.setMsg("其他资料图片为必填项");
         }
+        //修改该车辆的状态
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
+        if(busHandoverPrepareVehicle == null){
+            return rb.setMsg("该交车准备的车辆记录不存在");
+        }
+        busHandoverPrepareVehicle.setOtherDataState(1);
+        busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
         List<String> otherInfoList = dto.getOtherInfo();
-        if(!otherInfoList.isEmpty()){
-            otherInfoList = otherInfoList.stream().map(v->v.replaceAll(fileUploadComponent.getUrlPrefix(),"")).collect(Collectors.toList());
+        if (!otherInfoList.isEmpty()) {
+            otherInfoList = otherInfoList.stream().map(v -> v.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList());
             buscenterFile.saveAll(dto.getSid(), otherInfoList, BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
         }
         return rb.success();
@@ -568,16 +596,20 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         ResultBean<HandoverInformationVo> rb = ResultBean.fireFail();
         HandoverInformationVo handoverInformationVo = new HandoverInformationVo();
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid);
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
+        handoverInformationVo.setModelSid(busHandoverPrepare.getModelSid());
+        handoverInformationVo.setModel(busHandoverPrepare.getModel());
+        handoverInformationVo.setConfigSid(busHandoverPrepare.getConfigSid());
+        handoverInformationVo.setOrgPath(busHandoverPrepare.getOrgSidPath());
+        handoverInformationVo.setCustomerName(busHandoverPrepare.getCustomerName());
+        handoverInformationVo.setContractNo(busHandoverPrepare.getContractNo());
+        handoverInformationVo.setSid(busHandoverPrepareVehicle.getSid());
         BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
         if (busVehicleInformationHandover != null) {
-            handoverInformationVo.setContractNo(busVehicleInformationHandover.getContractNo());
-            handoverInformationVo.setCustomerName(busVehicleInformationHandover.getCustomerName());
-            handoverInformationVo.setVinNo(busVehicleInformationHandover.getVinNo());
-            handoverInformationVo.setModel(busVehicleInformationHandover.getModel());
             //根据随车资料主表sid查询随车资料的记录
             List<HandoverInformationIntemVo> list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
             list.removeAll(Collections.singleton(null));
-            handoverInformationVo.setItemList(list);
+            handoverInformationVo.setRecordList(list);
         }
         return rb.success().setData(handoverInformationVo);
     }
@@ -600,6 +632,57 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     }
 
     public ResultBean saveRemarks(RemarkDto dto) {
-        return null;
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
+        if(busHandoverPrepareVehicle == null){
+            return rb.setMsg("该记录不存在");
+        }
+        busHandoverPrepareVehicle.setRemarks(dto.getRemarks());
+        busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
+        return rb.success();
+    }
+
+    public ResultBean saveState(AppStateDateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(dto.getSid());
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
+        if ("01".equals(dto.getKey())) {
+            //发票确认：确认时更新接收记录的接收日期及接收备注，如果发票移交状态为移交中的，则更新为已移交。
+            busHandoverPrepareVehicle.setInvoicingState(1);
+            //根据车辆sid查询移交记录
+            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.FP.getCode());
+            if (busTransferRecordsResultBean.getData() != null) {
+                BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
+                busTransferRecords.setReceiveRemarks(dto.getRemarks());
+                busTransferRecords.setReceiveTime(new Date());
+                busTransferRecordsService.updateById(busTransferRecords);
+            }
+            //更新发票的移交状态为已移交
+            StateUpdateQuery stateUpdateQuery = new StateUpdateQuery();
+            stateUpdateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid());
+            stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks());
+            stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode());
+            finVehicleInvoiceFeign.updateYjState(stateUpdateQuery);
+
+        } else if ("02".equals(dto.getKey())) {
+            //合格证确认：确认接收后，修改合格证的移交状态为已移交。
+            busHandoverPrepareVehicle.setCertificateState(1);
+            //根据车辆sid查询移交记录
+            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.HGZ.getCode());
+            if (busTransferRecordsResultBean.getData() != null) {
+                BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
+                busTransferRecords.setReceiveRemarks(dto.getRemarks());
+                busTransferRecords.setReceiveTime(new Date());
+                busTransferRecordsService.updateById(busTransferRecords);
+            }
+            //修改合格证的移交状态为已移交
+            CertificateStateQuery certificateStateQuery = new CertificateStateQuery();
+            certificateStateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid());
+            certificateStateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode());
+            certificateStateQuery.setTransferStateValue(CertificState.TransferState.TRANSTATE_YYJ.getRemarks());
+            baseVehicleCertificateFeign.updateYjState(certificateStateQuery);
+        }
+        busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
+        return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml

@@ -28,7 +28,8 @@
         certificateState,
         policyState,
         onBoardDataState,
-        otherDataState
+        otherDataState,
+        remarks
         from bus_handover_prepare_vehicle
         where mainSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java

@@ -28,7 +28,6 @@ package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppStateDateDto;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -141,7 +140,7 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
         return list;
     }
 
-    public void saveState(AppStateDateDto dto) {
+   /* public void saveState(AppStateDateDto dto) {
         String sid = dto.getSid();
         String key = dto.getKey();
         String vin = dto.getVin();
@@ -161,7 +160,7 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
             baseMapper.saveOtherDataState(sid, vin);
         }
 
-    }
+    }*/
 
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -43,7 +43,7 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
             if (pagerQuery.getType() == 0) {
                 qw.eq("receiveState", 0);
             } else if (pagerQuery.getType() == 1) {
-                qw.eq("receiveState", 0);
+                qw.eq("receiveState", 1);
                 //接收开始时间-接收结束时间
                 qw.apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeStart()), "date_format (receiveTime,'%Y-%m-%d') >= date_format('" + pagerQuery.getReceiveTimeStart() + "','%Y-%m-%d')").
                         apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeEnd()), "date_format (receiveTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getReceiveTimeEnd() + "','%Y-%m-%d')"

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

@@ -21,7 +21,7 @@
     </select>
 
     <select id="selectByMainSid" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo">
-        select vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime from bus_vehicle_information where handoverSid = #{sid}
+        select sid,vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime,ifnull(DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime,true,false) as showBtn from bus_vehicle_information where handoverSid = #{sid}
     </select>
 
     <select id="selectByMainSidUpdate" resultType="int">

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@@ -103,4 +103,9 @@ public interface FinVehicleInvoiceFeign {
     @PostMapping("/selectByContractNo")
     @ResponseBody
     ResultBean<List<FinVehicleInvoice>> selectByContractNo(@RequestParam("contractNo")String contractNo);
+
+    @ApiOperation("修改发票的移交状态")
+    @PostMapping("/updateYjState")
+    @ResponseBody
+    ResultBean updateYjState(@RequestBody StateUpdateQuery query);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@@ -114,4 +114,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean updateYjState(StateUpdateQuery query) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/StateUpdateQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.fin.api.finvehicleinvoice;
+
+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 StateUpdateQuery implements Query {
+    private static final long serialVersionUID = 1219199154491297819L;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("移交状态key")
+    private String transferStateKey;
+    @ApiModelProperty("移交状态value")
+    private String transferState;
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -804,7 +804,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (!receiveSeleteVoList.isEmpty()) {
             for (int i = 0; i < receiveSeleteVoList.size(); i++) {
                 ReceiveSeleteVo receiveSeleteVo = receiveSeleteVoList.get(i);
-                BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll()));
+                BigDecimal subscriptionMoneyAll = BigDecimal.ZERO;
+                if(StringUtils.isNotBlank(receiveSeleteVo.getSubscriptionMoneyAll())){
+                    subscriptionMoneyAll = new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll());
+                }
+                BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(subscriptionMoneyAll);
                 receiveSeleteVo.setNotSubscriptionMoney(notSubscriptionMoney.toString());
             }
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@@ -1,7 +1,5 @@
 package com.yxt.anrui.fin.biz.finvehicleinvoice;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.yxt.anrui.fin.api.finvehicleinvoice.*;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -232,4 +230,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
         return finVehicleInvoiceService.selectByContractNo(contractNo);
     }
 
+    @Override
+    public ResultBean updateYjState(StateUpdateQuery query) {
+        return finVehicleInvoiceService.updateYjState(query);
+    }
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
-import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
@@ -513,4 +512,15 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         }
         return new ResultBean().success();
     }
+
+    public ResultBean updateYjState(StateUpdateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinSid(query.getVinSid());
+        if(finVehicleInvoice != null){
+            finVehicleInvoice.setTransferState(query.getTransferState());
+            finVehicleInvoice.setTransferStateKey(query.getTransferStateKey());
+            baseMapper.updateById(finVehicleInvoice);
+        }
+        return rb.success();
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -1213,7 +1213,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ScmVehicleGression scmVehicleGression = fetchBySid(query.getBusinessSid());
         String businessTaskId = scmVehicleGression.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if (businessTaskId.equals(query.getTaskId())) {
+            if(query.getUserSid().equals(scmVehicleGression.getCreateBySid())){
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -1224,7 +1224,21 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 //清除临时车辆表状态
                 baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
                 return rb.success().setData(resultBean.getData());
+            }else{
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                    //清除临时车辆表状态
+                    baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
+                    return rb.success().setData(resultBean.getData());
+                }
             }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }

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

@@ -120,4 +120,14 @@ public interface AppBusHandoverPrepareFeign {
     @ResponseBody
     ResultBean submitDeliveryPlanInfo(@RequestBody HandoverPrepareDto dto);
 
+    @ApiOperation("获取随车资料信息")
+    @GetMapping("/getCarDataInfo")
+    @ResponseBody
+    ResultBean<PrepareVehicleInfoVo> getCarDataInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("合格证和发票的确认")
+    @PutMapping("/saveState")
+    @ResponseBody
+    ResultBean saveState(@RequestBody StateDateDto dto);
+
 }

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

@@ -112,5 +112,15 @@ public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepare
         return null;
     }
 
+    @Override
+    public ResultBean<PrepareVehicleInfoVo> getCarDataInfo(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveState(StateDateDto dto) {
+        return null;
+    }
+
 
 }

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

@@ -33,5 +33,7 @@ public class HandoverPrepareVehicleInfoVo implements Vo {
     @JsonProperty("otherState")
     private boolean otherDataState; // 其他资料状态
 
+    private String remarks;
+
 
 }

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

@@ -0,0 +1,41 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 随车资料获取
+ * @author: dimengzhe
+ * @date: 2023/6/7
+ **/
+@Data
+public class PrepareVehicleInfoVo implements Vo {
+    private static final long serialVersionUID = 7287383558933708989L;
+
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String vinNo;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("合同编号")
+    @JsonProperty("contractId")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("交接记录")
+    private List<VehicleListInfo> recordList = new ArrayList<>();
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("出库申请创建人的的orgPath")
+    private String orgPath;
+
+    private String sid;
+}

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

@@ -11,10 +11,10 @@ public class StateDateDto implements Dto {
 
     @ApiModelProperty("sid")
     private String sid;
-    @ApiModelProperty("vin")
-    private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
-    @ApiModelProperty("状态值")
+    @ApiModelProperty("状态值:01 保存发票接收状态 02合格证接收状态")
     private String key;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("接收备注")
+    private String remarks;
 }

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

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 车辆信息
+ * @author: dimengzhe
+ * @date: 2023/6/7
+ **/
+@Data
+public class VehicleListInfo implements Vo {
+    private static final long serialVersionUID = 5078309963150869078L;
+
+    @ApiModelProperty("随车资料")
+    @JsonProperty("info")
+    private String vehicleHandoverData;
+    @ApiModelProperty("接收人")
+    @JsonProperty("receiveUser")
+    private String recName;
+    @ApiModelProperty("移交人")
+    @JsonProperty("transferUser")
+    private String transferName;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("交接日期")
+    private String recTime;
+
+    private String sid;
+    @ApiModelProperty("确认按钮的展示")
+    private boolean showBtn;
+}

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

@@ -120,4 +120,14 @@ public class AppBusHandoverPrepareRest implements AppBusHandoverPrepareFeign {
         return appBusHandoverPrepareService.submitDeliveryPlanInfo(dto);
     }
 
+    @Override
+    public ResultBean<PrepareVehicleInfoVo> getCarDataInfo(String sid) {
+        return appBusHandoverPrepareService.getCarDataInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveState(StateDateDto dto) {
+        return appBusHandoverPrepareService.saveState(dto);
+    }
+
 }

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

@@ -28,7 +28,8 @@ package com.yxt.anrui.terminal.biz.autoservice.deliveryPlan;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.RemarkDto;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
@@ -195,6 +196,21 @@ public class AppBusHandoverPrepareService {
 
     public ResultBean saveRemarks(ReamrksDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        RemarkDto remarkDto = new RemarkDto();
+        BeanUtil.copyProperties(dto,remarkDto);
+        ResultBean resultBean = busHandoverPrepareFeign.saveRemarks(remarkDto);
+        return resultBean;
+    }
+
+    public ResultBean<PrepareVehicleInfoVo> getCarDataInfo(String sid) {
+        ResultBean<PrepareVehicleInfoVo> rb = ResultBean.fireFail();
         return null;
     }
+
+    public ResultBean saveState(StateDateDto dto) {
+        AppStateDateDto appStateDateDto = new AppStateDateDto();
+        BeanUtil.copyProperties(dto, appStateDateDto);
+        ResultBean resultBean = busHandoverPrepareFeign.saveState(appStateDateDto);
+        return resultBean;
+    }
 }