Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.base.api.basevehicletempstate;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import feign.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -99,4 +100,9 @@ public interface BaseVehicleTempstateFeign {
     @GetMapping("/getList")
     @ResponseBody
     ResultBean<List<BaseVehicleTempstate>> getList(@RequestParam("tempStateKey")String tempStateKey);
+
+    @ApiOperation("查询状态")
+    @GetMapping("/selectByVinSidAndType")
+    @ResponseBody
+    ResultBean<BaseVehicleTempstate> selectByVinSidAndType(@RequestParam("carSid") String carSid, @Param("tempstateKey") String tempstateKey);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java

@@ -90,6 +90,11 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe
 		return null;
 	}
 
+	@Override
+	public ResultBean<BaseVehicleTempstate> selectByVinSidAndType(String carSid, String tempstateKey) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<Integer> selectByVin(String vin) {
 		return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -28,6 +28,7 @@ public enum BillTypeEnum {
     GCRK("GCRK","挂车入库"),
     SZRK("SZRK","上装入库"),
     XSDDTCSQ("XSDDTCSQ","销售订单退车申请"),
+    QKTCSQ("QKTCSQ","欠款提车申请"),
     ;
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java

@@ -75,4 +75,7 @@ public interface BaseVehicleTempstateMapper extends BaseMapper<BaseVehicleTempst
     Integer selectByVin(@Param("vin") String vin);
 
     List<BaseVehicleTempstate> getList(String tempStateKey);
+
+    @Select("select * from base_vehicle_tempstate where vehSid = #{carSid} and tempStateKey = #{key} limit 1")
+    BaseVehicleTempstate selectByVinSidAndType(@Param("carSid") String carSid, @Param("key") String tempstateKey);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java

@@ -122,6 +122,13 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
         return rb.success().setData(baseVehicleTempstates);
     }
 
+    @Override
+    public ResultBean<BaseVehicleTempstate> selectByVinSidAndType(String carSid, String tempstateKey) {
+        ResultBean<BaseVehicleTempstate> rb = ResultBean.fireFail();
+        BaseVehicleTempstate count = baseVehicleTempstateService.selectByVinSidAndType(carSid,tempstateKey);
+        return rb.setData(count);
+    }
+
     @Override
     public ResultBean<Integer> selectByVin(String vin) {
         ResultBean<Integer> rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@@ -129,4 +129,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleT
     public Integer selectByVin(String vin) {
         return baseMapper.selectByVin(vin);
     }
+
+    public BaseVehicleTempstate selectByVinSidAndType(String carSid, String tempstateKey) {
+        return baseMapper.selectByVinSidAndType(carSid,tempstateKey);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -256,6 +256,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public ResultBean<String> saveOrUpdateDto(BusVehicleApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        if(StringUtils.isBlank(dto.getApplyTypeKey())){
+            return rb.setMsg("采购类型不能为空");
+        }
         List<CommonAppendixDto> commonAppendixs = dto.getCommonAppendixs();
         if (StringUtils.isBlank(sid)) {//新增
             //=======================================

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -1,15 +1,11 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceVinDto;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -42,23 +38,23 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusArrearsCarryVehicleApplyPageVo>> listPage(@RequestBody PagerQuery<BusArrearsCarryVehicleApplyQuery> pagerQuery);
 
-    @ApiOperation("新增欠款提车")
+  /*  @ApiOperation("新增欠款提车")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BusArrearsCarryVehicleApplyDto dto);
 
     @ApiOperation("修改欠款提车")
     @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody BusArrearsCarryVehicleApplyDto dto, @PathVariable("sid") String sid);
+    public ResultBean update(@RequestBody BusArrearsCarryVehicleApplyDto dto, @PathVariable("sid") String sid);*/
 
     @ApiOperation("根据sid批量删除欠款提车单")
     @PostMapping("/deleteBySids")
     public ResultBean deleteBySids(@RequestBody String[] sids);
 
-    @ApiOperation("欠款提车复核回显/修改回显/详情回显")
+   /* @ApiOperation("欠款提车复核回显/修改回显/详情回显")
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<BusArrearsCarryVehicleApplyVo> fetchSid(@PathVariable("sid") String sid);
-
-    @ApiOperation("欠款提车-车辆列表")
+*/
+   /* @ApiOperation("欠款提车-车辆列表")
     @PostMapping("/getArrearsVehicleList")
     public ResultBean<PagerVo<ArrearsCarryVehicleVo>> getArrearsVehicleList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pq);
 
@@ -72,7 +68,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
 
     @ApiOperation("欠款提车单附件保存接口")
     @PostMapping("/saveArrearsAppendix")
-    public ResultBean saveArrearsAppendix(@RequestBody List<ArrearsAppendixDto> dto);
+    public ResultBean saveArrearsAppendix(@RequestBody List<ArrearsAppendixDto> dto);*/
 
 
     /********************************App接口************************************/
@@ -87,10 +83,10 @@ public interface BusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
 
-    @ApiOperation("移动端-新增欠款提车申请")
+ /*   @ApiOperation("移动端-新增欠款提车申请")
     @PostMapping("/addArrearsApply")
     @ResponseBody
-    public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);
+    public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);*/
 
     @ApiOperation("移动端-保存欠款提车申请")
     @PostMapping("/saveArrearsApply")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -31,7 +30,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 		return rb.setMsg("接口bus/busarrearscarryvehicleapply/listPage无法访问");
 	}
 
-	@Override
+/*	@Override
 	public ResultBean save(BusArrearsCarryVehicleApplyDto dto){
 		return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/save无法访问");
 	}
@@ -39,20 +38,20 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
     @Override
 	public ResultBean update(BusArrearsCarryVehicleApplyDto dto,String sid){
 		return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/update无法访问");
-	}
+	}*/
 
 	@Override
 	public ResultBean deleteBySids(String[] sids){
 		return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/del无法访问");
 	}
 
-	@Override
+/*	@Override
 	public ResultBean<BusArrearsCarryVehicleApplyVo> fetchSid(String sid) {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口bus/busarrearscarryvehicleapply/fetchSid无法访问");
-	}
+	}*/
 
-	@Override
+	/*@Override
 	public ResultBean<PagerVo<ArrearsCarryVehicleVo>> getArrearsVehicleList(PagerQuery<ArrearsCarryVehicleQuery> pq) {
 		return null;
 	}
@@ -70,7 +69,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 	@Override
 	public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> dto) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
@@ -82,10 +81,10 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
 		return null;
 	}
 
-	@Override
+	/*@Override
 	public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java

@@ -25,11 +25,11 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo {
     @ApiModelProperty("车型名称")
     private String modelName;
 
-//    @ApiModelProperty("欠款金额")
-//    private BigDecimal arrearsMoney;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
 
-    @ApiModelProperty("累计欠款金额")
-    private BigDecimal cumulativeArrearsMoney;
+/*    @ApiModelProperty("累计欠款金额")
+    private BigDecimal cumulativeArrearsMoney;*/
 
     @ApiModelProperty("承诺回款日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyQuery.java

@@ -2,13 +2,10 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
 
 import com.yxt.common.core.query.Query;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: bus(bus) <br/>
  * File: BusArrearsCarryVehicleApplyQuery.java <br/>
@@ -26,22 +23,19 @@ import java.math.BigDecimal;
 @Data
 public class BusArrearsCarryVehicleApplyQuery implements Query {
 
-    
-	@ApiModelProperty("客户名称")
+
+    @ApiModelProperty("客户名称")
     private String customerName;
-    
-	@ApiModelProperty("合同编号")
+
+    @ApiModelProperty("合同编号")
     private String contractNo;
-    
-//	@ApiModelProperty("申请日期")
-//    private String applyDate;
 
     @ApiModelProperty("申请开始日期")
-    private String applyStartDate; // 申请开始日期
+    private String applyStartDate;
     @ApiModelProperty("申请结束日期")
-    private String applyEndDate; // 申请结束日期
-    
-	@ApiModelProperty("申请人")
+    private String applyEndDate;
+
+    @ApiModelProperty("申请人")
     private String applyName;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Data
 public class AppCompleteAdvanceArrearsDto implements Dto {
@@ -14,7 +15,7 @@ public class AppCompleteAdvanceArrearsDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -30,6 +31,4 @@ public class AppCompleteAdvanceArrearsDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
-//    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java

@@ -7,9 +7,7 @@ import lombok.Data;
 @Data
 public class AppSubmitAdvanceArrearsDto extends AppArrearsCarryDto {
     private static final long serialVersionUID = 9148028768206972924L;
-
-    @ApiModelProperty("意见")
-    private String comment;
+    
     @ApiModelProperty("流程实例id")
     private String instanceId;
     @ApiModelProperty("任务id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java

@@ -14,6 +14,8 @@ public class GetNodeQuery implements Query {
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
 
+    private String businessSid;
+
 //    @ApiModelProperty(value = "分支字段及业务字段")
 //    private Map<String, Object> formVariables;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -76,4 +76,8 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
     int updateFlowFiled(Map<String, Object> map);
 
     void updateType(@Param("businessSid") String businessSid);
+
+    String selectNum(String bill);
+
+    int selectBySids(String join);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -9,18 +9,19 @@
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo">
         SELECT
         bacva.sid,
+        if(length(bacva.nodeState)>0,bacva.nodeState,'待提交') as nodeState,
         <!-- 合同编号 -->
         bacva.contractNo,
         <!-- 客户名称 -->
         bacva.customerName,
         <!-- 车型名称 -->
         bacva.modelName,
-        <!-- 累计欠款金额 -->
-        bacva.cumulativeArrearsMoney,
+        <!-- 欠款金额 -->
+        bacva.arrearsMoney,
         <!-- 承诺回款日期 -->
         bacva.commitmentMoneyDate,
         <!-- 申请日期 -->
-        bacva.applyDate,
+        DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate,
         <!-- 申请人 -->
         bacva.applyName
         FROM bus_arrears_carry_vehicle_apply bacva
@@ -66,7 +67,8 @@
         customerName,
         arrearsMoney,
         commitmentMoneyDate,
-        applyName
+        applyName,
+        DATE_FORMAT(createTime,'%Y-%m-%d') as applyDate
         FROM bus_arrears_carry_vehicle_apply
         <where>
             ${ew.sqlSegment}
@@ -85,7 +87,7 @@
     <update id="updateFlowFiled">
         UPDATE bus_arrears_carry_vehicle_apply
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+        , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -103,4 +105,19 @@
         set `type` = '2'
         where sid = #{businessSid}
     </update>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from bus_arrears_carry_vehicle_apply
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+        limit 1
+    </select>
+
+    <select id="selectBySids" resultType="int">
+        select count(*)
+        from bus_arrears_carry_vehicle_apply
+        where length(nodeState) > 0
+        and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -59,12 +60,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
      * @param dto
      * @return
      */
-    @Override
+  /*  @Override
     public ResultBean save(BusArrearsCarryVehicleApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         busArrearsCarryVehicleApplyService.saveOrUpdateDto(dto);
         return rb.success();
-    }
+    }*/
 
     /**
      * 修改欠款提车
@@ -73,12 +74,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
      * @param sid
      * @return
      */
-    @Override
+  /*  @Override
     public ResultBean update(BusArrearsCarryVehicleApplyDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         busArrearsCarryVehicleApplyService.updateByArrearsSid(dto, sid);
         return rb.success();
-    }
+    }*/
 
     /**
      * 根据sid批量删除欠款提车单
@@ -89,8 +90,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
     @Override
     public ResultBean deleteBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
-        if (sids == null || sids.length == 0) {
-            return rb.setMsg("删除成功，欠款提车单sid不能为空");
+        //查询该sid中是否有流程不是待提交的
+        int count = busArrearsCarryVehicleApplyService.selectBySids(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
         }
         return busArrearsCarryVehicleApplyService.deleteBySids(sids);
 
@@ -102,57 +105,57 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
      * @param sid
      * @return
      */
-    @Override
+   /* @Override
     public ResultBean<BusArrearsCarryVehicleApplyVo> fetchSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusArrearsCarryVehicleApplyVo vo = busArrearsCarryVehicleApplyService.selectBySid(sid);
         return rb.success().setData(vo);
-    }
+    }*/
 
-    /**
+   /* *//**
      * 欠款提车-车辆列表
      *
      * @param pq
      * @return
-     */
+     *//*
     @Override
     public ResultBean<PagerVo<ArrearsCarryVehicleVo>> getArrearsVehicleList(PagerQuery<ArrearsCarryVehicleQuery> pq) {
         return busArrearsCarryVehicleApplyService.getArrearsVehicleList(pq);
     }
 
-    /**
+    *//**
      * 欠款提车申请前验证选择的车辆（合同编号必须相同）
      *
      * @param list
      * @return
-     */
+     *//*
     @Override
     public ResultBean arrearsVehicleApply(List<ArrearsCarryVehicleDto> list) {
         return busArrearsCarryVehicleApplyService.arrearsVehicleApply(list);
     }
 
-    /**
+    *//**
      * 提交欠款提车单审批流程
      *
      * @param dto
      * @return
-     */
+     *//*
     @Override
     public ResultBean submitArrearsCarryVehicle(BusArrearsCarryVehicleApplyDto dto) {
         return busArrearsCarryVehicleApplyService.submitArrearsCarryVehicle(dto);
     }
 
-    /**
+    *//**
      * 欠款提车单附件保存接口
      *
      * @param list
      * @return
-     */
+     *//*
     @Override
     public ResultBean saveArrearsAppendix(List<ArrearsAppendixDto> list) {
         return busArrearsCarryVehicleApplyService.saveArrearsAppendix(list);
     }
-
+*/
     @Override
     public ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();
@@ -165,10 +168,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
         return busArrearsCarryVehicleApplyService.initArrearsApply(query);
     }
 
-    @Override
+/*    @Override
     public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
         return busArrearsCarryVehicleApplyService.addArrearsApply(dto);
-    }
+    }*/
 
     @Override
     public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -12,11 +12,16 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto;
@@ -56,7 +61,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -66,7 +70,9 @@ import com.yxt.common.base.utils.WordConvertUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -189,8 +196,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             String applyStartDate = pagerQuery.getApplyStartDate();
             String applyEndDate = pagerQuery.getApplyEndDate();
-            qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
-                    apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
+            qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.createTime,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.createTime,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
                     );
 
         }
@@ -207,12 +214,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         IPage<BusArrearsCarryVehicleApplyQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BusArrearsCarryVehicleApplyPageVo> qw = buildQueryWrapper(pagerQuery.getParams());
         IPage<BusArrearsCarryVehicleApplyPageVo> busArrearsCarryVehicleApplyPageVoIPage = baseMapper.listPage(page, qw);
-        List<BusArrearsCarryVehicleApplyPageVo> records = busArrearsCarryVehicleApplyPageVoIPage.getRecords();
-        for (BusArrearsCarryVehicleApplyPageVo record : records) {
-            String sid = record.getSid();
-            String nodeState = sysFormLinkFeign.selectStateByBusinessSid(sid).getData().getNodeState();
-            record.setNodeState(nodeState);
-        }
         return busArrearsCarryVehicleApplyPageVoIPage;
     }
 
@@ -591,12 +592,23 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 return rb.setMsg("该欠款提车申请不存在");
             }
             BeanUtil.copyProperties(busArrearsCarryVehicleApply, appArrearsCarryInfoVo, "sid");
+            appArrearsCarryInfoVo.setSid(sid);
             appArrearsCarryInfoVo.setContractId(busArrearsCarryVehicleApply.getContractNo());
             appArrearsCarryInfoVo.setPublishInfo(busArrearsCarryVehicleApply.getApplyDept() + "-" + busArrearsCarryVehicleApply.getApplyName());
             appArrearsCarryInfoVo.setCreateDate(DateUtil.format(busArrearsCarryVehicleApply.getCreateTime(), "yyyy-MM-dd"));
             appArrearsCarryInfoVo.setOrgPath(busArrearsCarryVehicleApply.getOrgSidPath());
             List<BusArrearsCarryVehicleDetails> detailsList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(sid);
-            List<AdCarListVo> voList = Optional.ofNullable(detailsList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdCarListVo.class)).collect(Collectors.toList());
+            List<AdCarListVo> voList = new ArrayList<>();
+            detailsList.removeAll(Collections.singleton(null));
+            if (!detailsList.isEmpty()) {
+                for (int i = 0; i < detailsList.size(); i++) {
+                    AdCarListVo adCarListVo = new AdCarListVo();
+                    BeanUtil.copyProperties(detailsList.get(i), adCarListVo);
+                    adCarListVo.setCarSid(detailsList.get(i).getVinSid());
+                    adCarListVo.setVin(detailsList.get(i).getVinNo());
+                    voList.add(adCarListVo);
+                }
+            }
             appArrearsCarryInfoVo.setVinList(voList);
             voList.removeAll(Collections.singleton(null));
             if (!voList.isEmpty()) {
@@ -622,19 +634,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             BuscenterFile buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
             if (buscenterFile != null) {
-                appArrearsCarryInfoVo.setCarContractDownloadUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+                appArrearsCarryInfoVo.setCarContractDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
             }
             buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
             if (buscenterFile != null) {
-                appArrearsCarryInfoVo.setGuaranteeLetterDownloadUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+                appArrearsCarryInfoVo.setGuaranteeLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
             }
             buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
             if (buscenterFile != null) {
-                appArrearsCarryInfoVo.setGdLetterDownloadUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+                appArrearsCarryInfoVo.setGdLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
             }
             buscenterFile = buscenterFileService.selectByLinkSidOne(sid, BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
             if (buscenterFile != null) {
-                appArrearsCarryInfoVo.setZjlLetterDownloadUrl(fileUploadComponent.getUrlPrefix() + buscenterFile.getFilePath());
+                appArrearsCarryInfoVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
             }
             if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getCarContractFile())) {
                 List<String> carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(","));
@@ -1043,6 +1055,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             busArrearsCarryVehicleApply.setContractNo(dto.getContractId());
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
             busArrearsCarryVehicleApply.setUseOrgSid(useOrgSid);
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            if (sysOrganizationVo != null) {
+                busArrearsCarryVehicleApply.setUseOrgName(sysOrganizationVo.getName());
+            }
+            BigDecimal arearsMoney = BigDecimal.ZERO;
+            if (StringUtils.isNotBlank(dto.getContractMoney())) {
+                arearsMoney = new BigDecimal(dto.getContractMoney());
+            }
+            if (StringUtils.isNotBlank(dto.getContractCollectionMoney())) {
+                arearsMoney = arearsMoney.subtract(new BigDecimal(dto.getContractCollectionMoney()));
+            }
+            busArrearsCarryVehicleApply.setArrearsMoney(arearsMoney);
             List<String> carContract = dto.getCarContract();
             if (!carContract.isEmpty()) {
                 String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
@@ -1063,6 +1087,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
             }
+            List<String> otherFile = dto.getFileList();
+            if (!otherFile.isEmpty()) {
+                String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                busArrearsCarryVehicleApply.setOtherFile(fileLists);
+            }
             //车辆
             List<AdCarListVo> adCarListVoList = dto.getVinList();
             if (adCarListVoList.isEmpty()) {
@@ -1096,6 +1125,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 return rb.setMsg("该申请不存在");
             }
             BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply, "sid");
+            if("0".equals(busArrearsCarryVehicleApply.getIsFinance())){
+                busArrearsCarryVehicleApply.setFinanceName("");
+                busArrearsCarryVehicleApply.setFinanceUserSid("");
+            }
             List<String> carContract = dto.getCarContract();
             if (!carContract.isEmpty()) {
                 String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), "");
@@ -1116,6 +1149,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), "");
                 busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
             }
