优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java

@@ -60,7 +60,7 @@ public class BusSalesOrderLoancontractDto implements Dto {
 	@ApiModelProperty("台数")
     private Integer vehCount;
 	@ApiModelProperty("消贷合同编号")
-    private String loanCotractNo;
+    private String loanContractNo;
 	@ApiModelProperty("资方合同号")
     private String bankContractNo;
     @ApiModelProperty("资方名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -158,6 +158,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private String orgSidPath;
     @ApiModelProperty("是否显示价值客户")
     private Boolean showValueCustomer;
+    @ApiModelProperty("是否为单独新增")
+    private String showBtnStr;
 
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -67,6 +67,11 @@ public interface FinBillApplicationFeign {
     @ResponseBody
     public ResultBean<PagerVo<FinBillApplicationVo>> listPage(@RequestBody PagerQuery<FinBillApplicationQuery> pq);
 
+    @ApiOperation("开票申请选择车辆")
+    @PostMapping("/getSelectVinsList")
+    @ResponseBody
+    public ResultBean<PagerVo<PcSelBillVinNoPageVo>> getSelectVinsList(@RequestBody PagerQuery<PcSelBillVinNoQuery> pagerQuery);
+
     @ApiOperation("欠款开票分页列表")
     @PostMapping("/listPageQK")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -60,6 +60,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 		return rb.setMsg("接口anrui-fin/finbillapplication/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<PcSelBillVinNoPageVo>> getSelectVinsList(PagerQuery<PcSelBillVinNoQuery> pagerQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<FinBillApplicationVo>> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
 		return null;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PcSelBillGcVo implements Vo {
+
+    @ApiModelProperty("主车车架号")
+    private String vinNo;
+    @ApiModelProperty("挂车车架号")
+    private String gcVinNo;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java

@@ -0,0 +1,64 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PcSelBillVinNoPageVo implements Vo {
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("发起人sid")
+    private String userSid;
+    @ApiModelProperty("发起人名称")
+    private String userName;
+    @ApiModelProperty("发起人部门sid")
+    private String deptSid;
+    @ApiModelProperty("发起人部门名称")
+    private String deptName;
+    @ApiModelProperty("发起日期")
+    private String applyDate;
+    @ApiModelProperty("销售订单sid")
+    private String busSalesOrderSid;
+    @ApiModelProperty("单台开票金额")
+    private String kpMoney;
+    @ApiModelProperty("销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty("销售类型")
+    private String saleType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("销售人员sid")
+    private String staffSid;
+    @ApiModelProperty("销售人员")
+    private String sellerName;
+    @ApiModelProperty("销售部门sid")
+    private String staffDeptSid;
+    @ApiModelProperty("销售部门")
+    private String sellerDept;
+    @ApiModelProperty("开票单位")
+    private String invoicingUnit;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey;
+    @ApiModelProperty("合格证状态value")
+    private String certificateState;
+    @ApiModelProperty("主车合格证图片")
+    private List<String> zcHgzImages;
+
+    @ApiModelProperty("挂车信息")
+    private List<PcSelBillGcVo> finBillTrailers;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
+ * Description: 开票挂车信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class PcSelBillVinNoQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("组织全路径")
+    private String orgPath;
+	@ApiModelProperty("合同号")
+    private String contractId;
+	@ApiModelProperty("已选车架号")
+    private List<String> vins;
+	@ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+}

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

@@ -60,6 +60,8 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
 
     IPage<FinBillApplicationVo> selectPageVo(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
 
+    IPage<PcSelBillVinNoPageVo> getSelectVinsList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw);
+
     List<FinBillApplicationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
 
     @Select("select * from fin_bill_application")
@@ -82,4 +84,5 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
 
     @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}")
     void updateZZ(String businessSid);
+
 }

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

@@ -93,4 +93,35 @@
         where qkkpBillNo = #{qkkpBillNo}
         ORDER BY createTime DESC LIMIT 1
     </select>
+
+    <select id="getSelectVinsList" resultType="com.yxt.anrui.fin.api.finbillapplication.PcSelBillVinNoPageVo">
+        SELECT DISTINCT
+        bo.`sid` AS busSalesOrderSid,
+        bo.`payTypeKey` AS saleTypeKey,
+        bo.`payType` AS saleType,
+        bo.`contractNo` AS contractId,
+        bo.`staffSid`,
+        bo.`staffName` AS sellerName,
+        bo.`orgSid` AS staffDeptSid,
+        bo.`orgName` AS sellerDept,
+        bo.`customerSid`,
+        bo.`customerName` AS NAME,
+        bv.`linkNo` AS vin,
+        bv.`linkSid` AS vinSid,
+        bc.`certificateState` AS certificateStateKey,
+        bc.`certificateStateValue` AS certificateState,
+        bo.`purchaseSystemSid`,
+        bo.`oneBillMoney` AS kpMoney
+        FROM
+        anrui_buscenter.`bus_sales_order_vehicle` bv
+        JOIN anrui_buscenter.`bus_sales_order` bo
+        ON bv.`salesOrderSid` = bo.`sid`
+        JOIN anrui_base.base_vehicle_state bs
+        ON bv.`sid` = bs.`busSid`
+        JOIN anrui_base.`base_vehicle_certificate` bc
+        ON bv.`linkSid` = bc.`vehicleSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -76,6 +76,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<PcSelBillVinNoPageVo>> getSelectVinsList(PagerQuery<PcSelBillVinNoQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PcSelBillVinNoPageVo> pv = finBillApplicationService.getSelectVinsList(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<PagerVo<FinBillApplicationVo>> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -388,6 +388,74 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         return p;
     }
 
+    public PagerVo<PcSelBillVinNoPageVo> getSelectVinsList(PagerQuery<PcSelBillVinNoQuery> pq) {
+        PcSelBillVinNoQuery query = pq.getParams();
+        QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        qw.eq("bo.payTypeKey", "2");
+        qw.eq("bs.busState", "401");
+        qw.eq("bs.finState", "1");
+        qw.eq("bs.carryInvoiceState", "0");
+        qw.eq("bs.invoiceApplyState", "0");
+        qw.eq("bo.useOrgSid", useOrgSid);
+        if (StringUtils.isNotBlank(query.getContractId())) {
+            qw.eq("bo.contractNo", query.getContractId());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.eq("bo.customerName", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.eq("bv.linkNo", query.getVinNo());
+        }
+        if (query.getVins() != null && query.getVins().size() > 0) {
+            qw.notIn("bv.linkNo", query.getVins());
+        }
+        //移动端条件
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("bo.contractNo", query.getName()).or().like("bo.customerName", query.getName()));
+        }
+        IPage page = PagerUtil.queryToPage(pq);
+        IPage<PcSelBillVinNoPageVo> pagging = baseMapper.getSelectVinsList(page, qw);
+        for (PcSelBillVinNoPageVo record : pagging.getRecords()) {
+            //开票单位
+            if (StringUtils.isNotBlank(record.getPurchaseSystemSid())) {
+                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, record.getPurchaseSystemSid());
+                if (invoicingDetailsVoResultBean.getData() != null) {
+                    record.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName());
+                }
+            }
+            //主车合格证照片
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(record.getVinSid()).getData();
+            if (baseVehicleCertificateVo != null) {
+                List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                record.setZcHgzImages(clhgeImages);
+            }
+            //挂车信息
+            TraliveredVo data = baseTrailerFeign.trailerList(record.getVinSid(), record.getContractId()).getData();
+            List<TrailerVo> list = data.getList();
+            List<PcSelBillGcVo> pcSelBillGcVos = new ArrayList<>();
+            if (list != null && list.size() > 0){
+                for (TrailerVo trailerVo : list) {
+                    PcSelBillGcVo pcSelBillGcVo = new PcSelBillGcVo();
+                    pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                    pcSelBillGcVo.setVinNo(data.getVinNo());
+                    pcSelBillGcVos.add(pcSelBillGcVo);
+                }
+            }
+            record.setFinBillTrailers(pcSelBillGcVos);
+            record.setUserSid(query.getUserSid());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
+            record.setUserName(sysUserVo.getName());
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
+            record.setDeptSid(sysOrganizationVo.getSid());
+            record.setDeptName(sysOrganizationVo.getName());
+            record.setApplyDate(DateUtil.formatDate(new Date()));
+            record.setUseOrgSid(useOrgSid);
+        }
+        PagerVo<PcSelBillVinNoPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -243,7 +243,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
                 String num = String.format("%02d", i);
-                busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-" + num);
+                busSalesOrderLoancontractDto.setLoanContractNo(busSalesOrder.getContractNo() + "-" + num);
                 i = i + 1;
                 busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
                 busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());
@@ -259,7 +259,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
             busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
             BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
-            busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-01");
+            busSalesOrderLoancontractDto.setLoanContractNo(busSalesOrder.getContractNo() + "-01");
             busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName());
             busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName());
             busSalesOrderLoancontractDto.setBusNo("304");

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -126,7 +126,22 @@ public class InvoicedService {
     }
 
     public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
-        return null;
+        ResultBean<PagerVo<SelBillVinNoPageVo>> rb = ResultBean.fireFail();
+        SelBillVinNoQuery params = pagerQuery.getParams();
+        FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery();
+        finBillApplicationQuery.setCreateBySid(params.getUserSid());
+        finBillApplicationQuery.setName(params.getName());
+        finBillApplicationQuery.setOrgPath(params.getOrgPath());
+        //finBillApplicationQuery.setType(params.getType());
+        //finBillApplicationQuery.setMenuSid(params.getMenuSid());
+        PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
+        pcq.setParams(finBillApplicationQuery);
+        ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);
+        List<FinBillApplicationVo> records = resultBean.getData().getRecords();
+        List<SelBillVinNoPageVo> billApplicationPageVos = new ArrayList<>();
+        PagerVo<SelBillVinNoPageVo> v = new PagerVo<>();
+        v.setRecords(billApplicationPageVos);
+        return rb.success().setData(v);
     }
 
     public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {