Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -96,5 +96,10 @@ public class AppDeliveredDetailsVo implements Vo {
     @ApiModelProperty("PC服务费合计2")
     private String pcDistributorPriceTwoAll;
 
+    @ApiModelProperty("销售订单sid")
+    private String busSalesOrderSid;
+
+    private String taskDefKey;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -210,4 +210,10 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto);
 
+
+    @ApiOperation("查看车辆的款票情况")
+    @GetMapping("/deliveredFinSelect")
+    @ResponseBody
+    ResultBean<DeliveredFinVo> deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -111,6 +111,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<DeliveredFinVo> deliveredFinSelect(String contractNo, String vinSid) {
+        return null;
+    }
+
     @Override
     public ResultBean complete(BusDeliveredApplyCompleteDto query) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java

@@ -60,5 +60,7 @@ public class BusDeliveredApplyQuery implements Query {
     private String applyName;
     @ApiModelProperty(value = "申请人sid")
     private String applySid;
+    @ApiModelProperty("销售类型")
+    private String paymentMethodKey;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java

@@ -24,4 +24,8 @@ public class BusDeliveredExamineQuery implements Query {
     private String applyName;
     @ApiModelProperty(value = "员工sid")
     private String staffSid;
+    @ApiModelProperty("orgPath")
+    private String orgPath;
+    
+    private String paymentMethodKey;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/19 9:22
+ * @Description
+ */
+@Data
+public class DeliveredFinVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("款项情况")
+    private List<FinSelectVo> finSelectVoList = new ArrayList<>();
+    @ApiModelProperty("发票情况")
+    private VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/19 10:30
+ * @Description
+ */
+@Data
+public class FinSelectVo {
+
+    @ApiModelProperty("款项名称")
+    private String receivablesName;
+
+    @ApiModelProperty("应收金额")
+    private String reveivableMoney;
+    @ApiModelProperty("已收金额")
+    private String subscriptionMoneyAll;
+
+    @ApiModelProperty("未收金额")
+    private String notSubscriptionMoney;
+
+    private String remarks;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/19 10:35
+ * @Description
+ */
+@Data
+public class VinInvoiceVo {
+
+    //开票名称
+    private String invoicingName;
+    //税号
+    private String invoiceNo;
+    //开票单位
+    private String invoiceTitle;
+    //开票类型
+    private String invoiceType;
+    //开票状态
+    private String billingState;
+    //开票金额
+    private String invoiceAmount;
+    //开票日期
+    private String invoiceDate;
+    //移交状态
+    private String transferState;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("联系电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @ApiModelProperty("移交日期")
+    private String transferTime;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java

@@ -12,12 +12,14 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.util.List;
 
+
 /**
  * @author Administrator
  * @description
  * @date 2023/4/13 14:58
  */
 
+
 @Api(tags = "优惠包交接表")
 @FeignClient(
         contextId = "anrui-buscenter-BusDiscountpackageHandover",
@@ -52,6 +54,6 @@ public interface BusDiscountpackageHandoverFeign {
 
     @ApiOperation(("上传图片"))
     @PostMapping("/uploadPicture")
-    public ResultBean uploadPicture(@RequestBody List<BusFileDto> fileDtos , String sid);
+    public ResultBean uploadPicture(@RequestBody BusDiscountpackageHandoverDto dto);
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java

@@ -53,7 +53,9 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka
     }
 
     @Override
-    public ResultBean uploadPicture(List<BusFileDto> fileDto, String sid) {
+    public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) {
         return null;
     }
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java

@@ -12,6 +12,7 @@ import lombok.Data;
 @Data
 public class BusFileDto implements Dto {
 
+
     @ApiModelProperty("关联sid")
     private String linkSid;
     @ApiModelProperty("文件类型")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -137,5 +137,7 @@ public class AppOrderDetailsVo implements Vo {
 
     private List<OrderSolutionVo> financeForms = new ArrayList<>();
 
+    private String busSalesOrderSid;
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -400,6 +400,13 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if (!userVoResultBean.getSuccess()) {
                 return rb.setMsg(userVoResultBean.getMsg());
             }
+            ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
+            if (!resultBean.getSuccess()) {
+                log.error("获取销售订单详情出错啦！！！");
+                return rb;
+            }
+            appDeliveredDetailsVo.setTaskDefKey(busDeliveredApply.getTaskDefKey());
+            appDeliveredDetailsVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid());
             List<BusDeliveredApplyDetails> busDeliveredApplyDetailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid());
             busDeliveredApplyDetailsList.removeAll(Collections.singleton(null));
              //pc发起人

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -95,7 +95,7 @@
     </update>
 
     <select id="selectVinNo" resultType="java.lang.String">
-        select bv.linkNo
+        select RIGHT(bv.linkNo, 8)
         from bus_delivered bd
                  left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
         where bd.contractNo = #{contractId}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -174,6 +174,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return busDeliveredApplyService.submitAppDeliveredApply(dto);
     }
 
+    @Override
+    public ResultBean<DeliveredFinVo> deliveredFinSelect(String contractNo, String vinSid) {
+        return busDeliveredApplyService.deliveredFinSelect(contractNo,vinSid);
+    }
+
     @Override
     public ResultBean complete(BusDeliveredApplyCompleteDto query) {
         BusinessVariables bv = new BusinessVariables();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -71,6 +71,10 @@ import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo;
+import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -161,6 +165,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusSalesOrderVehicleService busSalesOrderVehicleService;
     @Autowired
     private BusDiscountpackageHandoverService busDiscountpackageHandoverService;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -177,7 +183,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             //客户名称
             if (StringUtils.isNotBlank(query.getName())) {
-                qw.eq("bd.name", query.getName());
+                qw.like("bd.name", query.getName());
             }
             if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
                 qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd());
@@ -186,6 +192,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 qw.like("bd.applyName", query.getApplyName());
             }
             qw.eq("bd.applySid", query.getApplySid());
+            if(StringUtils.isNotBlank(query.getPaymentMethodKey())){
+                qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
+            }
         }
         return qw;
     }
@@ -409,22 +418,28 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             //客户名称
             if (StringUtils.isNotBlank(query.getName())) {
-                qw.eq("bd.name", query.getName());
+                qw.like("bd.name", query.getName());
             }
             if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
-                qw.between("bd.applyDate", query.getApplyDateStart(), query.getApplyDateEnd());
+                qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd());
             }
             if (StringUtils.isNotBlank(query.getApplyName())) {
                 qw.like("bd.applyName", query.getApplyName());
             }
             //根据申请人sid查询分公司sid
             String orgSid = "";
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid());
+            /*ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid());
             if (stringResultBean.getSuccess()) {
                 orgSid = stringResultBean.getData();
+            }*/
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             }
-            qw.eq("bd.orgSid", orgSid);
+            qw.eq("bd.useOrgSid", orgSid);
             qw.ne("bd.state", 1);