+            List<String> otherFile = dto.getFileList();
+            if (!otherFile.isEmpty()) {
+                String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                busArrearsCarryVehicleApply.setOtherFile(fileLists);
+            }
             //车辆
             List<AdCarListVo> adCarListVoList = dto.getVinList();
             if (adCarListVoList.isEmpty()) {
@@ -1191,22 +1229,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         return rb.success().setData(busArrearsCarryVehicleApply.getSid());*/
     }
 
+    public String getApplyCode(String orgSidPath) {
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.QKTCSQ.getBillType());
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
     public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
         ResultBean rb = ResultBean.fireFail();
-       /* //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
         //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        dto.setOrgSidPath(orgSidPath);
-        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
+        String orgSidPath = dto.getOrgPath();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, busArrearsCarryVehicleApply);
         if (r == 3) {
             return rb.setMsg("该申请不存在");
@@ -1215,25 +1261,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //查询该申请中的车架号是否被锁定
-        List<AdCarListDto> carList = dto.getCarList();
-        for (AdCarListDto adCarListDto : carList) {
-            Integer count = baseVehicleTempstateFeign.selectByVin(adCarListDto.getVin()).getData();
-            if (count > 0) {
-                return rb.setMsg("该申请车架号中存在审核中，请重新选择！");
+        List<AdCarListVo> carList = dto.getVinList();
+        List<String> vinSidi = new ArrayList<>();
+        boolean isT = false;
+        for (AdCarListVo adCarListDto : carList) {
+            BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getCarSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+            if (count != null) {
+                vinSidi.add(count.getVinNo());
+                isT = true;
             }
         }
+        if (isT) {
+            return rb.setMsg(String.join(",", vinSidi) + "已存在提交的申请");
+        }
         //新增修改保存
         ResultBean<String> resultBean = saveArrearsApply(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-
         BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
         baseVehicleTempstateDto.setBusSid(businessSid);
         baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
         baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
-        baseVehicleTempstateDto.setTempKey("1");
+        baseVehicleTempstateDto.setTempKey("0");
         baseVehicleTempstateDto.setTempValue("待审核");
         List<BusArrearsCarryVehicleDetailsVo> busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
         for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) {
@@ -1256,12 +1307,20 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //若app移动端有此功能，则传递appMap参数
         Map<String, Object> appMap = new HashMap<>();
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
-        appMap.put("contractSid", businessSid);
+        appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        if (StringUtils.isNotBlank(dto.getIsFinance())) {
+            variables.put("jinrong", "1".equals(dto.getIsFinance()));
+        } else {
+            variables.put("jinrong", false);
+        }
         //流程定义id
         bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
@@ -1285,10 +1344,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             bv.setTaskId(busArrearsCarryVehicleApply.getTaskId());
             bv.setTaskDefKey(busArrearsCarryVehicleApply.getTaskDefKey());
-            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
-        }*/
+        }
         return rb;
     }
 
