Merge remote-tracking branch 'origin/master'

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

@@ -78,6 +78,7 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
      * @return
      */
     IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
+    IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
 
     /**
      * 查询车架号

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

@@ -51,10 +51,55 @@
                   , #{name}
                   , '%')
             </if>
-            and (select count (*) from bus_sales_order_vehicle bbv left join bus_sales_order bo on bo.sid = bbv.salesOrderSid where length(bbv.linkSid)
+            AND (
-              >0
+            SELECT
-            and bo.contractNo = bd.contractNo)
+            count(*)
-              >0
+            FROM
+            bus_sales_order_vehicle bbv
+            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
+            WHERE
+            length( bbv.linkSid )> 0
+            AND bo.contractNo = bd.contractNo
+            )> 0
+        </where>
+        group by bd.contractNo
+    </select>
+
+    <resultMap id="ListMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
+        <result column="sid" jdbcType="VARCHAR" property="sid"/>
+        <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
+        <result column="paymentMethod" jdbcType="INTEGER" property="paymentMethod"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.sysmobilemenu.SysMobileMenuListVo"
+                    select="vinList" column="contractNo">
+        </collection>
+    </resultMap>
+    <select id="getRetrievalNotLists"
+            resultMap="ListMap">
+        SELECT bd.*
+        FROM bus_delivered bd
+        left join bus_sales_order bo on bo.contractNo = bd.contractNo
+        left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bd.contractNo
+                , '')
+                , ifnull(bd.`name`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            AND (
+            SELECT
+            count(*)
+            FROM
+            bus_sales_order_vehicle bbv
+            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
+            WHERE
+            length( bbv.linkSid )> 0
+            AND bo.contractNo = bd.contractNo
+            )> 0
         </where>
         group by bd.contractNo
     </select>

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

@@ -271,6 +271,35 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return iPage;
     }
 
+    public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
+        QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
+        String name = pq.getParams().getName();
+        IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
+        String orgPath = pq.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
+        }
+        qw.eq("bd.useOrgSid", orgSid);
+        qw.eq("bd.state", 1);
+        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+            qw.eq("bd.createBySid", pq.getParams().getUserSid());
+        }
+        IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotLists(page, qw, name);
+        for (AppBusDeliveredPageVo record : iPage.getRecords()) {
+            String contractNo = record.getContractNo();
+            QueryWrapper qw2 = new QueryWrapper<>();
+            //待出库：1，出库申请：0
+            qw2.eq("bd.state", 1);
+            qw2.eq("bd.contractNo", contractNo);
+            List<AppVinListVo> vinListVo = baseMapper.selVinListVo(contractNo, qw2);
+            record.setVinList(vinListVo);
+        }
+        return iPage;
+    }
+
     public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
         ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
         AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java

@@ -92,6 +92,8 @@ public class FinFundsCarriedForwardApplyDto implements Dto {
     private String jzjehj; // 结转金额合计
     @ApiModelProperty("pdf路径")
     private String pdfPath;
+    @ApiModelProperty("下载类型")
+    private String pdfType;
     @ApiModelProperty("是否为相同销售订单")
     private Boolean isOneSale = false;
     @ApiModelProperty("款项确认书附件")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java

@@ -50,6 +50,8 @@ import lombok.Data;
 public class FinFundsCarriedForwardApplyVo implements Vo {
 
     private String sid;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("流程状态")
     private String nodeState;
     @ApiModelProperty("申请部门名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/FinFundsApplyCompleteDto.java

@@ -21,6 +21,8 @@ public class FinFundsApplyCompleteDto implements Dto {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty(value = "下载类型")
+    private String pdfType;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectPageVo"
             resultType="com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo">
         SELECT fa.sid,
+        fa.billNo,
         fa.nodeState,
         fa.procDefId,
         fa.procInstSid,

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java

@@ -123,7 +123,7 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
 		BeanUtil.copyProperties(query,bv);
 		bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
 		bv.setFormVariables(BeanUtil.beanToMap(query));
-		return finFundsCarriedForwardApplyService.complete(bv);
+		return finFundsCarriedForwardApplyService.complete(bv,query.getPdfType());
 	}
 
 	@Override
@@ -190,7 +190,7 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
 		BeanUtil.copyProperties(query,bv);
 		bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
 		bv.setFormVariables(BeanUtil.beanToMap(query));
-		return finFundsCarriedForwardApplyService.complete(bv);
+		return finFundsCarriedForwardApplyService.complete(bv,query.getPdfType());
 	}
 
 	@Override

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -31,6 +31,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
@@ -161,6 +163,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
     @Autowired
     private BaseVehicleStateFeign baseVehicleStateFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
         FinFundsCarriedForwardApplyQuery query = pq.getParams();
@@ -607,10 +611,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             if (isOneSale) {
                 dto.setIsOneSale(true);
                 String sid = saveOrUpdateAll(dto).getData();
-                finFundsCarriedForwardApply = fetchBySid(sid);
+                //String pdfPath = createPdf(sid, dto.getPdfType()).getData();
-                //String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
                 //baseMapper.updatePathBySid(pdfPath, sid);
                 tsqtysd(sid);
+                jzComplete(sid);
                 return rb.success();
             }
         }
@@ -830,6 +834,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         String custNo = "";
         BdCustomer bdCustomer = new BdCustomer();
         FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
+        String purchaseSystemSid = finSelectedReceivablesDetailed.getPurchaseSystemSid();
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(purchaseSystemSid).getData();
         if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
             custNo = finSelectedReceivablesDetailed.getContractNo();
             //判断金蝶中是否存在该客户
@@ -837,7 +843,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             if (!custaBoolean) {//不存在则创建全款客户
                 bdCustomer.setFNumber(custNo);
                 bdCustomer.setFName(finSelectedReceivablesDetailed.getCustomerName() + custNo);
-                //bdCustomer.setTOrgIds();
             }
         } else {//贷款
             if (finSelectedReceivablesDetailed.getVIN().length() > 3) {
@@ -849,7 +854,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 if (!custaBoolean) {//不存在则创建贷款客户
                     bdCustomer.setFNumber(custNo);
                     bdCustomer.setFName(finSelectedReceivablesDetailed.getCustomerName() + finSelectedReceivablesDetailed.getVIN().substring(finSelectedReceivablesDetailed.getVIN().length() - 8));
-                    //bdCustomer.setTOrgIds();
                     bdCustomer.setFShortName(finSelectedReceivablesDetailed.getCustomerName() + custNo);
                 }
             } else {
@@ -860,10 +864,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 if (!custaBoolean) {//不存在则创建临时类客户
                     bdCustomer.setFNumber(custNo);
                     bdCustomer.setFName(finSelectedReceivablesDetailed.getCustomerName() + custNo);
-                    //bdCustomer.setTOrgIds();
                 }
             }
         }
+        bdCustomer.setTOrgIds(basePurchaseSystemDetailsVo.getOrgCode());
         bdCustomerService.draftBdCustomer(bdCustomer);
         return custNo;
     }
@@ -1152,7 +1156,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 
-    public ResultBean complete(BusinessVariables bv) {
+    public ResultBean complete(BusinessVariables bv,String pdfType) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
@@ -1191,12 +1195,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                //String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
+                //String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), pdfType).getData();
                 //baseMapper.updatePathBySid(pdfPath, businessSid);
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                 for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                     finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());
                 }
+                jzComplete(businessSid);
                 tsqtysd(businessSid);
             } else {
                 //极光推送
@@ -1329,7 +1334,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         return rb.success().setData(data);
     }
 
-    public ResultBean<String> createPdf(String sid, String userName) {
+    public ResultBean<String> createPdf(String sid, String pdfType) {
         ResultBean rb = ResultBean.fireFail();
         FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
         List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
@@ -1346,7 +1351,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
                         String finishTime = (String) flowableRecordVo.get("finishTime");
                         finishTime = finishTime.substring(0, 10);
-                        if ("Activity_1nfy3ql".equals(taskDefKey)) {
+                        if ("Activity_17mi28e".equals(taskDefKey)) {
                             dataMap.put("spName", assigneeName + finishTime);
                         }
                     }
@@ -1373,6 +1378,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             tzList.add(tzDto);
         }
         dataMap.put("saleDate", DateUtil.formatDate(new Date()));
+        dataMap.put("billNo", data.getBillNo());
         dataMap.put("tzList", tzList);
         dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
         //获取模板
@@ -1384,12 +1390,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         String typeName = dateStr + seconds + ".doc";
         //  生成文件路径
         String targetPath = sourcePath + dateStr;
-        WordUtils.creatWord(dataMap, "kxjz", sourcePath, targetPath, typeName);
+        if (pdfType.equals("针孔式打印机")) {
+            WordUtils.creatWord(dataMap, "jzsqzks", sourcePath, targetPath, typeName);
+        } else if (pdfType.equals("激光打印机")) {
+            WordUtils.creatWord(dataMap, "jzsqjg", sourcePath, targetPath, typeName);
+        }
         //新生成的word路径
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名
         String pdfName = "款项结转_" + dateStr + seconds + ".pdf";
-        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
         return rb.success().setData("template/" + dateStr + "/" + pdfName);
     }
 

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

@@ -471,12 +471,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
             record.setSubscriptionMoney(String.valueOf(sum));
             BigDecimal reveivableMoney = new BigDecimal(record.getReveivableMoney());
             BigDecimal noSubscriptionMoney = reveivableMoney.subtract(sum);
-            if(noSubscriptionMoney.compareTo(BigDecimal.ZERO)<0){
-                record.setNoSubscriptionMoney(String.valueOf(new BigDecimal("0")));
-            }else{
             record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
-            }
-
             String busVinSid = record.getBusVinSid();
             BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData();
             if (null != data) {

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

@@ -1015,14 +1015,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        ScmApplyInbound scmApplyInbound = null;
         if (StringUtils.isBlank(busSid)) {
             ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
             if (!resultBean.getSuccess()) {
                 return ResultBean.fireFail().setMsg(resultBean.getMsg());
             }
             String businessSid = resultBean.getData();
-            scmApplyInbound = fetchBySid(businessSid);
+            ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
             List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
             ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
             for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
@@ -1059,10 +1058,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             return resultBean;
         }
-        return confirmRZUpdate(dto, busSid, scmApplyInbound);
+        return confirmRZUpdate(dto, busSid);
     }
 
-    private synchronized ResultBean confirmRZUpdate(SubmitScmApplyInboundDto dto, String businessSid, ScmApplyInbound scmApplyInbound) {
+    private synchronized ResultBean confirmRZUpdate(SubmitScmApplyInboundDto dto, String businessSid) {
+        ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
         List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
         List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos2 = new ArrayList<>();
         ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDto.java

@@ -0,0 +1,71 @@
+package com.yxt.anrui.terminal.api.risk.creditreview;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CreditReviewDto implements Dto {
+
+    private String sid;
+    @ApiModelProperty("申请人+部门")
+    private String publishInfo;
+    @ApiModelProperty("申请日期")
+    private String createTime;
+    @ApiModelProperty("客户类型key 1个人2企业")
+    private String customerTypeKey;
+    @ApiModelProperty("客户类型value")
+    private String customerType;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("法人/贷款人姓名")
+    private String legalPersonName;
+    @ApiModelProperty("贷款人sid")
+    private String legalPersonSid;
+    @ApiModelProperty("法人/贷款人手机号")
+    private String legalPersonMobile;
+    @ApiModelProperty("法人/贷款人身份证")
+    private String legalPersonIdNumber;
+    @ApiModelProperty("身份证正反面附件")
+    private List<String> legalPersonIdCardImages;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("企业名称")
+    private String companyName;
+    @ApiModelProperty("企业sid")
+    private String companySid;
+    @ApiModelProperty("公司要求材料")
+    private List<String> materialImages;
+    @ApiModelProperty("资方名称")
+    private String managementName;
+    @ApiModelProperty("资方sid")
+    private String managementSid;
+    @ApiModelProperty("模板下载地址")
+    private String downUrl;
+    @ApiModelProperty("查询结果截图（公司）")
+    private List<String> searchResultImages;
+    @ApiModelProperty("审核结果（公司）")
+    private String examineResult;
+    @ApiModelProperty("审核日期（公司）")
+    private String examineDate;
+    @ApiModelProperty("审核备注（公司）")
+    private String examineRemarks;
+    @ApiModelProperty("查询结果截图（资方）")
+    private List<String> searchResultImages2;
+    @ApiModelProperty("审核结果（资方）")
+    private String examineResult2;
+    @ApiModelProperty("审核日期（资方）")
+    private String examineDate2;
+    @ApiModelProperty("审核备注（资方）")
+    private String examineRemarks2;
+    @ApiModelProperty("风控要求的其他人员")
+    private List<ShareholderDetailsVo> shareholderList = new ArrayList<>();
+    private List<IdentityDetailsVo> identity = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java

@@ -29,7 +29,7 @@ import java.util.List;
         fallback = CreditReviewFeignFallback.class)
 public interface CreditReviewFeign {
 
-    @ApiOperation("获取信用审核列表")
+    @ApiOperation("获取贷前信用审核列表")
     @PostMapping("/getCreditReviewList")
     @ResponseBody
     public ResultBean<PagerVo<CreditReviewVo>> getCreditReviewList(@RequestBody PagerQuery<CreditReviewQuery> pagerQuery);
@@ -48,4 +48,9 @@ public interface CreditReviewFeign {
     @GetMapping("/getTRCList")
     @ResponseBody
     public ResultBean<List<IdentityDetailsVo>> getTRCList(@SpringQueryMap CreditReviewDetailsQuery query);
+
+    @ApiOperation("保存贷前信用审核申请")
+    @PostMapping("/saveCreditReviewInfo")
+    @ResponseBody
+    public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java

@@ -39,4 +39,9 @@ public class CreditReviewFeignFallback implements CreditReviewFeign {
     public ResultBean<List<IdentityDetailsVo>> getTRCList(CreditReviewDetailsQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java

@@ -48,4 +48,9 @@ public class CreditReviewRest implements CreditReviewFeign {
     public ResultBean<List<IdentityDetailsVo>> getTRCList(CreditReviewDetailsQuery query) {
         return creditReviewService.getTRCList(query);
     }
+
+    @Override
+    public ResultBean saveCreditReviewInfo(CreditReviewDto dto) {
+        return null;
+    }
 }

doc/databases/base_tables.sql

@@ -993,6 +993,8 @@ CREATE TABLE `base_vehicle_state`
     `carryInvoiceState` varchar(64)          DEFAULT NULL COMMENT '欠款开票状态',
     `packageBusiness`   varchar(64)          DEFAULT NULL COMMENT '包牌业务',
     `contractState`     varchar(64)          DEFAULT NULL COMMENT '合同状态',
+    `saleTypeKey`       varchar(64)          DEFAULT NULL COMMENT '销售类型：1全款，2贷款',
+    `finSourceKey`      varchar(64)          DEFAULT NULL COMMENT '款项来源：1自有资金、2三方金融、3担保、4非担保',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB

工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc

@@ -0,0 +1,10 @@
+
+|调账申请                                                                                  |
+|单据日期：            |${saleDate!}          |单据编号：            |${billNo!}            |
+|调账类型      |合同编号      |客户名称      |物料编码      |调出金额      |调入金额      |
+|${tz.tzType!} |${tz.conNo!}  |${tz.name!}   |${tz.vinNo!}  |${tz.dcje!}   |${tz.drje!}   |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc

@@ -0,0 +1,6 @@
+
+|调账申请                                                                                  |
+|单据日期：            |${saleDate!}          |单据编号：            |${billNo!}            |
+|调账类型      |合同编号      |客户名称      |物料编码      |调出金额      |调入金额      |
+|${tz.tzType!} |${tz.conNo!}  |${tz.name!}   |${tz.vinNo!}  |${tz.dcje!}   |${tz.drje!}   |
+

工作内容需要的文档/单据模板/款项结转打印模板/款项结转（调账申请）.doc

@@ -1,9 +0,0 @@
-
-|调账申请                                                           |
-|${saleDate!}                                                       |
-|调账类型  |合同编号  |客户名称  |物料编码  |调出金额  |调入金额  |
-|${tz.tzTyp|${tz.conNo|${tz.name!|${tz.vinNo|${tz.dcje!|${tz.drje!|
-|e!}       |!}        |}         |!}        |}         |}         |
-|申请人|${makeName!}              |审核 |${spName!}                 |
-|：    |                          |人： |                           |
-