修改

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

@@ -144,7 +144,7 @@ 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")

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

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

@@ -101,7 +101,7 @@ 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);

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

@@ -272,7 +272,8 @@
     </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">

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

@@ -304,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

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(","));

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/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/BusHandoverPrepareService.java

@@ -277,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);
@@ -362,7 +365,7 @@ 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());
@@ -377,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<>();// 临时牌照
@@ -409,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()) {
@@ -432,6 +445,10 @@ 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));
@@ -457,6 +474,13 @@ 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()) {
@@ -610,6 +634,9 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     public ResultBean saveRemarks(RemarkDto dto) {
         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();
@@ -655,6 +682,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             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-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-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/HandoverPrepareVehicleInfoVo.java

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

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,7 +196,10 @@ public class AppBusHandoverPrepareService {
 
     public ResultBean saveRemarks(ReamrksDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        return null;
+        RemarkDto remarkDto = new RemarkDto();
+        BeanUtil.copyProperties(dto,remarkDto);
+        ResultBean resultBean = busHandoverPrepareFeign.saveRemarks(remarkDto);
+        return resultBean;
     }
 
     public ResultBean<PrepareVehicleInfoVo> getCarDataInfo(String sid) {