@@ -1300,7 +1359,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
      */
     private synchronized int submitBusinessData(AppSubmitAdvanceArrearsDto dto, BusArrearsCarryVehicleApply busArrearsCarryVehicleApply) {
         int r = 0;
-        /*if (StringUtils.isBlank(dto.getContractSid())) {
+        if (StringUtils.isBlank(dto.getSid())) {
             r = 1;
         } else {
             if (busArrearsCarryVehicleApply != null) {
@@ -1316,7 +1375,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 r = 3;
             }
 
-        }*/
+        }
         return r;
     }
 
@@ -1332,17 +1391,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("contractSid", bv.getBusinessSid());
+        appMap.put("sid", bv.getBusinessSid());
         variables.put("app", appMap);
-        bv.setFormVariables(variables);
-        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
-            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
+            variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
         } else {
-            return rb.setMsg("orgSidPath 为空！");
+            variables.put("jinrong", false);
+        }
+        bv.setFormVariables(variables);
+        bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
+        if ("Activity_0tieuz3".equals(bv.getTaskDefKey())) {
+            //销售内勤审批
+
+        }
+        if ("Activity_0ynxtyz".equals(bv.getTaskDefKey())) {
+            //销售部经理审批上传信审
+
+        }
+        if ("Activity_03na1gk".equals(bv.getTaskDefKey())) {
+            //金融部经理审批
+            bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid());
         }
         if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -1367,14 +1439,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 messageFlowableQuery.setMsgTitle("欠款提车申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
-                Map<String, Object> appMaps = new HashMap<>();
-                appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
-                List<String> recipientSidList = new ArrayList<>();
-
+                List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid());
+                for (BusArrearsCarryVehicleDetails adCarListDto : carList) {
+                    BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getVinSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+                    if (count != null) {
+                        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                        baseVehicleTempstateDto.setSid(count.getSid());
+                        baseVehicleTempstateDto.setBusSid(bv.getBusinessSid());
+                        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+                        baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
+                        baseVehicleTempstateDto.setTempKey("1");
+                        baseVehicleTempstateDto.setTempValue("审核通过");
+                        baseVehicleTempstateDto.setVehSid(adCarListDto.getVinSid());
+                        baseVehicleTempstateDto.setVinNo(adCarListDto.getVinNo());
+                        baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+                    }
+                }
                 //修改状态
                 baseMapper.updateType(bv.getBusinessSid());