+            if(StringUtils.isNotBlank(query.getPaymentMethodKey())){
+                qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
+            }
         }
         return qw;
     }
@@ -757,7 +772,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @return
      */
     public ResultBean taskReject(BusDeliveredApplyTaskQuery query) {
-
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
         if (busDeliveredApply == null) {
@@ -776,6 +790,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                //将该申请的车架号的待出库中的状态修改为出库中
+                List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
+                //更新该合同的该车架号的状态为0
+                busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
                 return rb.success();
             }
         }
@@ -808,6 +826,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
                 baseMapper.updateStateBySid(1, query.getBusinessSid());
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                //将该申请的车架号的待出库中的状态修改为出库中
+                List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
+                //更新该合同的该车架号的状态为0
+                busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -841,6 +863,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
                 baseMapper.updateStateBySid(4, query.getBusinessSid());
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                //将该申请的车架号的待出库中的状态修改为出库中
+                List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
+                //更新该合同的该车架号的状态为0
+                busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1299,7 +1325,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
             appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
             //查询该车辆是否有挂车
-            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
+            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
             if (trailerList.getData().getList().isEmpty()) {
                 appCarListVo.setShowHandCarBtn(false);
             } else {
@@ -1479,7 +1505,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if (r == 2) {
             // ToDo:驳回到发起人后再次提交
             if (StringUtils.isBlank(dto.getInstanceId())) {
-                return rb.setMsg("参数错误：instanceId");
+                return rb.setMsg("参数错误：procInsId");
             }
             bv.setTaskId(busDeliveredApply.getTaskId());
             bv.setTaskDefKey(busDeliveredApply.getTaskDefKey());
@@ -1520,6 +1546,35 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return r;
     }
 
+    public ResultBean<DeliveredFinVo> deliveredFinSelect(String contractNo, String vinSid) {
+        ResultBean<DeliveredFinVo> rb = ResultBean.fireFail();
+        DeliveredFinVo deliveredFinVo = new DeliveredFinVo();
+        //查询销售订单
+        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);
+        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        //根据合同号和车辆sid查询车辆
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
+        deliveredFinVo.setVinNo(busSalesOrderVehicle.getLinkNo());
+        deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType());
+        deliveredFinVo.setContractNo(contractNo);
+        deliveredFinVo.setCustomerName(appOrderDetailsVo.getName());
+        deliveredFinVo.setModelName(appOrderDetailsVo.getModelInfo().getModelName());
+        //根据销售订单车辆查询款项情况
+        ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedFeign.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid());
+        if (receiveInvoiceVoResultBean.getData() != null) {
+            List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList();
+            List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList());
+            deliveredFinVo.setFinSelectVoList(voList);
+            InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
+            if (invoiceVo != null) {
+                VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();
+                BeanUtil.copyProperties(invoiceVo, vinInvoiceVo);
+                deliveredFinVo.setVinInvoiceVo(vinInvoiceVo);
+            }
+        }
+        return rb.success().setData(deliveredFinVo);
+    }
+
 //    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
 //        ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
 //        AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java

