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