-
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -1401,7 +1483,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                     }
                 }
 
-                // 风控中心风控经理
+               /* // 风控中心风控经理
                 UserRoleQuery userRoleQuery1 = new UserRoleQuery();
                 userRoleQuery1.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
                 List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
@@ -1447,7 +1529,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
                 query.setName("业务");
                 // 消息推送
-                messageFeign.sendAutoserviceMessage(query);
+                messageFeign.sendAutoserviceMessage(query);*/
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -1457,18 +1539,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean InitiatorToAnswerInfo(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        SysUserVo userVos = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("contractSid", bv.getBusinessSid());
+        appMap.put("sid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
-        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
-            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
-        } else {
-            return rb.setMsg("orgSidPath 为空！");
-        }
+        bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -1495,7 +1572,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             UpdateFlowFieldVo ufVos = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
-
             if (!"Event_end".equals(ufVos.getTaskDefKey())) {
                 //极光推送
                 busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
@@ -1512,14 +1588,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 messageFlowableQuery.setMsgTitle("欠款提车申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
-                Map<String, Object> appMaps = new HashMap<>();
-                appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
-                List<String> recipientSidList = new ArrayList<>();
-
+                List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid());
+                for (BusArrearsCarryVehicleDetails adCarListDto : carList) {
+                    BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getVinSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+                    if (count != null) {
+                        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                        baseVehicleTempstateDto.setSid(count.getSid());
+                        baseVehicleTempstateDto.setBusSid(bv.getBusinessSid());
+                        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+                        baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
+                        baseVehicleTempstateDto.setTempKey("1");
+                        baseVehicleTempstateDto.setTempValue("审核通过");
+                        baseVehicleTempstateDto.setVehSid(adCarListDto.getVinSid());
+                        baseVehicleTempstateDto.setVinNo(adCarListDto.getVinNo());
+                        baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+                    }
+                }
                 //修改状态
                 baseMapper.updateType(bv.getBusinessSid());
-
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -1543,7 +1629,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
                     }
                 }
-
+/*
                 // 风控中心风控经理
                 UserRoleQuery userRoleQuery1 = new UserRoleQuery();
                 userRoleQuery1.setRoleSid("242d52de-7df9-4fab-91ff-d6f07dc98341");
@@ -1590,7 +1676,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
                 query.setName("业务");
                 // 消息推送
-                messageFeign.sendAutoserviceMessage(query);
+                messageFeign.sendAutoserviceMessage(query);*/
             }
 
             return rb.success().setData(resultBean1.getData());
@@ -1603,13 +1689,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-//        Map<String, Object> formVariables = query.getFormVariables();
-        //判断流程分支
-//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-//        bv.setFormVariables(map);
-        bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
+            map.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
+        } else {
+            map.put("jinrong", false);
+        }
+        appMap.put("sid", bv.getBusinessSid());
+        map.put("app", appMap);
+        bv.setFormVariables(map);
+        bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
-        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
@@ -1618,13 +1710,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-//        Map<String, Object> formVariables = query.getFormVariables();
-        //判断流程分支
-//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-//        bv.setFormVariables(map);
-        bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
+            map.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance()));
+        } else {
+            map.put("jinrong", false);
+        }
+        appMap.put("sid", bv.getBusinessSid());
+        map.put("app", appMap);
+        bv.setFormVariables(map);
+        bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
-        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
@@ -1645,7 +1743,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("contractSid", query.getBusinessSid());
+                appMap.put("sid", query.getBusinessSid());
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
@@ -1665,17 +1763,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(query.getBusinessSid());
-                messageFlowableQuery.setModuleName("提前开票申请");
+                messageFlowableQuery.setModuleName("欠款提车申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBean.getData().get(0).getName_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) {
+                if ("发起申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
                 } else {
                     messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
-                messageFlowableQuery.setMsgTitle("提前开票申请");
+                messageFlowableQuery.setMsgTitle("欠款提车申请");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
                 return rb.success();
             }
@@ -1688,7 +1787,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (StringUtils.isBlank(query.getUserSid())) {
             return rb.setMsg("参数错误：userSid");
         }
-        //根据业务sid查询移库申请
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
         String businessTaskId = busArrearsCarryVehicleApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
@@ -1701,7 +1799,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 }
                 String nextNodeUserSids = resultBean.getData().getNextNodeUserSids();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) {
+                busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
+                String nextName = listResultBean.getData().get(0).getName_();
+                if ("发起申请".equals(nextName)) {
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
@@ -1762,7 +1863,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                     downloadUrlVo.setGdLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
                 }
                 if (BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType().equals(pdfVo.getType())) {
-                    downloadUrlVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl()+ pdfVo.getDownUrl());
+                    downloadUrlVo.setZjlLetterDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + pdfVo.getDownUrl());
                 }
             }
             if (resultBean.getData().isChange() || resultBean.getData().isDateChange()) {
@@ -1773,4 +1874,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         return rb;
     }
+
+    public int selectBySids(String join) {
+        return baseMapper.selectBySids(join);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -3439,27 +3439,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //挂车
             if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
                 if (priceInfo != null) {
-                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
+//                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
                     BigDecimal finalPriceAll = BigDecimal.ZERO;
                     if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
                         finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
                     }
-                    /*if(StringUtils.isNotBlank(priceInfo.getGcPrice())){
-                        finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getGcPrice()));
-                    }
-                    priceInfo.setSingleFinalPrice(finalPriceAll.toString());*/
-                }
-            }
-
-        }/*else{
-            BigDecimal finalPriceAll = BigDecimal.ZERO;
-            if(priceInfo != null){
-                if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
-                    finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
                 }
-                priceInfo.setSingleFinalPrice(finalPriceAll.toString());
             }
-        }*/
+        }
 
         if (priceInfo != null) {
             if (StringUtils.isNotBlank(topPriice)) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -36,6 +36,9 @@ 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.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
@@ -56,6 +59,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -83,6 +87,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
     @Autowired
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -267,7 +273,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
         List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();
         for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) {
-            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())){
+            if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) {
                 BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData();
                 busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
                 busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
@@ -300,8 +306,18 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.eq("bo.contractNo", query.getContractNo());
         }