@@ -77,10 +77,9 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
     }
 
     @Override
-    public ResultBean uploadPicture(List<BusFileDto> fileDtos,String sid) {
-
+    public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        boolean isUpload = busDiscountpackageHandoverService.uploadPicture(fileDtos,sid);
+        boolean isUpload = busDiscountpackageHandoverService.uploadPicture(dto);
         if (isUpload) {
             return rb.success().setMsg("上传成功");
         } else {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -206,7 +206,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                     dto.setRecTime(currentDate);
                     List<BusFileDto> busFiles = dto.getBusFiles();
                     if (null != busFiles) {
-                        uploadPicture(busFiles, sid);
+                        this.uploadPicture(dto);
                     }
                 } else {
                     dto.setState("2");
@@ -237,7 +237,6 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         return i;
     }
 
-
     public BusDiscountpackageHandoverDetailsVo handoverDetails(String sid) {
 
         BusDiscountpackageHandoverDetailsVo detailsVo = new BusDiscountpackageHandoverDetailsVo();
@@ -393,13 +392,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         return path;
     }
 
-    public boolean uploadPicture(List<BusFileDto> fileDtos, String sid) {
+    public boolean uploadPicture(BusDiscountpackageHandoverDto dto) {
         boolean isSuccess = false;
-        BusDiscountpackageHandover bh = this.fetchById(sid);
-        if (null != fileDtos) {
-            for (BusFileDto busFile : fileDtos) {
+        BusDiscountpackageHandover bh = this.fetchById(dto.getSid());
+        if (null != dto.getBusFiles()) {
+            List<BusFileDto> busFiles = dto.getBusFiles();
+            for (BusFileDto busFile : busFiles) {
                 BusFile bf = new BusFile();
-                busFile.setLinkSid(sid);
+                busFile.setLinkSid(dto.getSid());
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String[] split = busFile.getFilePath().split(urlPrefix);
                 busFile.setFilePath(split[1]);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java

@@ -1,6 +1,10 @@
 package com.yxt.anrui.buscenter.biz.busfile;
+
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover;
 import com.yxt.anrui.buscenter.api.busfile.BusFile;
+import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
+import com.yxt.anrui.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +22,7 @@ import java.util.List;
 public class BusFileService extends MybatisBaseService<BusFileMapper, BusFile> {
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusDiscountpackageHandoverService busDiscountpackageHandoverService;
 
-    public void saveAll(String sid, List<String> entrustConfirmImages, String attachType) {
-
-
-    }
 }

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

@@ -3079,6 +3079,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         AppOrderDetailsVo vo = new AppOrderDetailsVo();
         vo = baseMapper.getSaleOrderDetails(sid);
+        vo.setBusSalesOrderSid(sid);
         ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid);
         if (commonContractVoResultBean.getData() != null) {
             vo.setContractId(commonContractVoResultBean.getData().getContractNo());

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue

@@ -33,11 +33,11 @@
               <el-form-item prop="mainVehicleAmount">
                 <div class="addinputInfo">
                   <span><span class="icon">*</span>主车发票价<el-input v-model="formobj.mainVehicleAmount" clearable style="width: 100px" placeholder="" @keyup.native="formobj.mainVehicleAmount = oninput(formobj.mainVehicleAmount, 2)"/>元</span>
-                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.accessoriesAmountCb" style="padding-right: 5px"/>融资票据<el-input :disabled="formobj.accessoriesAmountCb" v-model="formobj.accessoriesAmount" clearable style="width: 100px" placeholder="" @keyup.native="formobj.accessoriesAmount = oninput(formobj.accessoriesAmount, 2)"/>元</span>
-                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input :disabled="formobj.trailerAmountCb" v-model="formobj.trailerAmount" clearable style="width: 100px" placeholder="" @keyup.native="formobj.trailerAmount = oninput(formobj.trailerAmount, 2)"/>元</span>
-                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.premiumCb" style="padding-right: 5px"/>保险<el-input :disabled="formobj.premiumCb" v-model="formobj.premium" clearable style="width: 100px" placeholder="" @keyup.native="formobj.premium = oninput(formobj.premium, 2)"/>元</span>
-                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.purchaseTaxCb" style="padding-right: 5px"/>购置税<el-input :disabled="formobj.purchaseTaxCb" v-model="formobj.purchaseTax" clearable style="width: 100px" placeholder="" @keyup.native="formobj.purchaseTax = oninput(formobj.purchaseTax, 2)"/>元</span>
-                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.vehDamageFloatCb" style="padding-right: 5px"/>车损上浮<el-input :disabled="formobj.vehDamageFloatCb" v-model="formobj.vehDamageFloat" clearable style="width: 100px" placeholder="" @keyup.native="formobj.vehDamageFloat = oninput(formobj.vehDamageFloat, 2)"/>元</span>
+                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.accessoriesAmountCb" style="padding-right: 5px"/>融资票据<el-input :disabled="!formobj.accessoriesAmountCb" v-model="formobj.accessoriesAmount" clearable style="width: 100px" placeholder="" @keyup.native="formobj.accessoriesAmount = oninput(formobj.accessoriesAmount, 2)"/>元</span>
+                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input :disabled="!formobj.trailerAmountCb" v-model="formobj.trailerAmount" clearable style="width: 100px" placeholder="" @keyup.native="formobj.trailerAmount = oninput(formobj.trailerAmount, 2)"/>元</span>
+                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.premiumCb" style="padding-right: 5px"/>保险<el-input :disabled="!formobj.premiumCb" v-model="formobj.premium" clearable style="width: 100px" placeholder="" @keyup.native="formobj.premium = oninput(formobj.premium, 2)"/>元</span>
+                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.purchaseTaxCb" style="padding-right: 5px"/>购置税<el-input :disabled="!formobj.purchaseTaxCb" v-model="formobj.purchaseTax" clearable style="width: 100px" placeholder="" @keyup.native="formobj.purchaseTax = oninput(formobj.purchaseTax, 2)"/>元</span>
+                  <span style="padding-left: 5px"><el-checkbox v-model="formobj.vehDamageFloatCb" style="padding-right: 5px"/>车损上浮<el-input :disabled="!formobj.vehDamageFloatCb" v-model="formobj.vehDamageFloat" clearable style="width: 100px" placeholder="" @keyup.native="formobj.vehDamageFloat = oninput(formobj.vehDamageFloat, 2)"/>元</span>
                 </div>
               </el-form-item>
             </el-col>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@@ -573,6 +573,8 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '采购系统不能为空' })
         return
       }
+      this.formobj.purchaseSystemName = this.purchaseName
+      this.formobj.purchaseSystemSid = this.purchaseSid
       this.cancel()
       this.currentLink = true
       this.dialogList.comment = '同意'
@@ -631,8 +633,8 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.linkByParameter.comment = this.dialogList.comment
-      this.linkByParameter.purchaseSystemName = this.purchaseName
-      this.linkByParameter.purchaseSystemSid = this.purchaseSid
+      this.linkByParameter.purchaseSystemName = this.formobj.purchaseSystemName
+      this.linkByParameter.purchaseSystemSid = this.formobj.purchaseSystemSid
       completeBy(this.linkByParameter).then((response) => {
         if (response.success) {
           this.$notify({

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
-import com.yxt.anrui.fin.api.finpaymentrecord.PdfPath;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -105,4 +103,9 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation(("下载收款收据"))
     @PostMapping("/createPdf")
     public ResultBean<String> createPdf(@RequestParam("detailedSid") String detailedSid, @RequestParam("createBySid") String createBySid) throws Exception;
+
+    @ApiOperation("查询车辆的款项及发票情况")
+    @GetMapping("/receivedSelect")
+    ResultBean<ReceiveInvoiceVo> receivedSelect(@RequestParam("busVinSid") String busVinSid, @RequestParam("vinSid") String vinSid);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -111,4 +111,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
     	return null;
 	}
 
+	@Override
+	public ResultBean<ReceiveInvoiceVo> receivedSelect(String busVinSid, String vinSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveInvoiceVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/19 14:17
+ * @Description
+ */
+@Data
+public class ReceiveInvoiceVo {
+
+    private List<ReceiveSeleteVo> receiveSeleteVoList = new ArrayList<>();
+
+    private InvoiceVo invoiceVo;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/19 14:18
+ * @Description
+ */
+@Data
+public class ReceiveSeleteVo {
+
+    @ApiModelProperty("款项名称")
+    private String receivablesName;
+
+    @ApiModelProperty("应收金额")
+    private String reveivableMoney;
+    @ApiModelProperty("已收金额")
+    private String subscriptionMoneyAll;
+
+    @ApiModelProperty("未收金额")
+    private String notSubscriptionMoney;
+    @ApiModelProperty("备注")
+    private String remarks;
+}

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

@@ -126,4 +126,18 @@ public class FinVehicleInvoice extends BaseEntity {
     @ApiModelProperty("业务状态")
     private String businessState;
 
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("联系电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("移交日期")
+    private Date transferTime;
+
 }

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

@@ -49,6 +49,19 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
     private String invoiceCode;
     @ApiModelProperty("图片地址")
     private String filePath;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("联系电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("移交日期")
+    private Date transferTime;
     @ApiModelProperty("图片地址集合")
     private List<String> filePaths;
 }

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

@@ -34,10 +34,10 @@ public class FinVehicleInvoiceDto implements Dto {
     private Integer lockVersion;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("创建时间")
-    private String createTime;
+    private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("修改时间")
-    private String modifyTime;
+    private Date modifyTime;
     @ApiModelProperty("是否可用：1可用，0不可用")
     private Integer isEnable;
     private Integer state;
@@ -62,7 +62,7 @@ public class FinVehicleInvoiceDto implements Dto {
     private BigDecimal vehiclAmount;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("最大发票开票日期")
-    private String invoiceDate;
+    private Date invoiceDate;
     @ApiModelProperty("发票号")
     private String invoiceNo;
     @ApiModelProperty("发票代码")
@@ -96,4 +96,17 @@ public class FinVehicleInvoiceDto implements Dto {
     private String businessStateKey;
     @ApiModelProperty("业务状态")
     private String businessState;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("联系电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("移交日期")
+    private Date transferTime;
 }

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

@@ -52,18 +52,18 @@ public class FinVehicleInvoiceVo implements Vo {
     private String customerName;
     @ApiModelProperty("车架号")
     private String vinNo;
-	@ApiModelProperty("开票名称")
+    @ApiModelProperty("开票名称")
     private String invoicingName;
-	@ApiModelProperty("开票金额")
+    @ApiModelProperty("开票金额")
     private String invoiceAmount;
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("开票日期")
     private Date createTime;
-	@ApiModelProperty("发票代码")
+    @ApiModelProperty("发票代码")
     private String invoiceCode;
     @ApiModelProperty("发票号")
     private String invoiceNo;
-	@ApiModelProperty("发票图片")
+    @ApiModelProperty("发票图片")
     private String filePath;
     @ApiModelProperty("发票图片集合")
     private List<String> filePaths;
@@ -71,4 +71,18 @@ public class FinVehicleInvoiceVo implements Vo {
     private String businessStateKey;
     @ApiModelProperty("业务状态")
     private String businessState;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("联系电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("移交日期")
+    private Date transferTime;
+
 }

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

@@ -0,0 +1,42 @@
+package com.yxt.anrui.fin.api.finvehicleinvoice;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/19 14:19
+ * @Description
+ */
+@Data
+public class InvoiceVo {
+
+    //开票名称
+    private String invoicingName;
+    //税号
+    private String invoiceNo;
+    //开票单位
+    private String invoiceTitle;
+    //开票类型
+    private String invoiceType;
+    //开票状态
+    private String billingState;
+    //开票金额
+    private String invoiceAmount;
+    //开票日期
+    private String invoiceDate;
+    //移交状态
+    private String transferState;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("联系电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @ApiModelProperty("移交日期")
+    private String transferTime;
+}

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

@@ -36,7 +36,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -88,4 +87,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     List<FinUncollectedReceivablesDetailed> fetchByContractNo(String contractId);
 
     FinUncollectedReceivablesDetailedPdfVo selectPdf(String detailedSid);
+
+    List<ReceiveSeleteVo> receivedSelect(String busVinSid);
 }

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

@@ -122,4 +122,29 @@
 
     </select>
 
+    <select id="receivedSelect" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo">
+        SELECT
+            furd.receivablesName,
+            furd.reveivableMoney, (
+                SELECT
+                    sum(subscriptionMoney)
+                FROM
+                    fin_selected_receivables_detailed
+                WHERE
+                    receivablesSid = furd.sid
+                  AND auditState = 3) as subscriptionMoneyAll,
+        (
+        SELECT
+        group_concat(length(remarks)>0,',')
+        FROM
+        fin_selected_receivables_detailed
+        WHERE
+        receivablesSid = furd.sid
+        AND auditState = 3
+        ) AS remarks
+        FROM
+            fin_uncollected_receivables_detailed furd
+        WHERE
+            furd.busVinSid = #{busVinSid}
+    </select>
 </mapper>

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

@@ -129,7 +129,12 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
 
     @Override
     public ResultBean<String> createPdf(String detailedSid, String createBySid) throws Exception {
-        return finUncollectedReceivablesDetailedService.createPdf(detailedSid,createBySid);
+        return finUncollectedReceivablesDetailedService.createPdf(detailedSid, createBySid);
+    }
+
+    @Override
+    public ResultBean<ReceiveInvoiceVo> receivedSelect(String busVinSid, String vinSid) {
+        return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid);
     }
 
 

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

@@ -36,13 +36,15 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
+import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
 import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
 import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
+import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
@@ -63,10 +65,8 @@ import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -118,6 +118,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     private LoanSolutionsFeign loanSolutionsFeign;
     @Autowired
     private FinCompanyInvoicingService finCompanyInvoicingService;
+    @Autowired
+    private FinVehicleInvoiceService finVehicleInvoiceService;
 
     private QueryWrapper<FinUncollectedReceivablesDetailed> createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) {
         /**
@@ -343,6 +345,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         qw.orderByDesc("createTime");
         return qw;
     }
+
     public PagerVo<FinUncollectedReceivablesDetailedVo> detailedListPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
         String orgPath = params.getOrgPath();
@@ -742,4 +745,27 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         }
     }
 
+    public ResultBean<ReceiveInvoiceVo> receivedSelect(String busVinSid, String vinSid) {
+        ResultBean<ReceiveInvoiceVo> rb = ResultBean.fireFail();
+        ReceiveInvoiceVo receiveInvoiceVo = new ReceiveInvoiceVo();
+        //根据销售订单车辆sid查询应收未收表中该车的情况
+        List<ReceiveSeleteVo> receiveSeleteVoList = baseMapper.receivedSelect(busVinSid);
+        receiveSeleteVoList.removeAll(Collections.singleton(null));
+        if (!receiveSeleteVoList.isEmpty()) {
+            for (int i = 0; i < receiveSeleteVoList.size(); i++) {
+                ReceiveSeleteVo receiveSeleteVo = receiveSeleteVoList.get(i);
+                BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll()));
+                receiveSeleteVo.setNotSubscriptionMoney(notSubscriptionMoney.toString());
+            }
+        }
+        receiveInvoiceVo.setReceiveSeleteVoList(receiveSeleteVoList);
+        //根据车辆sid查询该车辆的发票信息
+        FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(vinSid);
+        if(finVehicleInvoice != null){
+            InvoiceVo invoiceVo = new InvoiceVo();
+            BeanUtils.copyProperties(finVehicleInvoice,invoiceVo);
+            receiveInvoiceVo.setInvoiceVo(invoiceVo);
+        }
+        return rb.success().setData(receiveInvoiceVo);
+    }
 }

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

@@ -44,4 +44,5 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
 
 	FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid);
 
+    FinVehicleInvoice selectByVinSid(String vinSid);
 }

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

@@ -22,6 +22,12 @@
         <result column="transferStateKey" property="transferStateKey"></result>
         <result column="businessStateKey" property="businessStateKey"></result>
         <result column="businessState" property="businessState"></result>
+        <result column="address" property="address"></result>
+        <result column="telPhone" property="telPhone"></result>
+        <result column="openingBank" property="openingBank"></result>
+        <result column="bankNum" property="bankNum"></result>
+        <result column="recipient" property="recipient"></result>
+        <result column="transferTime" property="transferTime"></result>
     </resultMap>
 
 
@@ -48,7 +54,13 @@
         createTime,
         invoiceCode,
         invoiceNo,
-        filePath
+        filePath,
+        address,
+        telPhone,
+        openingBank,
+        bankNum,
+        recipient,
+        transferTime
         FROM fin_vehicle_invoice
         <where>
             ${ew.sqlSegment}
@@ -117,6 +129,12 @@
         <result column="filePath" property="filePath"></result>
         <result column="name" property="name"></result>
         <result column="invoiceNo" property="invoiceNo"></result>
+        <result column="address" property="address"></result>
+        <result column="telPhone" property="telPhone"></result>
+        <result column="openingBank" property="openingBank"></result>
+        <result column="bankNum" property="bankNum"></result>
+        <result column="recipient" property="recipient"></result>
+        <result column="transferTime" property="transferTime"></result>
     </resultMap>
     <select id="getInvoiceDetailsBySid"
            resultMap="getInvoiceDetailsBySidResultMap">
@@ -137,11 +155,19 @@
             v.createTime as createTime,
             v.invoiceNo as invoiceNo,
             v.invoiceCode as invoiceCode,
-            v.filePath as filePath
+            v.filePath as filePath,
+            v.address as address,
+            v.telPhone as telPhone,
+            v.openingBank as openingBank,
+            v.recipient as recipient,
+            v.transferTime as transferTime
         FROM fin_vehicle_invoice AS v
                  LEFT JOIN anrui_portal.sys_user AS u ON v.createBySid = u.sid
                  LEFT JOIN anrui_portal.sys_staffinfo AS si ON u.staffSid = si.sid
         WHERE v.isDelete = '0' AND v.sid = #{sid}
     </select>
 
+    <select id="selectByVinSid" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice">
+        select *,DATE_FORMAT(transferTime,'%Y-%m-%d') as transferTime,DATE_FORMAT(invoiceDate,'%Y-%m-%d') as invoiceDate from fin_vehicle_invoice where vehicleSid = #{vinSid} limit 1
+    </select>
 </mapper>

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

@@ -235,4 +235,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         }
         return save(finVehicleInvoice);
     }
+
+    public FinVehicleInvoice selectByVinSid(String vinSid) {
+        return baseMapper.selectByVinSid(vinSid);
+    }
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml

@@ -159,14 +159,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="endDate != null and endDate != ''">
                     AND ahpi.START_TIME_ <![CDATA[ <=  ]]> #{endDate}
                 </if>
-                <if test="names != null and names != ''">
-                    and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+                <if test="proDefName != null and proDefName != ''">
+                    and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{proDefName},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+                </if>
+                <if test="startUserSid != null and startUserSid != ''">
+                    and A0.NAME_ = 'INITIATOR' and A0.TEXT_ LIKE concat('%',#{startUserSid},'%')
                 </if>
             </where>
         ) flow
         GROUP BY flow.PROC_INST_ID_
         ORDER BY flow.START_TIME_ DESC
-        <!--LIMIT #{page},#{size}-->
+        LIMIT #{page},#{size}
     </select>
     <select id="finishedListCount" parameterType="java.util.Map" resultType="int">
         SELECT COUNT(DISTINCT ahpi.PROC_INST_ID_)
@@ -176,15 +179,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INNER JOIN `ACT_HI_VARINST` A0 ON ahpi.PROC_INST_ID_ = A0.PROC_INST_ID_
         LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_
         <where>
-            <if test="proDefName != null and proDefName != ''">
+           <!-- <if test="proDefName != null and proDefName != ''">
                 AND arpd.NAME_ LIKE concat('%',#{proDefName},'%')
-            </if>
+            </if>-->
             <if test="startDate != null and startDate != ''">
                 AND ahpi.START_TIME_ <![CDATA[ >=  ]]> #{startDate}
             </if>
             <if test="endDate != null and endDate != ''">
                 AND ahpi.START_TIME_ <![CDATA[ <=  ]]> #{endDate}
             </if>
+            <if test="names != null and names != ''">
+                and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+            </if>
+            <if test="startUserSid != null and startUserSid != ''">
+                and A0.NAME_ = 'INITIATOR' and A0.TEXT_ LIKE concat('%',#{startUserSid},'%')
+            </if>
         </where>
     </select>
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -465,7 +465,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
 
         Page<FlowTaskDto> page = new Page<>();
         TaskQuery taskQuery = taskService.createTaskQuery();
-        String startUserNameParams = "";
+        String startUserSidParams = "";
         String names = "";
 
         // 流程参数
@@ -486,8 +486,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     }
                 }
                 //发起人姓名查询
-                if("startUserName".equals(btq.getField())){
-                    startUserNameParams = btq.getValue();
+                if("startUserSid".equals(btq.getField())){
+                    startUserSidParams = btq.getValue();
                 }
             }
             if("proDefName".equals(btq.getField())){
@@ -505,6 +505,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
                     or.endOr();
                 }
+                if(StringUtils.isNotBlank(startUserSidParams)){
+                    or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
+                }
                 //.taskCandidateGroupIn(roleSidList)
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
@@ -582,18 +585,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             flowList.add(flowTask);
         }
-        //筛选发起人==============================
-        /*if (StringUtils.isNotBlank(startUserNameParams)) {
-            String finalStartUserNameParams = startUserNameParams;
-            flowList = flowList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(names)){
-            String finalNames = names;
-            flowList = flowList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList());
-        }
-        page.setTotal(flowList.size());
-        flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());*/
         page.setRecords(flowList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
@@ -704,8 +695,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         Page<FlowTaskDto> page = new Page<>();
         Map<String, Object> paraMap = new HashMap<>();
         List<Map<String, Object>> ll = new ArrayList<>();
-        String startUserNameParams = "";
-        String names = "";
         for (BusinessTaskParam btq : params) {
             paraMap.put(btq.getField(), btq.getValue());
             Map<String, Object> mapss = new HashMap<>();
@@ -720,15 +709,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 mapss.put("filed", btq.getField());
             }
             ll.add(mapss);
-            //查询条件发起人
-           /* if("startUserName".equals(btq.getField())){
-                paraMap.remove("startUserName");
-                startUserNameParams = btq.getValue();
-            }
-            if("proDefName".equals(btq.getField())){
-                names = btq.getValue();
-                paraMap.put("names",names);
-            }*/
         }
         paraMap.put("userSid", userSid);
         paraMap.put("list", ll);
@@ -821,18 +801,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             hisTaskList.add(flowTask);
         }
-        //对hisTaskList进行筛选发起人
-       /* if (StringUtils.isNotBlank(startUserNameParams)) {
-            String finalStartUserNameParams = startUserNameParams;
-            hisTaskList = hisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(names)){
-            String finalNames = names;
-            hisTaskList = hisTaskList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList());
-        }
-        page.setTotal(hisTaskList.size());
-        hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());*/
         page.setTotal(count);
         page.setRecords(hisTaskList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
@@ -864,11 +832,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 mapss.put("filed", btq.getField());
             }*/
             ll.add(mapss);
-            if("proDefName".equals(btq.getField())){
+            /*if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
                 paraMap.put("names",names);
                 paraMap.remove("proDefName");
-            }
+            }*/
         }
 
         paraMap.put("userSid", userSid);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskAllQuery.java

@@ -18,6 +18,6 @@ public class FlowTaskAllQuery implements Query {
     private String endDate;//结束日期
     private String orgSid;//部门sid
 
-    @ApiModelProperty(value = "发起人姓名")
-    private String startUserName;
+    @ApiModelProperty("发起人sid")
+    private String startUserSid;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -379,11 +379,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(orgSid);
             taskParamList.add(taskParam);
         }
-        if(StringUtils.isNotBlank(params.getStartUserName())){
+        if(StringUtils.isNotBlank(params.getStartUserSid())){
             BusinessTaskParam taskParam = new BusinessTaskParam();
-            taskParam.setField("startUserName");
+            taskParam.setField("startUserSid");
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
-            taskParam.setValue(params.getStartUserName());
+            taskParam.setValue(params.getStartUserSid());
             taskParamList.add(taskParam);
         }
 
@@ -449,11 +449,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(processDefinitionId);
             taskParamList.add(taskParam);
         }
-        if(StringUtils.isNotBlank(params.getStartUserName())){
+        if(StringUtils.isNotBlank(params.getStartUserSid())){
             BusinessTaskParam taskParam = new BusinessTaskParam();
-            taskParam.setField("startUserName");
+            taskParam.setField("startUserSid");
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
-            taskParam.setValue(params.getStartUserName());
+            taskParam.setValue(params.getStartUserSid());
             taskParamList.add(taskParam);
         }
         taskQuery.setFields(taskParamList);

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

@@ -47,6 +47,19 @@
               <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>全款/贷款销售指导价</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.guidedPrice }}</span></el-form-item>
+            </el-col>
+            <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" v-else>{{ formobj.newUpdateDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24" class="tlineheightb">
               <div class="span-sty spanOneWidth"><span>常用配置</span></div>
@@ -292,7 +305,9 @@ export default {
         vehicleList: [],
         vehicleOrderSid: '',
         orgPath: '',
-        orgPriceDate: ''
+        orgPriceDate: '',
+        guidedPrice: '',
+        newUpdateDate: ''
       },
       rules: {},
       submitdisabled: false
@@ -961,7 +976,7 @@ export default {
   align-items: center;
 }
 .spanOneWidth {
-  width: 120px !important;
+  width: 140px !important;
 }
 .spanTwoWidth {
   line-height: 42px;
@@ -985,6 +1000,6 @@ export default {
   width: 40% !important;
 }
 .addinputwOne {
-  margin-left: 115px !important;
+  margin-left: 130px !important;
 }
 </style>

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

@@ -45,6 +45,19 @@
               <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>全款/贷款销售指导价</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.guidedPrice }}</span></el-form-item>
+            </el-col>
+            <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" v-else>{{ formobj.newUpdateDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24" class="tlineheightb">
               <div class="span-sty spanOneWidth"><span>常用配置</span></div>
@@ -286,7 +299,9 @@ export default {
         scmFiles: [],
         vehicleList: [],
         vehicleOrderSid: '',
-        orgPriceDate: ''
+        orgPriceDate: '',
+        guidedPrice: '',
+        newUpdateDate: ''
       },
       rules: {},
       submitdisabled: false
@@ -377,7 +392,7 @@ export default {
   align-items: center;
 }
 .spanOneWidth {
-  width: 120px !important;
+  width: 140px !important;
 }
 .spanTwoWidth {
   line-height: 42px;
@@ -398,6 +413,6 @@ export default {
   width: 100%;
 }
 .addinputwOne {
-  margin-left: 115px !important;
+  margin-left: 130px !important;
 }
 </style>

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

@@ -47,6 +47,19 @@
               <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>全款/贷款销售指导价</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.guidedPrice }}</span></el-form-item>
+            </el-col>
+            <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" v-else>{{ formobj.newUpdateDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24" class="tlineheightb">
               <div class="span-sty spanOneWidth"><span>常用配置</span></div>
@@ -321,7 +334,9 @@ export default {
         scmFiles: [],
         vehicleList: [],
         vehicleOrderSid: '',
-        orgPriceDate: ''
+        orgPriceDate: '',
+        guidedPrice: '',
+        newUpdateDate: ''
       },
       // 环节所需参数
       linkByParameter: {

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

@@ -46,6 +46,19 @@
               <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>全款/贷款销售指导价</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.guidedPrice }}</span></el-form-item>
+            </el-col>
+            <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" v-else>{{ formobj.newUpdateDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24" class="tlineheightb">
               <div class="span-sty spanOneWidth"><span>常用配置</span></div>
@@ -289,7 +302,9 @@ export default {
         vehicleList: [],
         vehicleOrderSid: '',
         orgPath: '',
-        orgPriceDate: ''
+        orgPriceDate: '',
+        guidedPrice: '',
+        newUpdateDate: ''
       },
       rules: {},
       submitdisabled: false

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

@@ -45,6 +45,19 @@
               <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>全款/贷款销售指导价</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.guidedPrice }}</span></el-form-item>
+            </el-col>
+            <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" v-else>{{ formobj.newUpdateDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24" class="tlineheightb">
               <div class="span-sty spanOneWidth"><span>常用配置</span></div>
@@ -286,7 +299,9 @@ export default {
         scmFiles: [],
         vehicleList: [],
         vehicleOrderSid: '',
-        orgPriceDate: ''
+        orgPriceDate: '',
+        guidedPrice: '',
+        newUpdateDate: ''
       },
       // 环节所需参数
       linkByParameter: {