From 892f0a5f5120d53d509b8b28d2a4f83477c7c981 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 21 Feb 2024 17:51:46 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=AB=8B?= =?UTF-8?q?=E6=A1=88=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 6 +- .../BaseVehicleOutApplyService.java | 7 +- .../BusDeliveredApplyFeign.java | 4 +- .../BusDeliveredApplyFeignFallback.java | 5 + .../BusDeliveredApplyMapper.java | 2 + .../BusDeliveredApplyMapper.xml | 9 + .../BusDeliveredApplyRest.java | 5 + .../BusDeliveredApplyService.java | 5 + .../LoanCaseExecuteApplyDetailsVo.java | 6 + .../loanhomevisitprep/LoanHomevisitPrep.java | 2 + .../LoanHomevisitPrepVo.java | 2 + .../LoanHomevisitPrepMapper.java | 3 + .../LoanHomevisitPrepMapper.xml | 3 +- .../LoanHomevisitPrepService.java | 1 + .../AppCaseExecuteApplyDetailsVo.java | 118 ++++++++++++ .../AppCaseExecuteVehDetailsVo.java | 63 +++++++ .../risk/caseexecute/CaseExecuteFeign.java | 61 +++++++ .../caseexecute/CaseExecuteFeignFallback.java | 12 ++ .../flowable/AppCaseExecuteDelegateQuery.java | 25 +++ .../flowable/CaseExecuteQuery.java | 17 ++ .../flowable/CaseExecuteTaskQuery.java | 42 +++++ .../flowable/CompleteCaseExecuteDto.java | 34 ++++ .../risk/caseappeal/CaseAppealService.java | 5 +- .../biz/risk/caseexecute/CaseExecuteRest.java | 86 +++++++++ .../risk/caseexecute/CaseExecuteService.java | 168 ++++++++++++++++++ 25 files changed, 680 insertions(+), 11 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/AppCaseExecuteApplyDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/AppCaseExecuteVehDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/AppCaseExecuteDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CompleteCaseExecuteDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 6e44d91c2c..674a58d033 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2189,13 +2189,13 @@ public class BaseVehicleOutService extends MybatisBaseService selByVinSidAndYBJ(@RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 19aaf75abb..14177f6704 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -196,6 +196,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean selByVinSidAndYBJ(String vinSid) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index 5d78c019c2..a30103adb0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -122,4 +122,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper { BaseVehicleState selectByBusVinSid(String sid); int selectCountByVinSid(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo); + + int selByVinSidAndYBJ(String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index fec688ee5c..9282cf7792 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -199,4 +199,13 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index ba43969bd7..2d391a1c66 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -267,6 +267,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return busDeliveredApplyService.assignTask(query); } + @Override + public ResultBean selByVinSidAndYBJ(String vinSid) { + return busDeliveredApplyService.selByVinSidAndYBJ(vinSid); + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { BusinessVariables bv = new BusinessVariables(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 40422acd41..7729a460c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -4815,4 +4815,9 @@ public class BusDeliveredApplyService extends MybatisBaseService selByVinSidAndYBJ(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.selByVinSidAndYBJ(vinSid); + return rb.success().setData(i); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java index c73bd0981b..1b5490a047 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java @@ -55,6 +55,12 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("申请日期") + private String createTime; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrep.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrep.java index e34b882a8f..0855905f52 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrep.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrep.java @@ -56,4 +56,6 @@ public class LoanHomevisitPrep extends BaseEntity { private String saleOrderSid; @ApiModelProperty("销售订单贷款人表sid") private String saleOrderBorrowerSid; + @ApiModelProperty("模板下载路径") + private String downUrl; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java index c39cd82135..28fad66d22 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java @@ -81,4 +81,6 @@ public class LoanHomevisitPrepVo implements Vo { private String policyName; @ApiModelProperty("合同生成状态") private String createState; + @ApiModelProperty("模板下载路径") + private String downUrl; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java index 3b83612f77..5758dfde51 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java @@ -70,4 +70,7 @@ public interface LoanHomevisitPrepMapper extends BaseMapper { String initConSetUp(String sid); LoanHomevisitPrepVo selectDetails(String sid); + + @Update("update loan_homevisit_prep set downUrl = #{downUrl} where sid = #{sid}") + void updateDownUrl(@Param("sid") String sid,@Param("downUrl") String downUrl); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml index 5e2a2378e0..2c4562b442 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml @@ -21,7 +21,8 @@ bl.`borrowerSid` IS NULL, '未生成', '已生成' - ) AS createState + ) AS createState, + lp.downUrl FROM loan_homevisit_prep lp LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index 546d82126b..59caaf4729 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -567,6 +567,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.caseexecute; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-riskcenter(案件执行立案申请)
+ * File: LoanCaseExecuteApplyVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo
+ * Description: 案件执行立案申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-02-07 10:00:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "案件执行立案申请 视图数据详情", description = "案件执行立案申请 视图数据详情") +public class AppCaseExecuteApplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请部门-申请人") + private String publishInfo; + @ApiModelProperty("申请日期") + private String time; + @ApiModelProperty("案件创建日期") + private String caseCreateDate; + @ApiModelProperty("公司负责人") + private String compHead; + @ApiModelProperty("法务部门负责人") + private String legalDeptHead; + @ApiModelProperty("案件编号") + private String caseNo; + @ApiModelProperty("案件类型") + private String caseType; + @ApiModelProperty("贷款合同编号") + private String loanContract; + @ApiModelProperty("贷款人") + private String lenderName; + @ApiModelProperty("贷款人证件号码") + private String lenderIdNo; + @ApiModelProperty("贷款人户籍/注册地址") + private String lenderAddress; + @ApiModelProperty("客户") + private String customName; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("资方合同编号") + private String bankContract; + @ApiModelProperty("欠款合计") + private String arrearsTotal; + @ApiModelProperty("是否全额诉讼") + private String isFullLitigation; + @ApiModelProperty("起诉金额合计") + private String sueMoneyTotal; + @ApiModelProperty("部分诉讼说明") + private String partProceRemarks; + @ApiModelProperty("判决日期") + private String judgDate; + @ApiModelProperty("判决结果") + private String judgResult; + @ApiModelProperty("判决金额") + private String judgMoney; + @ApiModelProperty("判决备注") + private String judgRemarks; + @ApiModelProperty("判决生效后回款金额") + private String judgPayMoney; + @ApiModelProperty("预执行立案日期") + private String executeRegisDate; + @ApiModelProperty("执行时限") + private String executeDeadline; + @ApiModelProperty("执行立案金额") + private String executeRegisMoney; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty + private List appPjclFiles; + @ApiModelProperty + private List appZxclFiles; + @ApiModelProperty("上诉车辆") + private List appCaseExecuteVehList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/AppCaseExecuteVehDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/AppCaseExecuteVehDetailsVo.java new file mode 100644 index 0000000000..82e35190c8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/AppCaseExecuteVehDetailsVo.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.risk.caseexecute; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-riskcenter(案件执行立案申请)
+ * File: LoanCaseExecuteVehVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehVo
+ * Description: 案件执行立案车辆 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-02-07 10:00:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "案件执行立案车辆 视图数据详情", description = "案件执行立案车辆 视图数据详情") +public class AppCaseExecuteVehDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车牌号") + private String carNum; // 车牌号 + @ApiModelProperty("挂靠公司") + private String affiliatedCompany; // 挂靠公司 + @ApiModelProperty("车辆状态") + private String carState; // 车辆状态 + @ApiModelProperty("备注") + private String remarks; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeign.java new file mode 100644 index 0000000000..f1c259ab8f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeign.java @@ -0,0 +1,61 @@ +package com.yxt.anrui.terminal.api.risk.caseexecute; + +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelegateQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteTaskQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CompleteCaseExecuteDto; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "案件上诉管理") +@FeignClient( + contextId = "terminal-CaseExecute", + name = "anrui-terminal", + path = "riskcenter/v1/caseexecute", + fallback = CaseExecuteFeignFallback.class) +public interface CaseExecuteFeign { + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody CompleteCaseExecuteDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody CaseExecuteTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody CaseExecuteTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody CaseExecuteTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap CaseExecuteQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppCaseExecuteDelegateQuery delegateQuery); + + @ApiOperation("案件上诉详情") + @GetMapping("/details/{sid}") + @ResponseBody + public ResultBean collectionDetail(@PathVariable("sid") String sid); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeignFallback.java new file mode 100644 index 0000000000..377932151c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/CaseExecuteFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.terminal.api.risk.caseexecute; + +import org.springframework.stereotype.Component; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/8 + **/ +@Component +public class CaseExecuteFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/AppCaseExecuteDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/AppCaseExecuteDelegateQuery.java new file mode 100644 index 0000000000..e374e8d33b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/AppCaseExecuteDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.risk.caseexecute.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class AppCaseExecuteDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteQuery.java new file mode 100644 index 0000000000..b8dc9ff803 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.risk.caseexecute.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CaseExecuteQuery implements Query { + private static final long serialVersionUID = -3563282658560745370L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteTaskQuery.java new file mode 100644 index 0000000000..1d474ab738 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CaseExecuteTaskQuery.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.terminal.api.risk.caseexecute.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class CaseExecuteTaskQuery implements Query { + private static final long serialVersionUID = -6952737531036706114L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CompleteCaseExecuteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CompleteCaseExecuteDto.java new file mode 100644 index 0000000000..44b37e1cf4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/caseexecute/flowable/CompleteCaseExecuteDto.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.risk.caseexecute.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class CompleteCaseExecuteDto implements Dto { + private static final long serialVersionUID = 7978653524636034916L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java index 825d5ef2d7..7687465b0c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseappeal/CaseAppealService.java @@ -68,10 +68,6 @@ public class CaseAppealService { @Autowired private LoanCaseAppealApplyFeign loanCaseAppealApplyFeign; - @Autowired - private LoanSolutionsFeign loanSolutionsFeign; - @Autowired - private CommonService commonService; public ResultBean agreeCreditInfo(CompleteCaseAppealDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -174,6 +170,7 @@ public class CaseAppealService { appYscl.add(file.getUrl()); } } + appCaseAppealApplyDetailsVo.setAppPjclFiles(appPjcl); appCaseAppealApplyDetailsVo.setAppYsclFiles(appYscl); List loanCaseAppealVehList = loanCaseAppealApplyDetailsVo.getLoanCaseAppealVehList(); List appCaseAppealVehDetailsVos = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteRest.java new file mode 100644 index 0000000000..c9c4deff50 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteRest.java @@ -0,0 +1,86 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.risk.caseexecute; + +import com.yxt.anrui.terminal.api.risk.caseappeal.AppCaseAppealApplyDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseappeal.CaseAppealFeign; +import com.yxt.anrui.terminal.api.risk.caseappeal.flowable.AppCaseAppealDelegateQuery; +import com.yxt.anrui.terminal.api.risk.caseappeal.flowable.CaseAppealQuery; +import com.yxt.anrui.terminal.api.risk.caseappeal.flowable.CaseAppealTaskQuery; +import com.yxt.anrui.terminal.api.risk.caseappeal.flowable.CompleteCaseAppealDto; +import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteApplyDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseexecute.CaseExecuteFeign; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelegateQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteTaskQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CompleteCaseExecuteDto; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController("案件立案管理") +@RequestMapping("riskcenter/v1/caseexecute") +public class CaseExecuteRest implements CaseExecuteFeign { + + @Autowired + private CaseExecuteService caseExecuteService; + + @Override + public ResultBean agreeCreditInfo(CompleteCaseExecuteDto dto) { + return caseExecuteService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(CaseExecuteTaskQuery query) { + return caseExecuteService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(CaseExecuteTaskQuery query) { + return caseExecuteService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(CaseExecuteTaskQuery query) { + return caseExecuteService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(CaseExecuteQuery query) { + return caseExecuteService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppCaseExecuteDelegateQuery delegateQuery) { + return caseExecuteService.delegate(delegateQuery); + } + + @Override + public ResultBean collectionDetail(String sid) { + return caseExecuteService.collectionDetail(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java new file mode 100644 index 0000000000..9ebb773451 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/caseexecute/CaseExecuteService.java @@ -0,0 +1,168 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.risk.caseexecute; + + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDetailsVo; +import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign; +import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; +import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; +import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteApplyDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseexecute.AppCaseExecuteVehDetailsVo; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.AppCaseExecuteDelegateQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CaseExecuteTaskQuery; +import com.yxt.anrui.terminal.api.risk.caseexecute.flowable.CompleteCaseExecuteDto; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +@Service +public class CaseExecuteService { + + @Autowired + private LoanCaseExecuteApplyFeign loanCaseExecuteApplyFeign; + + public ResultBean agreeCreditInfo(CompleteCaseExecuteDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyCompleteDto loanCaseExecuteApplyCompleteDto = new LoanCaseExecuteApplyCompleteDto(); + BeanUtil.copyProperties(dto, loanCaseExecuteApplyCompleteDto); + loanCaseExecuteApplyFeign.complete(loanCaseExecuteApplyCompleteDto); + return rb.success(); + } + + public ResultBean rejectCreditInfo(CaseExecuteTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyTaskQuery taskQuery = new LoanCaseExecuteApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = loanCaseExecuteApplyFeign.reject(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(CaseExecuteTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyTaskQuery taskQuery = new LoanCaseExecuteApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = loanCaseExecuteApplyFeign.revokeProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(CaseExecuteTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyTaskQuery taskQuery = new LoanCaseExecuteApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = loanCaseExecuteApplyFeign.breakProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(CaseExecuteQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + LoanCaseExecuteApplyNodeQuery getNodeQuery = new LoanCaseExecuteApplyNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> previousNodesForReject = loanCaseExecuteApplyFeign.getPreviousNodesForReject(getNodeQuery); + if (previousNodesForReject.getSuccess()) { + previousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = previousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(previousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> nextNodesForSubmit = loanCaseExecuteApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (nextNodesForSubmit.getSuccess()) { + nextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = nextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(nextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + + public ResultBean delegate(AppCaseExecuteDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyDelegateQuery delegateQuery1 = new + LoanCaseExecuteApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + loanCaseExecuteApplyFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean collectionDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = loanCaseExecuteApplyFeign.fetchDetailsBySid(sid).getData(); + AppCaseExecuteApplyDetailsVo appCaseExecuteApplyDetailsVo = new AppCaseExecuteApplyDetailsVo(); + BeanUtil.copyProperties(loanCaseExecuteApplyDetailsVo,appCaseExecuteApplyDetailsVo); + appCaseExecuteApplyDetailsVo.setPublishInfo(loanCaseExecuteApplyDetailsVo.getDeptName() + "-" + loanCaseExecuteApplyDetailsVo.getCreateByName()); + appCaseExecuteApplyDetailsVo.setTime(loanCaseExecuteApplyDetailsVo.getCreateTime()); + appCaseExecuteApplyDetailsVo.setProcInsId(loanCaseExecuteApplyDetailsVo.getProcInstSid()); + List pjclFiles = loanCaseExecuteApplyDetailsVo.getPjclFiles(); + List appPjcl = new ArrayList<>(); + if (pjclFiles != null && pjclFiles.size() > 0){ + for (LoanCaseExecuteFile file : pjclFiles) { + appPjcl.add(file.getUrl()); + } + } + List zxclFiles = loanCaseExecuteApplyDetailsVo.getZxclFiles(); + List appZxcl = new ArrayList<>(); + if (zxclFiles != null && zxclFiles.size() > 0){ + for (LoanCaseExecuteFile file : zxclFiles) { + appZxcl.add(file.getUrl()); + } + } + appCaseExecuteApplyDetailsVo.setAppPjclFiles(appPjcl); + appCaseExecuteApplyDetailsVo.setAppZxclFiles(appZxcl); + List loanCaseExecuteVehList = loanCaseExecuteApplyDetailsVo.getLoanCaseExecuteVehList(); + List appCaseExecuteVehDetailsVos = new ArrayList<>(); + for (LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo : loanCaseExecuteVehList) { + AppCaseExecuteVehDetailsVo appCaseExecuteVehDetailsVo = new AppCaseExecuteVehDetailsVo(); + BeanUtil.copyProperties(loanCaseExecuteVehDetailsVo,appCaseExecuteVehDetailsVo); + appCaseExecuteVehDetailsVos.add(appCaseExecuteVehDetailsVo); + } + appCaseExecuteApplyDetailsVo.setAppCaseExecuteVehList(appCaseExecuteVehDetailsVos); + return rb.success().setData(appCaseExecuteApplyDetailsVo); + } +} \ No newline at end of file From 62fe5552e45d8ab0e8a31fc236e25dc9ebbabbb1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 21 Feb 2024 18:01:11 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/ftl/dai_existingvehicles.ftl | 2 +- .../src/main/resources/ftl/dai_orderacar.ftl | 2896 +++++++++++++++++ 2 files changed, 2897 insertions(+), 1 deletion(-) create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl index b4678fd0d6..0ae4023dec 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl @@ -2724,7 +2724,7 @@ - ${year!} + ${year!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl new file mode 100644 index 0000000000..ea32d89d2f --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl @@ -0,0 +1,2896 @@ + + + + + tianlong ma + 孟哲 底 + 2 + 0 + 2024-02-21T09:40:00Z + 2024-02-21T09:40:00Z + 1 + 174 + 995 + 8 + 2 + 1167 + 16 + + + 2052-12.1.0.16120 + 2A2949A9AE044D9A83F0551EBC717579_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同(订车 + + + + + + + + + + ) + + + + + + + + + + + + + + + + + + + 合同编 + + + + + + + + 号： + + + + + + + + + + + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲 + + + + + + + + + + + 方 + + + + + + + + + + + (出卖方) ： + + + + + + + + + + + + + + + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + + 方 + + + + + + + + + + + (买受方)： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 证件 + + + + + + + + + + + 号码： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 户籍/注册地址 + + + + + + + + + + + ： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + + 方 + + + + + + + + + + + 从甲方以全款方式订购车辆，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + 一 + + + + + + + + + + + 、 甲方按照乙方要求订购排产的车辆信息如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if modelName??> + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + <#if modelConfig??> + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + <#if modelConfigs??> + + + + + + + + + + + + + + + + + + + ${modelConfigs!} + + + + <#if publicModel??> + + + + + + + + + + + + + + + + + + + ${publicModel!} + + + + <#if topName??> + + + + + + + + + + + + + + + + + + + ${topName!} + + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + <#if remarks??> + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + <#if discountDetail??> + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二 + + + + + + + + + + + 、 车辆总价 + + + + + + + + + + + 款 + + + + + + + + + + + 为 + + + + + + + + + + + + + + + + + + + + + + + + ${totalPrice!} + + + + + + + + + + + + + + + + + + + + + + + 元(大写 + + + + + + + + + + + + + + + + + + + + + + + + $ + + + + + + + + + + + + {priceRemarks!} + + + + + + + + + + + + + + + + + + + + + + + )。 + + + + + + + + + + + + + + + + + + + + + + + + 三、乙 + + + + + + + + + + + 方 + + + + + + + + + + + 在签订合同 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${dayOne!} + + + + + + + + + + + 日内 + + + + + + + + + + + 向甲方交纳订金 + + + + + + + + + + + + + + + + + + + + + + + + ${depositTotal!} + + + + + + + + + + + + + + + + + + + + + + + 元，乙方提车时交清全部车款。甲方未收到全款前，车辆所有 + + + + + + + + + + + 权归甲方所有 + + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + + + 四、 + + + + + + + + + + + 车 + + + + + + + + + + + 辆交付地点 + + + + + + + + + + + + + + + + + + + + + + + + ${address!} + + + + + + + + + + + + + + + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + + 五 + + + + + + + + + + 、 + + + + + + + + + + 乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验 + + + + + + + + + + 收 + + + + + + + + + + 无 + + + + + + + + + + 异议的 + + + + + + + + + + + ， + + + + + + + + + + + 乙方接收车辆 + + + + + + + + + + + ，自此 + + + + + + + + + + ，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方 + + + + + + + + + + 承担。乙 + + + + + + + + + + 方 + + + + + + + + + + 提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + + 六 + + + + + + + + + + 、 + + + + + + + + + + 甲方负责提供车辆合格证及发票 + + + + + + + + + + ， + + + + + + + + + + 甲方所提供的发票，不作为乙方支付款项的依据 + + + + + + + + + + 。 + + + + + + + + + + 由于车辆自身问题等甲方原因导致车辆不能登记上牌的， + + + + + + + + + + + + + + + + + + + 由甲方负 + + + + + + + + + + 责 + + + + + + + + + + 解决； 由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的 + + + + + + + + + + + + + + + + + + + 问题 + + + + + + + + + + 等 + + + + + + + + + + 非甲方原因导致不能办理车辆登记上牌手续的， 由乙方自行解决。 + + + + + + + + + + + + + + + + + + + + + + 七、甲方通知乙方提 + + + + + + + + + + 车 + + + + + + + + + + 后， 乙方在 10 日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另 + + + + + + + + + + + + + + + + + + + 行处 + + + + + + + + + + 置 + + + + + + + + + + ，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一 + + + + + + + + + + + + + + + + + + + 承 + + + + + + + + + + 担 + + + + + + + + + + 违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行 + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + 八、本 + + + + + + + + + + 合 + + + + + + + + + + 同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + + 九 + + + + + + + + + + 、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲 + + + + + + + + + + 方： + + + + + + + + + + + + + + + + + + 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $ + + + + + + + + + + {year!} + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + ${year!} + + + + + + + + + + 年 + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7907e49c18cce5fe4aba93f9f27e5d6b520af23e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 22 Feb 2024 09:31:18 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 412 ++- .../resources/ftl/dai_existingvehicles.ftl | 2 +- .../ftl/dai_existingvehicles_black.ftl | 2891 ++++++++++++++++ .../src/main/resources/ftl/dai_orderacar.ftl | 8 +- .../resources/ftl/dai_orderacar_black.ftl | 2908 +++++++++++++++++ 5 files changed, 6215 insertions(+), 6 deletions(-) create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 1e7e232c7c..537f1f4cd6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1120,6 +1120,184 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { + String url = ""; + map.put("totalPrice", ""); + map.put("priceRemarks", ""); + map.put("depositTotal", ""); + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + //查询台数 + String num = priceInfo.getNumber(); + String remarks = ""; + String ftl = ""; + CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid()); + if (commonContract != null) { + String date = DateUtil.today(); + List dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", baseDistributor.getDisName());//开票名称 + map.put("customerName", baseDistributor.getDisName());//开票名称 + map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("idNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("adds", baseDistributor.getRegistDetailAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } else { + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid()); + if (crmCustomerTemp != null) { + map.put("invoiceName", crmCustomerTemp.getName());//开票名称 + map.put("customerName", crmCustomerTemp.getName());//开票名称 + map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } + map.put("createOrgName", ""); + // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） + if ("1".equals(dto.getDiscountKey())) { + // 现车 + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { + //获取模板 + ftl = "dai_existingvehicles_black"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getOrderVinList(); + if (stringList.size() > 0) { + remarks = "数量" + num + "台，单台成交价： 元。"; + } else { + remarks = "数量" + num + "台，单台成交价： 元。"; + } + } else { + map.put("dayOne", ""); + // 订车获取模板 + ftl = "dai_orderacar_black"; + remarks = "数量" + num + "台，单台成交价： 元。"; + } + map.put("remarks", remarks); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成合同文件名 + String pdfName = map.get("contractNo").toString() + "贷款新车买卖空白合同_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + url = pdfName; + } + return url; + } + + private String getDaiContractBlank2(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { + String url = ""; + map.put("totalPrice", ""); + map.put("priceRemarks", ""); + map.put("depositTotal", ""); + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + //查询台数 + String num = priceInfo.getNumber(); + String remarks = ""; + String ftl = ""; + CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid()); + if (commonContract != null) { + String date = DateUtil.today(); + List dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", baseDistributor.getDisName());//开票名称 + map.put("customerName", baseDistributor.getDisName());//开票名称 + map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("idNo", baseDistributor.getRegistNum());//纳税人识别号 + map.put("adds", baseDistributor.getRegistDetailAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } else { + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid()); + if (crmCustomerTemp != null) { + map.put("invoiceName", crmCustomerTemp.getName());//开票名称 + map.put("customerName", crmCustomerTemp.getName());//开票名称 + map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + map.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } + map.put("createOrgName", ""); + // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） + if ("1".equals(dto.getDiscountKey())) { + // 现车 + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { + //获取模板 + ftl = "dai_existingvehicles_black"; + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + List stringList = orderModelInfoVo.getOrderVinList(); + if (stringList.size() > 0) { + remarks = "数量" + num + "台，单台成交价： 元。"; + } else { + remarks = "数量" + num + "台，单台成交价： 元。"; + } + } else { + map.put("dayOne", ""); + // 订车获取模板 + ftl = "dai_orderacar_black"; + remarks = "数量" + num + "台，单台成交价： 元。"; + } + map.put("remarks", remarks); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成合同文件名 + String pdfName = map.get("contractNo").toString() + "贷款新车买卖空白合同2_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + url = pdfName; + } + return url; + } + private String genCarSaleContractBlank2(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { String url = ""; map.put("totalPrice", ""); @@ -1378,7 +1556,7 @@ public class CommonContractService extends MybatisBaseService carContractListVos = new ArrayList<>(); @@ -1426,6 +1604,192 @@ public class CommonContractService extends MybatisBaseService map, AppOrderDetailsVo appOrderDetailsVo) { + String ftl = ""; + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + //车架号集合 + List stringList = new ArrayList<>(); + //查询台数 + String num = ""; + if (StringUtils.isNotBlank(dto.getBorrowerSid())) { + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(dto.getBusSid(), dto.getBorrowerSid()).getData(); + num = String.valueOf(busSalesOrderVehicles.size()); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + stringList.add(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8)); + } + } else { + num = priceInfo.getNumber(); + stringList = orderModelInfoVo.getOrderVinList(); + } + //单台成交价 + String transactionPrice = priceInfo.getSingleFinalPrice(); + String remarks = ""; + CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid()); + if (commonContract != null) { + String date = DateUtil.today(); + List dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (StringUtils.isNotBlank(dto.getCreateOrgName())) { + map.put("createOrgName", dto.getCreateOrgName()); + } else { + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + } + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { + //获取模板 + ftl = "dai_existingvehicles"; + if (stringList.size() > 0) { + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; + } else { + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; + } + } else { + map.put("dayOne", appOrderDetailsVo.getDepositInfo().getPayDepositDays()); + //获取模板 + ftl = "dai_orderacar"; + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; + } + map.put("remarks", remarks); + //车价合计 + String totalPrice = new BigDecimal(priceInfo.getSingleFinalPrice()).multiply(new BigDecimal(num)).toString(); + map.put("totalPrice", totalPrice); + //车价合计大写 + String priceRemarks = ""; + if (StringUtils.isNotBlank(totalPrice)) { + priceRemarks = TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(totalPrice).doubleValue())); + } + map.put("priceRemarks", priceRemarks); + //订金合计 + AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); + String depositTotal = new BigDecimal(depositInfo.getDeposit()).multiply(new BigDecimal(num)).toString(); + if ("0".equals(depositTotal)) { + map.put("depositTotal", "/"); + } else { + map.put("depositTotal", depositTotal); + } + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成文件名 + String pdfName = map.get("contractNo").toString() + "贷款新车买卖合同_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + return pdfName; + } + + private String getDaiXContract2(PrintConfirmDto dto, Map map, AppOrderDetailsVo appOrderDetailsVo) { + String ftl = ""; + AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); + AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); + //车架号集合 + List stringList = new ArrayList<>(); + //查询台数 + String num = ""; + if (StringUtils.isNotBlank(dto.getBorrowerSid())) { + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(dto.getBusSid(), dto.getBorrowerSid()).getData(); + num = String.valueOf(busSalesOrderVehicles.size()); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + stringList.add(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8)); + } + } else { + num = priceInfo.getNumber(); + stringList = orderModelInfoVo.getOrderVinList(); + } + //单台成交价 + String transactionPrice = priceInfo.getSingleFinalPrice(); + String remarks = ""; + CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid()); + if (commonContract != null) { + String date = DateUtil.today(); + List dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (StringUtils.isNotBlank(dto.getCreateOrgName())) { + map.put("createOrgName", dto.getCreateOrgName()); + } else { + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + } + if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { + //获取模板 + ftl = "dai_existingvehicles"; + if (stringList.size() > 0) { + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; + } else { + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; + } + } else { + map.put("dayOne", appOrderDetailsVo.getDepositInfo().getPayDepositDays()); + //获取模板 + ftl = "dai_orderacar"; + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; + } + map.put("remarks", remarks); + //车价合计 + String totalPrice = new BigDecimal(priceInfo.getSingleFinalPrice()).multiply(new BigDecimal(num)).toString(); + map.put("totalPrice", totalPrice); + //车价合计大写 + String priceRemarks = ""; + if (StringUtils.isNotBlank(totalPrice)) { + priceRemarks = TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(totalPrice).doubleValue())); + } + map.put("priceRemarks", priceRemarks); + //订金合计 + AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); + String depositTotal = new BigDecimal(depositInfo.getDeposit()).multiply(new BigDecimal(num)).toString(); + if ("0".equals(depositTotal)) { + map.put("depositTotal", "/"); + } else { + map.put("depositTotal", depositTotal); + } + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + ftl + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成文件名 + String pdfName = map.get("contractNo").toString() + "贷款新车买卖合同2_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + return pdfName; + } + private String getRisk(AppOrderDetailsVo appOrderDetailsVo, PrintConfirmDto dto) { LoanTemplateQuotationQuery loanTemplateQuotationQuery = new LoanTemplateQuotationQuery(); loanTemplateQuotationQuery.setSalesOrderSid(appOrderDetailsVo.getBusSalesOrderSid()); @@ -2581,14 +2945,60 @@ public class CommonContractService extends MybatisBaseService future1 = pool.submit(() -> { + return getDaiXContract(dto, map, appOrderDetailsVo); + }); + Future future1_2 = pool.submit(() -> { + return getDaiXContract2(dto, map, appOrderDetailsVo); + }); + Future future2 = null; + Future future2_2 = null; + Future future4 = null; SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(dto.getBusSid()).getData(); if (loanSolutions != null) { if (StringUtils.isBlank(loanSolutions.getTypeKey())) { //担保 } else { //非担保 + future2 = pool.submit(() -> { + return getDaiContractBlank(dto, map, appOrderDetailsVo); + }); + future2_2 = pool.submit(() -> { + return getDaiContractBlank2(dto, map, appOrderDetailsVo); + }); + //接收车辆委托书 + future4 = pool.submit(() -> { + return getReceiveCar(dto, map, appOrderDetailsVo); + }); } } + if (StringUtils.isNotBlank(future1.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); + filesList.add(file); + } + if (StringUtils.isNotBlank(future1_2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get()); + filesList.add(file); + } + if (future2 != null) { + if (StringUtils.isNotBlank(future2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); + filesList.add(file); + } + } + if (future2_2 != null) { + if (StringUtils.isNotBlank(future2_2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get()); + filesList.add(file); + } + } + if(future4 != null){ + if (StringUtils.isNotBlank(future4.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get()); + filesList.add(file); + } + } + } if ("2".equals(appOrderDetailsVo.getPayTypeKey())) { diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl index 0ae4023dec..dee47c60d4 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl @@ -1889,7 +1889,7 @@ - ${depositTotal!} + ${depositTotal!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl new file mode 100644 index 0000000000..63d3d961de --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl @@ -0,0 +1,2891 @@ + + + + + tianlong ma + 孟哲 底 + 2 + 0 + 2024-02-21T03:50:00Z + 2024-02-21T03:50:00Z + 1 + 176 + 1009 + 8 + 2 + 1183 + 16 + + + 2052-12.1.0.16250 + 6F572EF574EC404788BBCC6BAF8548AB_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同(现车 + + + + + + + + + + ) + + + + + + + + + + + + + + + + + + 合同 + + + + + + + + 编 + + + + + + + + 号： + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + 甲 + + + + + + + + + + 方 + + + + + + + + + + (出卖方) ： + + + + + + + + + + + + + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + 方 + + + + + + + + + + (买受方)： + + + + + + + + + + + <#if customerName??> + ${customerName!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 证件 + + + + + + + + + + 号码： + + + + + + + + + + <#if idNo??> + ${idNo!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 户籍/注册地址 + + + + + + + + + + ： + + + + + + + + + + <#if adds??> + ${adds!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + + 方 + + + + + + + + + + + 从甲方以 + + + + + + + + + + 全款方式 + + + + + + + + + + + 购买现车，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + 一、 标的车辆基本信 + + + + + + + + + + 息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if modelName??> + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + <#if modelConfig??> + + + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + <#if modelConfigs??> + + + + + + + + + + + + + + + + + + + + + ${modelConfigs!} + + + + <#if publicModel??> + + + + + + + + + + + + + + + + + + + + + ${publicModel!} + + + + <#if topName??> + + + + + + + + + + + + + + + + + + + + + ${topName!} + + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + <#if remarks??> + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + <#if discountDetail??> + + + + + + + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二、 + + + + + + + + + + 车辆总价 + + + + + + + + + + 款 + + + + + + + + + + 为 + + + + + + + + + + + + + + + + + + + + + + ${totalPrice!} + + + + + + + + + + + + + + + + + + + + + 元(大写 + + + + + + + + + + + + + + + + + + + + + + ${priceRemarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + )。 + + + + + + + + + + + + + + + + + + + + + + 三 + + + + + + + + + + 、乙方 + + + + + + + + + + 在签订合同当日 + + + + + + + + + + 向甲方交纳订金 + + + + + + + + + + + + + + + + + + + + + + ${depositTotal!} + + + + + + + + + + + + + + + + + + + + + 元， 乙方提车时交清全部车款。甲方未收到全款前， 车辆所有 + + + + + + + + + + 权归甲方所有 + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + 四、车辆交 + + + + + + + + + + 付地点 + + + + + + + + + + + + + + + + + + + + + + ${address!} + + + + + + + + + + + + + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + + 五 + + + + + + + + + + 、 + + + + + + + + + + 乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验 + + + + + + + + + + 收 + + + + + + + + + + 无 + + + + + + + + + + 异议的， + + + + + + + + + + 乙方接收车辆 + + + + + + + + + + ，自此，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方 + + + + + + + + + + 承担。乙 + + + + + + + + + + 方 + + + + + + + + + + 提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + + + 六 + + + + + + + + + + + 、 + + + + + + + + + + + 甲方负责提供车辆合格证及发票 + + + + + + + + + + + ，甲方所提供的发票，不作为乙方支付款项的依据 + + + + + + + + + + + 。由于车 + + + + + + + + + + 辆自身问题等甲方原因导致车辆不能登记上牌的， + + + + + + + + + + + + + + + + + + + 由甲方负 + + + + + + + + + + 责 + + + + + + + + + + 解决； 由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的 + + + + + + + + + + + + + + + + + + + 问题 + + + + + + + + + + 等 + + + + + + + + + + 非甲方原因导致不能办理车辆登记上牌手续的， 由乙方自行解决。 + + + + + + + + + + + + + + + + + + + + + + 七、乙方交纳订金后在 10 日内不提车的，视为乙方单方放 + + + + + + + + + + 弃购车， 甲方有权将车辆另行处置， 订 + + + + + + + + + + + + + + + + + + + 金不退。 + + + + + + + + + + 如 + + + + + + + + + + 果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一承担违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行 + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + 八、 + + + + + + + + + + 本 + + + + + + + + + + 合同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + + + 九 + + + + + + + + + + 、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲方： + + + + + + + + + + + + + + + + + + + + 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${year!} + + + + + + + + + + 年 + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + ${year!} + + + + + + + + + + 年 + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl index ea32d89d2f..64abc9ceb2 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl @@ -1712,7 +1712,7 @@ - $ + @@ -1724,7 +1724,7 @@ - {priceRemarks!} + ${priceRemarks!} @@ -2726,7 +2726,7 @@ - $ + @@ -2736,7 +2736,7 @@ - {year!} + ${year!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl new file mode 100644 index 0000000000..6fc90965e9 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl @@ -0,0 +1,2908 @@ + + + + + tianlong ma + 孟哲 底 + 2 + 0 + 2024-02-21T09:40:00Z + 2024-02-21T09:40:00Z + 1 + 174 + 995 + 8 + 2 + 1167 + 16 + + + 2052-12.1.0.16120 + 2A2949A9AE044D9A83F0551EBC717579_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新车买卖合同(订车 + + + + + + + + + + ) + + + + + + + + + + + + + + + + + + + 合同编 + + + + + + + + 号： + + + + + + + + + + + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲 + + + + + + + + + + + 方 + + + + + + + + + + + (出卖方) ： + + + + + + + + + + + + + + + + + + + + + + + + ${createOrgName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + + 方 + + + + + + + + + + + (买受方)： + + + + + + + + + + + + <#if customerName??> + ${customerName!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 证件 + + + + + + + + + + + 号码： + + + + + + + + + + + <#if idNo??> + ${idNo!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 户籍/注册地址 + + + + + + + + + + + ： + + + + + + + + + + + <#if adds??> + ${adds!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 乙 + + + + + + + + + + + 方 + + + + + + + + + + + 从甲方以全款方式订购车辆，现将双方权利和义务约定如下： + + + + + + + + + + + + + + + + + + + + + + + + 一 + + + + + + + + + + + 、 甲方按照乙方要求订购排产的车辆信息如下： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if modelName??> + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + <#if modelConfig??> + + + + + + + + + + + + + + + + + + + ${modelConfig!} + + + + <#if modelConfigs??> + + + + + + + + + + + + + + + + + + + ${modelConfigs!} + + + + <#if publicModel??> + + + + + + + + + + + + + + + + + + + ${publicModel!} + + + + <#if topName??> + + + + + + + + + + + + + + + + + + + ${topName!} + + + + <#if trailerName??> + + + + + + + + + + + + + + + + + + + ${trailerName!} + + + + <#if remarks??> + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + <#if discountDetail??> + + + + + + + + + + + + + + + ${discountDetail!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 二 + + + + + + + + + + + 、 车辆总价 + + + + + + + + + + + 款 + + + + + + + + + + + 为 + + + + + + + + + + + + + + + + + + + + + + + + ${totalPrice!} + + + + + + + + + + + + + + + + + + + + + + + 元(大写 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${priceRemarks!} + + + + + + + + + + + + + + + + + + + + + + + )。 + + + + + + + + + + + + + + + + + + + + + + + + 三、乙 + + + + + + + + + + + 方 + + + + + + + + + + + 在签订合同 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${dayOne!} + + + + + + + + + + + 日内 + + + + + + + + + + + 向甲方交纳订金 + + + + + + + + + + + + + + + + + + + + + + + + ${depositTotal!} + + + + + + + + + + + + + + + + + + + + + + + 元，乙方提车时交清全部车款。甲方未收到全款前，车辆所有 + + + + + + + + + + + 权归甲方所有 + + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + + + 四、 + + + + + + + + + + + 车 + + + + + + + + + + + 辆交付地点 + + + + + + + + + + + + + + + + + + + + + + + + ${address!} + + + + + + + + + + + + + + + + + + + + + + + ，乙方自提。 + + + + + + + + + + + + + + + + + + + + + + 五 + + + + + + + + + + 、 + + + + + + + + + + 乙方或乙方授权的提车人提车时需按照合同约定的车辆信息对车况及随车工具进行验收，验 + + + + + + + + + + 收 + + + + + + + + + + 无 + + + + + + + + + + 异议的 + + + + + + + + + + + ， + + + + + + + + + + + 乙方接收车辆 + + + + + + + + + + + ，自此 + + + + + + + + + + ，车辆毁损、灭失的风险以及对第三人的侵权责任由乙方 + + + + + + + + + + 承担。乙 + + + + + + + + + + 方 + + + + + + + + + + 提车上路时必须办理车辆临牌和保险，未办理临牌和保险产生的后果全部由乙方承担。 + + + + + + + + + + + + + + + + + + + + + + 六 + + + + + + + + + + 、 + + + + + + + + + + 甲方负责提供车辆合格证及发票 + + + + + + + + + + ， + + + + + + + + + + 甲方所提供的发票，不作为乙方支付款项的依据 + + + + + + + + + + 。 + + + + + + + + + + 由于车辆自身问题等甲方原因导致车辆不能登记上牌的， + + + + + + + + + + + + + + + + + + + 由甲方负 + + + + + + + + + + 责 + + + + + + + + + + 解决； 由于乙方未按有关规定时限及时办理车辆登记上牌手续或车辆注册登记所在公司的 + + + + + + + + + + + + + + + + + + + 问题 + + + + + + + + + + 等 + + + + + + + + + + 非甲方原因导致不能办理车辆登记上牌手续的， 由乙方自行解决。 + + + + + + + + + + + + + + + + + + + + + + 七、甲方通知乙方提 + + + + + + + + + + 车 + + + + + + + + + + 后， 乙方在 10 日内不提车的，视为乙方单方放弃购车，甲方有权将车辆另 + + + + + + + + + + + + + + + + + + + 行处 + + + + + + + + + + 置 + + + + + + + + + + ，订金不退。如果甲方同意乙方继续履行合同的，有权要求乙方每日按合同总价款的千分之一 + + + + + + + + + + + + + + + + + + + 承 + + + + + + + + + + 担 + + + + + + + + + + 违约金。 + + + + + + + + + + + + + + + + + + + + + + 乙方交纳订金后，因甲方原因导致乙方不能提车的，甲方退还乙方订金，合同终止不再履行 + + + + + + + + + + 。 + + + + + + + + + + + + + + + + + + + + + + 八、本 + + + + + + + + + + 合 + + + + + + + + + + 同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + + + + + + + + + + + + + + + + + + + + + + 九 + + + + + + + + + + 、本合同双方签字或盖章之时生效。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 甲 + + + + + + + + + + 方： + + + + + + + + + + + + + + + + + + 乙方： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $ + + + + + + + + + + {year!} + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + ${year!} + + + + + + + + + + 年 + + + + + + + + + + ${month!} + + + + + + + + + + 月 + + + + + + + + + + ${day!} + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From da479e4a0ca55558f9b2c83a6479c99b5cf01897 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 22 Feb 2024 09:32:20 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/ftl/dai_orderacar_black.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl index 6fc90965e9..71066e4952 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl @@ -2738,7 +2738,7 @@ - $ + @@ -2748,7 +2748,7 @@ - {year!} + ${year!} From fa85aa0ef8f274944044ccaf5d6e13d5f2d3a444 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 22 Feb 2024 11:06:32 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E8=AF=89=E8=AE=BC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/caseaction/caseaction.js | 122 +++++ anrui-riskcenter-ui/src/router/index.js | 37 ++ .../src/views/caseaction/caseaction.vue | 371 +++++++++++++++ .../src/views/caseaction/caseactionAdd.vue | 279 +++++++++++ .../src/views/caseaction/caseactionInfo.vue | 187 ++++++++ .../caseaction/relation/selectContract.vue | 148 ++++++ .../workFlow/susongFlow/caseactionDaiBan.vue | 444 ++++++++++++++++++ .../workFlow/susongFlow/caseactionEdit.vue | 271 +++++++++++ .../workFlow/susongFlow/caseactionYiBan.vue | 230 +++++++++ .../susongFlow/relation/selectContract.vue | 148 ++++++ 10 files changed, 2237 insertions(+) create mode 100644 anrui-riskcenter-ui/src/api/caseaction/caseaction.js create mode 100644 anrui-riskcenter-ui/src/views/caseaction/caseaction.vue create mode 100644 anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue create mode 100644 anrui-riskcenter-ui/src/views/caseaction/caseactionInfo.vue create mode 100644 anrui-riskcenter-ui/src/views/caseaction/relation/selectContract.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionDaiBan.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionEdit.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionYiBan.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/susongFlow/relation/selectContract.vue diff --git a/anrui-riskcenter-ui/src/api/caseaction/caseaction.js b/anrui-riskcenter-ui/src/api/caseaction/caseaction.js new file mode 100644 index 0000000000..e774390dff --- /dev/null +++ b/anrui-riskcenter-ui/src/api/caseaction/caseaction.js @@ -0,0 +1,122 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + getListPage: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/loanContractListPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/saveLawsuit', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + init: function(data) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/lawsuitInit', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + fetchBySid: function(data) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/details', + method: 'get', + params: data + }) + }, + deleteBySids: function(data) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/deleteBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submit: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/submit', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/riskcenter/v1/LoanLawsuitApply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index 5db5ff81da..8652f2cc4b 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -743,6 +743,22 @@ export const constantRoutes = [ } ] }, + { + path: '/caseaction', + component: Layout, + redirect: '/caseaction', + meta: { + title: '案件诉讼管理' + }, + children: [ + { + path: '/caseaction/caseaction', + component: () => import('@/views/caseaction/caseaction.vue'), + name: 'CaseAction', + meta: { title: '案件诉讼管理', noCache: true } + } + ] + }, // 流程审批 // 金融产品政策报备--编辑 @@ -1251,6 +1267,27 @@ export const constantRoutes = [ component: () => import('@/views/workFlow/huigouFlow/buybackYiBan.vue'), name: 'BuyBackYiBan' + }, + // 案件诉讼管理--编辑 + { + path: '/susongFlow/caseactionEdit', + component: () => + import('@/views/workFlow/susongFlow/caseactionEdit.vue'), + name: 'CaseActionEdit' + }, + // 案件诉讼管理--待办 + { + path: '/susongFlow/caseactionDaiBan', + component: () => + import('@/views/workFlow/susongFlow/caseactionDaiBan.vue'), + name: 'CaseActionDaiBan' + }, + // 案件诉讼管理--已办 + { + path: '/susongFlow/caseactionYiBan', + component: () => + import('@/views/workFlow/susongFlow/caseactionYiBan.vue'), + name: 'CaseActionYiBan' }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } diff --git a/anrui-riskcenter-ui/src/views/caseaction/caseaction.vue b/anrui-riskcenter-ui/src/views/caseaction/caseaction.vue new file mode 100644 index 0000000000..4af7a846df --- /dev/null +++ b/anrui-riskcenter-ui/src/views/caseaction/caseaction.vue @@ -0,0 +1,371 @@ + + + + diff --git a/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue b/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue new file mode 100644 index 0000000000..e4da597e5c --- /dev/null +++ b/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue @@ -0,0 +1,279 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/caseaction/caseactionInfo.vue b/anrui-riskcenter-ui/src/views/caseaction/caseactionInfo.vue new file mode 100644 index 0000000000..9c28db50dc --- /dev/null +++ b/anrui-riskcenter-ui/src/views/caseaction/caseactionInfo.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/caseaction/relation/selectContract.vue b/anrui-riskcenter-ui/src/views/caseaction/relation/selectContract.vue new file mode 100644 index 0000000000..683593a7a3 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/caseaction/relation/selectContract.vue @@ -0,0 +1,148 @@ + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionDaiBan.vue new file mode 100644 index 0000000000..54a2df5b33 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionDaiBan.vue @@ -0,0 +1,444 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionEdit.vue new file mode 100644 index 0000000000..63d8931cd4 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionEdit.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionYiBan.vue new file mode 100644 index 0000000000..5cb9289034 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/caseactionYiBan.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/susongFlow/relation/selectContract.vue b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/relation/selectContract.vue new file mode 100644 index 0000000000..0147bbc8d8 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/susongFlow/relation/selectContract.vue @@ -0,0 +1,148 @@ + + + + From caf78d6c8586d3107f3110375b10b3c39691d7df Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 22 Feb 2024 11:34:26 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index dc097ca83e..74f3d10810 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -14,8 +14,8 @@ public enum ProcDefEnum { ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"), - FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:6:5777504"), - QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:4:7265004"), + FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:7:8387504"), + QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:5:8387508"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:7:7265008"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"), From 76b8086c985e1d81584b7fa7009489923ad2ac35 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 22 Feb 2024 13:51:40 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E8=AF=89=E8=AE=BC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/caseaction/caseaction.js | 8 +++++ .../src/views/caseaction/caseactionAdd.vue | 27 +++++++++++++++-- .../src/views/caseaction/caseactionInfo.vue | 30 ++++++++++++++++++- .../workFlow/susongFlow/caseactionDaiBan.vue | 30 ++++++++++++++++++- .../workFlow/susongFlow/caseactionEdit.vue | 20 +++++++++++-- .../workFlow/susongFlow/caseactionYiBan.vue | 30 ++++++++++++++++++- 6 files changed, 138 insertions(+), 7 deletions(-) diff --git a/anrui-riskcenter-ui/src/api/caseaction/caseaction.js b/anrui-riskcenter-ui/src/api/caseaction/caseaction.js index e774390dff..c715aa081e 100644 --- a/anrui-riskcenter-ui/src/api/caseaction/caseaction.js +++ b/anrui-riskcenter-ui/src/api/caseaction/caseaction.js @@ -41,6 +41,14 @@ export default { params: data }) }, + // 销售订单 -- 金融方案初始化 + selectDetailss: function(data) { + return request({ + url: '/riskcenter/v1/loansolutions/selectDetailss', + method: 'get', + params: data + }) + }, deleteBySids: function(data) { return request({ url: '/riskcenter/v1/LoanLawsuitApply/deleteBySids', diff --git a/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue b/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue index e4da597e5c..07681d1e56 100644 --- a/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue +++ b/anrui-riskcenter-ui/src/views/caseaction/caseactionAdd.vue @@ -12,6 +12,7 @@
+
金额单位：元
申请部门
@@ -54,7 +55,10 @@ -
已还与欠款情况
+
+
已还与欠款情况
+ 金融方案 +
@@ -99,17 +103,21 @@
+ +