-        if(StringUtils.isNotBlank(query.getVinNo())){
-            qw.like("bv.linkNo",query.getVinNo());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bv.linkNo", query.getVinNo());
+        }
+        //查询已提交申请的欠款提车车辆
+        ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+        if (!resultBean.getData().isEmpty()) {
+            resultBean.getData().removeAll(Collections.singleton(null));
+            List<String> vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList());
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                qw.notIn("bv.linkSid", vinSidList);
+            }
         }
         List<QCarVo> list = baseMapper.getCanUseCars(qw);
         list.removeAll(Collections.singleton(null));
@@ -318,7 +334,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 qCarVo.setVinDto(adCarListVo);
                 List<GCarListVo> gcList = new ArrayList<>();
                 ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo());
-                if(voResultBean.getData() != null){
+                if (voResultBean.getData() != null) {
                     TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
                     List<TrailerVo> trailerVos = traliveredVo.getList();
                     if (!trailerVos.isEmpty()) {
@@ -349,12 +365,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(params.getContractNo())) {
             qw.eq("bo.contractNo", params.getContractNo());
         }
-        if(StringUtils.isNotBlank(params.getVinNo())){
-            qw.like("bv.linkNo",params.getVinNo());
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("bv.linkNo", params.getVinNo());
         }
-        IPage<QCarVo> pagging = baseMapper.selectPageVo(page,qw);
+        IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
-        List<QCarVo> list =pagging.getRecords();
+        List<QCarVo> list = pagging.getRecords();
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             for (int i = 0; i < list.size(); i++) {
@@ -368,7 +384,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 }
                 List<GCarListVo> gcList = new ArrayList<>();
                 ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo());
-                if(voResultBean.getData() != null){
+                if (voResultBean.getData() != null) {
                     TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()).getData();
                     List<TrailerVo> trailerVos = traliveredVo.getList();
                     if (!trailerVos.isEmpty()) {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue

@@ -161,7 +161,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
             </el-form-item>
           </el-col>
         </el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue

@@ -163,7 +163,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
             </el-form-item>
           </el-col>
         </el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue

@@ -163,7 +163,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
             </el-form-item>
           </el-col>
         </el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@@ -161,7 +161,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
             </el-form-item>
           </el-col>
         </el-row>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java

@@ -65,6 +65,8 @@ public class FinBillTrailerDetailsVo implements Vo {
     private String openTickSid; // 开票名称sid
 	@ApiModelProperty("开票名称")
     private String openTickName; // 开票名称
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
 	@ApiModelProperty("单台开票金额")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java

@@ -67,6 +67,8 @@ public class FinBillTrailerVo implements Vo {
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -158,7 +158,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
         }
@@ -237,7 +237,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
                 finBillTrailer.setBillAppSid(finBillApplication.getSid());
                 for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                         finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                         finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                         finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -358,7 +358,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
             finBillTrailer.setBillAppSid(dtoSid);
             for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                     finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                     finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                     finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -392,7 +392,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
         if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
             FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
-            if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){
+            if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) {
                 entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
             }
         }
@@ -403,10 +403,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
         if (finBillTrailerVos.size() > 0) {
             for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                FinBillVehicleVo finBillVehicleVo = finBillVehicleService.selByVinNo(finBillTrailerVo.getVinNo());
+                finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
                 List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                 for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
                         finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
                     }
                 }
@@ -415,7 +417,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         } else {
             for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                 BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
-                TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(),entity.getContractNo()).getData();
+                TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(), entity.getContractNo()).getData();
                 List<TrailerVo> trailerVoList = data.getList();
                 for (TrailerVo trailerVo : trailerVoList) {
                     FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
@@ -430,7 +432,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
                     List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                     for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                        if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+                        if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
                             finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
                         }
                     }
@@ -765,7 +767,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
                     finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                 }
-                if (finBillTrailerVos != null){
+                if (finBillTrailerVos != null) {
                     for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
                         FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                         finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
@@ -792,8 +794,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                if (oneBillMoney == null){
-                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
                 }
             } else {
                 //极光推送
@@ -991,10 +993,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         String contractNo = dto.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
-        if (finBillApplicationDetailsVos != null){
+        if (finBillApplicationDetailsVos != null) {
             for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
                 String nodeState = finBillApplicationDetailsVo.getNodeState();
-                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
                     return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
                 }
             }
@@ -1523,7 +1525,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
                 finBillTrailer.setBillAppSid(finBillApplication.getSid());
                 for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                         finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                         finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                         finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -1533,7 +1535,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillTrailerService.save(finBillTrailer);
             }
             //附件信息
-            if (khkpsqsApplicationAppendxs.size() > 0){
+            if (khkpsqsApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1545,7 +1547,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            if (kpxxqrsApplicationAppendxs.size() > 0){
+            if (kpxxqrsApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1557,7 +1559,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            if (cldjhtApplicationAppendxs.size() > 0){
+            if (cldjhtApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1569,7 +1571,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            if (zjApplicationAppendxs.size() > 0){
+            if (zjApplicationAppendxs.size() > 0) {
                 for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) {
                     String filePath = finBillFileDto.getFileUrl();
                     if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -1653,7 +1655,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
             finBillTrailer.setBillAppSid(dtoSid);
             for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
+                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
                     finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
                     finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
                     finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@@ -1669,10 +1671,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         String contractNo = dto.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
-        if (finBillApplicationDetailsVos != null){
+        if (finBillApplicationDetailsVos != null) {
             for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
                 String nodeState = finBillApplicationDetailsVo.getNodeState();
-                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
                     return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
                 }
             }
@@ -1782,8 +1784,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                if (oneBillMoney == null){
-                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
                 }
             } else {
                 //极光推送
@@ -1960,17 +1962,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public PagerVo<FinBillApplicationVo> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
         FinBillApplicationQuery query = pq.getParams();
         QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
         }
         qw.eq("fba.billStateKey", "003");
         qw.eq("fba.useOrgSid", query.getUseOrgSid());
         qw.eq("fba.createBySid", query.getCreateBySid());
-        if ("1".equals(query.getType())){
-            qw.eq("fba.nodeState","待提交");
-        }else if ("2".equals(query.getType())){
-            qw.ne("fba.nodeState","待提交");
+        if ("1".equals(query.getType())) {
+            qw.eq("fba.nodeState", "待提交");
+        } else if ("2".equals(query.getType())) {
+            qw.ne("fba.nodeState", "待提交");
         }
         if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
             qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
@@ -2064,15 +2066,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String sid = query.getSid();
-        String userSid = query.getUserSid();
-        String contractNo = query.getContractNo();
-        String orgPath = query.getOrgPath();
-        String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
-        String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo();
-        if (StringUtils.isBlank(sid)){
-            finBillApplicationDetailsVo.setCreateBySid(userSid);
-            SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+        if (StringUtils.isBlank(sid)) {
+            String orgPath = query.getOrgPath();
+            String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
+            String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
+            finBillApplicationDetailsVo.setCreateBySid(query.getUserSid());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
             finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName());
             finBillApplicationDetailsVo.setDeptSid(deptSid);
             finBillApplicationDetailsVo.setDeptName(deptName);
@@ -2081,15 +2081,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplicationDetailsVo.setStaffName(sysUserVo.getName());
             finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
             finBillApplicationDetailsVo.setSaleDeptName(deptName);
-            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(query.getContractNo()).getData();
             finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());
-            finBillApplicationDetailsVo.setContractNo(contractNo);
-            CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
+            finBillApplicationDetailsVo.setContractNo(query.getContractNo());
+            CommonContract commonContract = commonContractFeign.selectByNo(query.getContractNo()).getData();
             finBillApplicationDetailsVo.setOpenTickUnitName(commonContract.getPartyA());
             finBillApplicationDetailsVo.setCustomerSid(commonContract.getCustomerSid());
             finBillApplicationDetailsVo.setCustomerName(commonContract.getPartyB());
-        }else {
+            finBillApplicationDetailsVo.setModelSid(commonContract.getModelSid());
+            finBillApplicationDetailsVo.setModelName(commonContract.getModelName());
+        } else {
             finBillApplicationDetailsVo = fetchDetailsVoBySid(sid);
         }
         return rb.success().setData(finBillApplicationDetailsVo);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -76,4 +76,7 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 
 	@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")
 	void updateByMainSid(String sid);
+
+	@Select("select * from fin_bill_vehicle where vinNo = #{vinNo}")
+	FinBillVehicleVo selByVinNo(String vinNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java

@@ -141,4 +141,8 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
     public void updateByMainSid(String sid) {
         baseMapper.updateByMainSid(sid);
     }
+
+    public FinBillVehicleVo selByVinNo(String vinNo) {
+       return baseMapper.selByVinNo(vinNo);
+    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -15,7 +15,8 @@ public enum ProcDefEnum {
     FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
-    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
@@ -77,8 +78,7 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
-    ;
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/;
 
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/28 10:29
+ * @Description
+ */
+@Data
+public class SysFinanceVo {
+
+    private String userSid;
+
+    private String name;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -184,4 +184,10 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("根据code查询组织信息")
     ResultBean<SysOrganization> selectByOrgCode(@RequestParam("orgCode") String orgCode);
+
+    @GetMapping("/selectFinance")
+    @ResponseBody
+    @ApiOperation("查询金融部主管人员")
+    ResultBean<List<SysFinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -187,4 +186,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<SysOrganization> selectByOrgCode(String orgCode) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -1,11 +1,12 @@
 package com.yxt.anrui.portal.biz.sysorganization;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -92,7 +93,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
      * @param sid
      * @return
      */
-    SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
+    SysOrganizationVo getUseOrgBySid(@Param("sid") String sid);
 
     int updateQrCodePath(@Param("sid") String sid, @Param("path") String path);
 
@@ -106,6 +107,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrgVo getListOrgByBrand(String sid);
 
     List<SysOrganizationListVo> selectOrgList(String orgSid);
+
     List<SysOrganizationListsVo> selectOrgLists(String orgSid);
 
     List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
@@ -122,4 +124,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrganizationVo> selectOrgByPSid(String psid);
 
     int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath);
+
+    List<SysFinanceVo> selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -231,4 +231,8 @@
         where orgSid = #{orgSid}
           and manageType = '3'
     </update>
+
+    <select id="selectBy" resultType="com.yxt.anrui.portal.api.sysorganization.SysFinanceVo">
+        select managerSid as userSid,managerName as name from sys_organization where psid = #{useOrgSid} and name = #{name}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -443,4 +444,12 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         SysOrganization sysOrganization = sysOrganizationService.selectByOrgCode(orgCode);
         return rb.success().setData(sysOrganization);
     }
+
+    @Override
+    public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
+        ResultBean<List<SysFinanceVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
+        List<SysFinanceVo> list = sysOrganizationService.selectBy("金融服务部",useOrgSid);
+        return rb.success().setData(list);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -17,6 +17,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -212,16 +213,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) {
                 StringBuilder orgName = new StringBuilder();
                 List<String> split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/"));
-                if(split.size()>1){
-                    for(int i = 0;i<split.size();i++){
+                if (split.size() > 1) {
+                    for (int i = 0; i < split.size(); i++) {
                         SysOrganization sysOrganization = fetchBySid(split.get(i));
-                        if(i == 0){
+                        if (i == 0) {
                             orgName = orgName.append(sysOrganization.getName());
-                        }else{
+                        } else {
                             orgName = orgName.append("/").append(sysOrganization.getName());
                         }
                     }
-                }else{
+                } else {
                     SysOrganization sysOrganization = fetchBySid(split.get(0));
                     orgName = orgName.append(sysOrganization.getName());
                 }
@@ -276,7 +277,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
         //根据主管人员sid获取主管姓名
-        if(StringUtils.isNotBlank(zgStaffSid)){
+        if (StringUtils.isNotBlank(zgStaffSid)) {
             SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid);
             entity.setManagerName(sysStaffinfo.getName());
             SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
@@ -305,7 +306,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         SysOrganizationVo vo = new SysOrganizationVo();
         BeanUtil.copyProperties(entity, vo);
         SysUser sysUser = sysUserService.fetchBySid(entity.getManagerSid());
-        if(sysUser != null){
+        if (sysUser != null) {
             vo.setZgStaffSid(sysUser.getStaffSid());
             vo.setZgNames(entity.getManagerName());
         }
@@ -323,9 +324,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         for (int i = 0; i < orgSidPathArr.length; i++) {
             Map<String, Object> m = new HashMap<>();
             // app选择组织时 map 存值key要求这个是空字符串
-            if("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])){//河北安瑞集团的sid
+            if ("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])) {//河北安瑞集团的sid
                 m.put("sid", "");
-            }else{
+            } else {
                 m.put("sid", orgSidPathArr[i]);
             }
 //            m.put("sid", orgSidPathArr[i]);
@@ -572,9 +573,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String orgSid = getOrgSid(orgDeptSid);*/
         String orgSid = "";
         String orgDeptSid = "";
-        if(StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData();
-        }else{
+        } else {
             orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
             orgSid = getOrgSid(orgDeptSid);
         }
@@ -639,26 +640,30 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String orgSidPath = entity.getOrgSidPath();
         //部门名称全路径
         String orgNamePath = "";
-        if(StringUtils.isNotBlank(orgSidPath)){
+        if (StringUtils.isNotBlank(orgSidPath)) {
             StringBuilder orgNamePath1 = new StringBuilder();
             List<String> split = Arrays.asList(orgSidPath.split("/"));
-            if(split.size()>1){
-                for(int i = 0;i<split.size();i++){
+            if (split.size() > 1) {
+                for (int i = 0; i < split.size(); i++) {
                     SysOrganization sysOrganization = fetchBySid(split.get(i));
-                    if(i == 0){
+                    if (i == 0) {
                         orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
-                    }else{
+                    } else {
                         orgNamePath1 = orgNamePath1.append("/").append(sysOrganization.getName());
                     }
                 }
-            }else{
+            } else {
                 SysOrganization sysOrganization = fetchBySid(split.get(0));
                 orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
             }
             orgNamePath = orgNamePath1.toString();
         }
         //更新关联该部门的所有员工的关联表中的部门名称、部门全路径以及名称全路径
-        baseMapper.updateOrgBySid(entity.getSid(),orgName,orgSidPath,orgNamePath);
+        baseMapper.updateOrgBySid(entity.getSid(), orgName, orgSidPath, orgNamePath);
         return rb.success();
     }
+
+    public List<SysFinanceVo> selectBy(String name, String useOrgSid) {
+        return baseMapper.selectBy(name,useOrgSid);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -166,4 +166,6 @@ public class ScmApplyInboundVo implements Vo {
     private String guidedPrice; // 全款/贷款销售指导价
     @ApiModelProperty("最新更新时间")
     private String newUpdateDate; // 最新更新时间
+    @ApiModelProperty("判断最新更新时间是否为当月")
+    private Boolean isNow; // 判断最新更新时间是否为当月
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -336,7 +336,20 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String guidedPrice = baseVehmodelVo.getGuidedPrice();
         String manufactorSettlementPrice = baseVehmodelVo.getManufactorSettlementPrice();
         vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice);
-        vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
+        String updateDate = DateUtil.formatDate(baseVehmodelVo.getModifyTime());
+        String nowDate = DateUtil.formatDate(new Date());
+        if (StringUtils.isBlank(guidedPrice) && StringUtils.isBlank(manufactorSettlementPrice)){
+            vo.setNewUpdateDate("");
+        }else {
+            vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
+        }
+        String[] updateDates = updateDate.split("-");
+        String[] nowDates = nowDate.split("-");
+        if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])){
+            vo.setIsNow(true);
+        }else {
+            vo.setIsNow(false);
+        }
         List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid);
         List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
         for (ScmFileVo scmFileVo : scmFileVos) {
@@ -420,7 +433,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String num = dto.getNum();
         String guidedPrice = dto.getGuidedPrice();
         String[] split = guidedPrice.split("/");
-        if (split.length < 2){
+        List<String> stringList = Arrays.asList(split);
+        if (stringList.size() < 2){
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可提交");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
@@ -579,7 +593,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData();
                 List<FlowTask> flowList = flowRecordVo.getFlowList();
                 for (FlowTask flowTask : flowList) {
-                    if (flowTask.getTaskName().equals("销售支持部经理审批")) {
+                    if (flowTask.getTaskName().equals("账务部审批")) {
+                        confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
+                        confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
+                        confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
+                        break;
+                    }else if (flowTask.getTaskName().equals("销售支持部经理审批")) {
                         confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
                         confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
                         confirmDate = DateUtil.formatDate(flowTask.getFinishTime());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -396,10 +396,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
                     //推送调拨单
                     //根据分公司sid查询分公司编码
-                    String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
-                    ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
-                    SysOrganizationVo sysOrganizationVo = sysOrg.getData();
-                    List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
+                    //String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid();
+                    //ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
+                    //SysOrganizationVo sysOrganizationVo = sysOrg.getData();
+/*                    List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
                     StkTransferDirect stkTransferDirect = new StkTransferDirect();
 //                    stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
 //                    stkTransferDirect.setFStockOrgId("101"); //调入库存组织
@@ -420,7 +420,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     fBillEntry.setFSrcStockId("ARZTCK");//调出仓库 在途
                     FPAYBILLENTRYs.add(fBillEntry);
                     stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
-                    ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
+                    ResultBean<String> resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);*/
                 }
                 //外采
                 if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -1137,7 +1137,7 @@ export default {
           if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate === '') && this.multipleSelection[i].settlementStatus !== '预买断') {
             this.$message({
               showClose: true,
-              message: '请选择销售日期不为空或买断状态为预买断的车辆！',
+              message: '请选择销售日期不为空且买断状态为预买断的车辆！',
               type: 'error'
             })
             return

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -55,7 +55,7 @@
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>最新更新时间</span></div>
               <el-form-item>
-                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="Date.parse(formobj.newUpdateDate) < new Date()">{{ formobj.newUpdateDate }}</span>
+                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="!formobj.isNow">{{ formobj.newUpdateDate }}</span>
                 <span class="addinputInfo addinputwOne" v-else>{{ formobj.newUpdateDate }}</span>
               </el-form-item>
             </el-col>

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@@ -53,7 +53,7 @@
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>最新更新时间</span></div>
               <el-form-item>
-                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="Date.parse(formobj.newUpdateDate) < new Date()">{{ formobj.newUpdateDate }}</span>
+                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="!formobj.isNow">{{ formobj.newUpdateDate }}</span>
                 <span class="addinputInfo addinputwOne" v-else>{{ formobj.newUpdateDate }}</span>
               </el-form-item>
             </el-col>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@@ -55,7 +55,7 @@
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>最新更新时间</span></div>
               <el-form-item>
-                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="Date.parse(formobj.newUpdateDate) < new Date()">{{ formobj.newUpdateDate }}</span>
+                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="!formobj.isNow">{{ formobj.newUpdateDate }}</span>
                 <span class="addinputInfo addinputwOne" v-else>{{ formobj.newUpdateDate }}</span>
               </el-form-item>
             </el-col>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -54,7 +54,7 @@
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>最新更新时间</span></div>
               <el-form-item>
-                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="Date.parse(formobj.newUpdateDate) < new Date()">{{ formobj.newUpdateDate }}</span>
+                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="!formobj.isNow">{{ formobj.newUpdateDate }}</span>
                 <span class="addinputInfo addinputwOne" v-else>{{ formobj.newUpdateDate }}</span>
               </el-form-item>
             </el-col>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@@ -53,7 +53,7 @@
             <el-col :span="12">
               <div class="span-sty spanOneWidth"><span>最新更新时间</span></div>
               <el-form-item>
-                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="Date.parse(formobj.newUpdateDate) < new Date()">{{ formobj.newUpdateDate }}</span>
+                <span class="addinputInfo addinputwOne" style="color: red;font-weight: bold" v-if="!formobj.isNow">{{ formobj.newUpdateDate }}</span>
                 <span class="addinputInfo addinputwOne" v-else>{{ formobj.newUpdateDate }}</span>
               </el-form-item>
             </el-col>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java

@@ -33,6 +33,9 @@ public class AdvanceInvoicePageVo implements Vo {
     private Boolean showUpdateBtn;
     @ApiModelProperty("是否显示删除按钮")
     private Boolean showDeleteBtn;
-
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("销售类型")
+    private String type;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@@ -61,7 +61,6 @@ import javax.validation.Valid;
         fallback = AppBusAdvanceGinvoiceapplyFeignFallback.class)
 public interface AppBusAdvanceGinvoiceapplyFeign {
 
-
     @ApiOperation("手机端-获取欠款开票列表")
     @PostMapping("/getAdvanceInvoiceList")
     @ResponseBody
@@ -77,6 +76,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
 
+    @ApiOperation("手机端-欠款开票详情")
+    @GetMapping("/detailAdvancelnvoice")
+    @ResponseBody
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(@RequestParam("sid") String sid);
+
     @ApiOperation("移动端-保存欠款开票申请")
     @PostMapping("/saveAdvanceInvoice")
     @ResponseBody
@@ -87,7 +91,6 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
 
-
     @ApiOperation("提交流程")
     @PostMapping("/submitAdvanceInvoiceInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java

@@ -66,6 +66,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
         return null;
     }
 
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java

@@ -62,6 +62,8 @@ public class FinBillTrailerVo implements Vo {
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
     @ApiModelProperty("合格证图片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -42,10 +42,10 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pagerQuery);
 
-    @ApiOperation("移动端-新增欠款提车申请")
+/*    @ApiOperation("移动端-新增欠款提车申请")
     @PostMapping("/addArrearsApply")
     @ResponseBody
-    public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);
+    public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);*/
 
     @ApiOperation("手机端-初始化欠款提车申请")
     @GetMapping("/initArrearsApply")
@@ -54,8 +54,7 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
 
     /**
      * 选择车辆列表
-     * @param contractNo 合同编号
-     * @param vinSids 已选择的车辆sid集合
+     *
      * @return
      */
     @ApiOperation("选择车辆列表")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -32,10 +32,10 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
         return null;
     }
 
-    @Override
+ /*   @Override
     public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java

@@ -64,6 +64,8 @@ public class FinBillTrailerVo implements Vo {
     private String openTickName; // 开票名称
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
     @ApiModelProperty("合格证图片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -37,4 +37,9 @@ public interface CommonFeign {
     @ResponseBody
     @GetMapping("/getSystem")
     ResultBean<List<SystemVo>> getSystem(@RequestParam("orgPath")String orgPath);
+
+    @ApiOperation(value = "获取金融部门主管")
+    @ResponseBody
+    @GetMapping("/selectFinance")
+    ResultBean<List<FinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.base.common;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/28 10:25
+ * @Description
+ */
+@Data
+public class FinanceVo {
+
+    @JsonProperty("dictKey")
+    private String userSid;
+    @JsonProperty("dictValue")
+    private String name;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@@ -47,10 +47,10 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
         return appBusArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery);
     }
 
-    @Override
+/*    @Override
     public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         return appBusArrearsCarryVehicleApplyService.addArrearsApply(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -69,12 +69,12 @@ public class AppBusArrearsCarryVehicleApplyService {
         return rb.success().setData(v);
     }
 
-    public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
+/*    public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
         AppArrearsCarryVinDto advanceArrearsVinDto = new AppArrearsCarryVinDto();
         BeanUtil.copyProperties(dto, advanceArrearsVinDto);
         ResultBean resultBean = busArrearsCarryVehicleApplyFeign.addArrearsApply(advanceArrearsVinDto);
         return resultBean;
-    }
+    }*/
 
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
         ResultBean<AdvanceArrearsInfoVo> rb = ResultBean.fireFail();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java

@@ -73,6 +73,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
         return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query);
     }
 
+    @Override
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
+        return appBusAdvanceGinvoiceapplyService.detailAdvancelnvoice(sid);
+    }
+
     @Override
     public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
         return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -122,6 +122,9 @@ public class AppBusAdvanceGinvoiceapplyService {
             advanceInvoicePageVo.setReason(record.getArrearsOpenYYValue());
             advanceInvoicePageVo.setDate(record.getApplyDate());
             advanceInvoicePageVo.setCustomerName(record.getCustomerName());
+            advanceInvoicePageVo.setModel(record.getModelName());
+            advanceInvoicePageVo.setType(record.getSaleTypeValue());
+            advanceInvoicePageVo.setContractType(record.getNodeState());
             if (record.getNodeState().equals("待提交")){
                 advanceInvoicePageVo.setShowUpdateBtn(true);
                 advanceInvoicePageVo.setShowDeleteBtn(true);
@@ -171,6 +174,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setContractId(finBillApplicationDetailsVo.getContractNo());
         vo.setDate(finBillApplicationDetailsVo.getApplyDate());
         vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
+        vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
         //车辆信息
         List<AppCarListVo> vinListVos = new ArrayList<>();
@@ -271,6 +276,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setNodeState(dto.getNodeState());
         finBillApplicationDto.setBillNo(dto.getBillNo());
+        finBillApplicationDto.setModelSid(dto.getModelSid());
+        finBillApplicationDto.setModelName(dto.getModelName());
         String publishInfo = dto.getPublishInfo();
         String[] split = publishInfo.split("-");
         finBillApplicationDto.setDeptName(split[0]);
@@ -381,6 +388,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid());
         submitAdvanceInvoiceDto.setNodeState(dto.getNodeState());
         submitAdvanceInvoiceDto.setBillNo(dto.getBillNo());
+        submitAdvanceInvoiceDto.setModelSid(dto.getModelSid());
+        submitAdvanceInvoiceDto.setModelName(dto.getModelName());
         String publishInfo = dto.getPublishInfo();
         String[] split = publishInfo.split("-");
         submitAdvanceInvoiceDto.setDeptName(split[0]);
@@ -568,4 +577,109 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
+        ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
+        AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
+        AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
+        appBillApplicationDetailsQKQuery.setSid(sid);
+        ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
+        BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
+        vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
+        vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
+        vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
+        vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
+        vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
+        vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
+        vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
+        vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
+        vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
+        vo.setSellerName(finBillApplicationDetailsVo.getStaffName());
+        vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
+        vo.setName(finBillApplicationDetailsVo.getCustomerName());
+        vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
+        vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid());
+        vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
+        vo.setContractId(finBillApplicationDetailsVo.getContractNo());
+        vo.setDate(finBillApplicationDetailsVo.getApplyDate());
+        vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        //车辆信息
+        List<AppCarListVo> vinListVos = new ArrayList<>();
+        List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
+        if (finBillVehicles != null){
+            for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
+                AppCarListVo vinListVo = new AppCarListVo();
+                vinListVo.setVin(finBillVehicle.getVinNo());
+                vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
+                vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
+                vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
+                vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
+                vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
+                vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVos.add(vinListVo);
+            }
+        }
+        vo.setVinList(vinListVos);
+        //挂车信息
+        List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
+        List<com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
+        if (finBillTrailers != null && finBillTrailers.size() > 0){
+            for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) {
+                com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
+                BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
+                String hgzImageUrl = finBillTrailer.getHgzImageUrl();
+                List<String> files = new ArrayList<>();
+                files.add(hgzImageUrl);
+                finBillTrailerVo.setFiles(files);
+                finBillTrailerVos.add(finBillTrailerVo);
+            }
+        }
+        vo.setFinBillTrailers(finBillTrailerVos);
+        //附件信息
+        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
+        List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
+        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
+        List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+        List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
+        List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
+        List<String> registerContractImages = new ArrayList<>();//车辆登记合同
+        List<String> idCardImages = new ArrayList<>();
+        if (zjApplicationAppendxs != null){
+            for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
+                idCardImages.add(zjApplicationAppendx.getFileUrl());
+            }
+        }
+        if (khkpsqsApplicationAppendxs != null){
+            for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
+                customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
+            }
+        }
+        if (kpxxqrsApplicationAppendxs != null){
+            for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
+                invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
+            }
+        }
+        if (cldjhtApplicationAppendxs != null){
+            for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
+                registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
+            }
+        }
+        vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
+        vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
+        vo.setRegisterContractImages(registerContractImages);
+        vo.setIdCardImages(idCardImages);
+        BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
+        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
+            vo.setIsCanEdit(false);
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }else {
+            vo.setIsCanEdit(true);
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -25,8 +25,8 @@ public class CommonRest implements CommonFeign {
     private CommonService commonService;
 
     @Override
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
-        return commonService.getPublicModelList(modelSid,orgPath);
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
+        return commonService.getPublicModelList(modelSid, orgPath);
     }
 
     @Override
@@ -38,4 +38,9 @@ public class CommonRest implements CommonFeign {
     public ResultBean<List<SystemVo>> getSystem(String orgPath) {
         return commonService.getSystem(orgPath);
     }
+
+    @Override
+    public ResultBean<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
+        return commonService.selectFinance(orgPath, userSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -9,10 +9,9 @@ import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelQuery;
 import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign;
-import com.yxt.anrui.terminal.api.base.common.PublicModelVo;
-import com.yxt.anrui.terminal.api.base.common.SystemVo;
-import com.yxt.anrui.terminal.api.base.common.TopConfigQuery;
-import com.yxt.anrui.terminal.api.base.common.TopConfigVo;
+import com.yxt.anrui.portal.api.sysorganization.SysFinanceVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.terminal.api.base.common.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,10 +38,12 @@ public class CommonService {
     private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
         ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
-        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid,orgPath);
+        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid, orgPath);
         List<PublicModelVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
@@ -64,4 +65,11 @@ public class CommonService {
         List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
+        ResultBean<List<FinanceVo>> rb = ResultBean.fireFail();
+        ResultBean<List<SysFinanceVo>> resultBean = sysOrganizationFeign.selectFinance(orgPath, userSid);
+        List<FinanceVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinanceVo.class)).collect(Collectors.toList());
+        return rb.success().setData(list);
+    }
 }