diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
index 9d321eeacf..d706d04793 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* Project: anrui-riskcenter(案件执行立案申请)
* File: LoanCaseExecuteApply.java
@@ -50,81 +52,89 @@ import lombok.Data;
public class LoanCaseExecuteApply extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("创建人")
+ @ApiModelProperty("创建人")
private String createByName; // 创建人
- @ApiModelProperty("申请编号")
+ @ApiModelProperty("申请编号")
private String billNo; // 申请编号
- @ApiModelProperty("申请部门sid")
+ @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
- @ApiModelProperty("申请部门名称")
+ @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
- @ApiModelProperty("案件创建日期")
+ @ApiModelProperty("案件创建日期")
private String caseCreateDate; // 案件创建日期
- @ApiModelProperty("公司负责人")
+ @ApiModelProperty("公司负责人")
private String compHead; // 公司负责人
- @ApiModelProperty("法务部门负责人")
+ @ApiModelProperty("法务部门负责人")
private String legalDeptHead; // 法务部门负责人
- @ApiModelProperty("案件编号")
+ @ApiModelProperty("案件编号")
private String caseNo; // 案件编号
- @ApiModelProperty("案件类型")
+ @ApiModelProperty("案件类型")
private String caseType; // 案件类型
- @ApiModelProperty("贷款合同编号")
+ @ApiModelProperty("贷款合同编号")
private String loanContract; // 贷款合同编号
- @ApiModelProperty("贷款人")
+ @ApiModelProperty("贷款人")
private String lenderName; // 贷款人
- @ApiModelProperty("贷款人证件号码")
+ @ApiModelProperty("贷款人证件号码")
private String lenderIdNo; // 贷款人证件号码
- @ApiModelProperty("贷款人户籍/注册地址")
+ @ApiModelProperty("贷款人户籍/注册地址")
private String lenderAddress; // 贷款人户籍/注册地址
- @ApiModelProperty("客户")
+ @ApiModelProperty("客户")
private String customName; // 客户
- @ApiModelProperty("资方")
+ @ApiModelProperty("资方")
private String bankName; // 资方
- @ApiModelProperty("资方合同编号")
+ @ApiModelProperty("资方合同编号")
private String bankContract; // 资方合同编号
- @ApiModelProperty("欠款合计")
+ @ApiModelProperty("欠款合计")
private String arrearsTotal; // 欠款合计
- @ApiModelProperty("是否全额诉讼")
+ @ApiModelProperty("是否全额诉讼")
private String isFullLitigation; // 是否全额诉讼
- @ApiModelProperty("起诉金额合计")
+ @ApiModelProperty("起诉金额合计")
private String sueMoneyTotal; // 起诉金额合计
- @ApiModelProperty("部分诉讼说明")
+ @ApiModelProperty("部分诉讼说明")
private String partProceRemarks; // 部分诉讼说明
- @ApiModelProperty("判决日期")
+ @ApiModelProperty("判决日期")
private String judgDate; // 判决日期
- @ApiModelProperty("判决结果")
+ @ApiModelProperty("判决结果")
private String judgResult; // 判决结果
- @ApiModelProperty("判决金额")
+ @ApiModelProperty("判决金额")
private String judgMoney; // 判决金额
- @ApiModelProperty("判决备注")
+ @ApiModelProperty("判决备注")
private String judgRemarks; // 判决备注
- @ApiModelProperty("判决生效后回款金额")
+ @ApiModelProperty("判决生效后回款金额")
private String judgPayMoney; // 判决生效后回款金额
- @ApiModelProperty("预执行立案日期")
+ @ApiModelProperty("预执行立案日期")
private String executeRegisDate; // 预执行立案日期
@ApiModelProperty("执行时限key")
private String executeDeadlineKey;
- @ApiModelProperty("执行时限")
+ @ApiModelProperty("执行时限")
private String executeDeadline; // 执行时限
- @ApiModelProperty("执行立案金额")
+ @ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额
+ @ApiModelProperty("当前欠款金额")
+ private BigDecimal amountInArear;
+ @ApiModelProperty("其中执行欠款金额")
+ private BigDecimal executeAmountInArear;
+ @ApiModelProperty("其中执行费用金额")
+ private BigDecimal executeExpenseAmount;
+ @ApiModelProperty("预计申请还账金额")
+ private BigDecimal badDebtAmount;
@ApiModelProperty("案件进程sid")
private String busSid;
- @ApiModelProperty("分公司sid")
+ @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
- @ApiModelProperty("分公司名称")
+ @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
- @ApiModelProperty("组织全路径")
+ @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径
- @ApiModelProperty("流程定义的id")
+ @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
- @ApiModelProperty("环节定义的sid")
+ @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
- @ApiModelProperty("流程实例的sid")
+ @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid
- @ApiModelProperty("流程状态")
+ @ApiModelProperty("流程状态")
private String nodeState; // 流程状态
- @ApiModelProperty("任务id")
+ @ApiModelProperty("任务id")
private String taskId; // 任务id
}
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 5803f3c4d0..b6be291e99 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
@@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
@@ -35,23 +34,11 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
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 LoanCaseExecuteApplyDetailsVo implements Vo {
@@ -65,81 +52,89 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
private Date createTime;
@ApiModelProperty("创建人sid")
private String createBySid;
- @ApiModelProperty("创建人")
+ @ApiModelProperty("创建人")
private String createByName; // 创建人
- @ApiModelProperty("申请编号")
+ @ApiModelProperty("申请编号")
private String billNo; // 申请编号
- @ApiModelProperty("申请部门sid")
+ @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
- @ApiModelProperty("申请部门名称")
+ @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
- @ApiModelProperty("案件创建日期")
+ @ApiModelProperty("案件创建日期")
private String caseCreateDate; // 案件创建日期
- @ApiModelProperty("公司负责人")
+ @ApiModelProperty("公司负责人")
private String compHead; // 公司负责人
- @ApiModelProperty("法务部门负责人")
+ @ApiModelProperty("法务部门负责人")
private String legalDeptHead; // 法务部门负责人
- @ApiModelProperty("案件编号")
+ @ApiModelProperty("案件编号")
private String caseNo; // 案件编号
- @ApiModelProperty("案件类型")
+ @ApiModelProperty("案件类型")
private String caseType; // 案件类型
- @ApiModelProperty("贷款合同编号")
+ @ApiModelProperty("贷款合同编号")
private String loanContract; // 贷款合同编号
- @ApiModelProperty("贷款人")
+ @ApiModelProperty("贷款人")
private String lenderName; // 贷款人
- @ApiModelProperty("贷款人证件号码")
+ @ApiModelProperty("贷款人证件号码")
private String lenderIdNo; // 贷款人证件号码
- @ApiModelProperty("贷款人户籍/注册地址")
+ @ApiModelProperty("贷款人户籍/注册地址")
private String lenderAddress; // 贷款人户籍/注册地址
- @ApiModelProperty("客户")
+ @ApiModelProperty("客户")
private String customName; // 客户
- @ApiModelProperty("资方")
+ @ApiModelProperty("资方")
private String bankName; // 资方
- @ApiModelProperty("资方合同编号")
+ @ApiModelProperty("资方合同编号")
private String bankContract; // 资方合同编号
- @ApiModelProperty("欠款合计")
+ @ApiModelProperty("欠款合计")
private String arrearsTotal; // 欠款合计
- @ApiModelProperty("是否全额诉讼")
+ @ApiModelProperty("是否全额诉讼")
private String isFullLitigation; // 是否全额诉讼
- @ApiModelProperty("起诉金额合计")
+ @ApiModelProperty("起诉金额合计")
private String sueMoneyTotal; // 起诉金额合计
- @ApiModelProperty("部分诉讼说明")
+ @ApiModelProperty("部分诉讼说明")
private String partProceRemarks; // 部分诉讼说明
- @ApiModelProperty("判决日期")
+ @ApiModelProperty("判决日期")
private String judgDate; // 判决日期
- @ApiModelProperty("判决结果")
+ @ApiModelProperty("判决结果")
private String judgResult; // 判决结果
- @ApiModelProperty("判决金额")
+ @ApiModelProperty("判决金额")
private String judgMoney; // 判决金额
- @ApiModelProperty("判决备注")
+ @ApiModelProperty("判决备注")
private String judgRemarks; // 判决备注
- @ApiModelProperty("判决生效后回款金额")
+ @ApiModelProperty("判决生效后回款金额")
private String judgPayMoney; // 判决生效后回款金额
- @ApiModelProperty("预执行立案日期")
+ @ApiModelProperty("预执行立案日期")
private String executeRegisDate; // 预执行立案日期
@ApiModelProperty("执行时限key")
private String executeDeadlineKey;
- @ApiModelProperty("执行时限")
+ @ApiModelProperty("执行时限")
private String executeDeadline; // 执行时限
- @ApiModelProperty("执行立案金额")
+ @ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额
+ @ApiModelProperty("当前欠款金额")
+ private BigDecimal amountInArear;
+ @ApiModelProperty("其中执行欠款金额")
+ private BigDecimal executeAmountInArear;
+ @ApiModelProperty("其中执行费用金额")
+ private BigDecimal executeExpenseAmount;
+ @ApiModelProperty("预计申请还账金额")
+ private BigDecimal badDebtAmount;
@ApiModelProperty("案件进程sid")
private String busSid;
- @ApiModelProperty("分公司sid")
+ @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
- @ApiModelProperty("分公司名称")
+ @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
- @ApiModelProperty("组织全路径")
+ @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径
- @ApiModelProperty("流程定义的id")
+ @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
- @ApiModelProperty("环节定义的sid")
+ @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
- @ApiModelProperty("流程实例的sid")
+ @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid
- @ApiModelProperty("流程状态")
+ @ApiModelProperty("流程状态")
private String nodeState; // 流程状态
- @ApiModelProperty("任务id")
+ @ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
index 61af26e41a..31a1256d77 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
@@ -25,9 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
-
-import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
-import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDto;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
import com.yxt.common.core.dto.Dto;
@@ -35,21 +32,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
-/**
- * Project: anrui-riskcenter(案件执行立案申请)
- * File: LoanCaseExecuteApplyDto.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDto
- * 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 LoanCaseExecuteApplyDto implements Dto {
@@ -118,6 +103,14 @@ public class LoanCaseExecuteApplyDto implements Dto {
private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额
+ @ApiModelProperty("当前欠款金额")
+ private BigDecimal amountInArear;
+ @ApiModelProperty("其中执行欠款金额")
+ private BigDecimal executeAmountInArear;
+ @ApiModelProperty("其中执行费用金额")
+ private BigDecimal executeExpenseAmount;
+ @ApiModelProperty("预计申请还账金额")
+ private BigDecimal badDebtAmount;
@ApiModelProperty("案件进程sid")
private String busSid;
@ApiModelProperty("分公司sid")
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java
index 9a3dae36f5..ef82226526 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyFeign.java
@@ -70,12 +70,12 @@ public interface LoanCaseExecuteApplyFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody LoanCaseExecuteApplyDto dto);
-
+
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
index c07da784e7..097ceb5e94 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
@@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -33,21 +32,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
-/**
- * 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 LoanCaseExecuteApplyVo implements Vo {
@@ -79,6 +66,10 @@ public class LoanCaseExecuteApplyVo implements Vo {
private String executeDeadline;
@ApiModelProperty("执行立案金额")
private String executeRegisMoney;
+ @ApiModelProperty("当前欠款金额")
+ private BigDecimal amountInArear;
+ @ApiModelProperty("预计申请还账金额")
+ private BigDecimal badDebtAmount;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
index 455659102e..ce92796754 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
@@ -1033,7 +1033,9 @@ public class LoanCaseCloseApplyService extends MybatisBaseService
- * File: LoanCaseExecuteApplyService.java
- * Class: com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyService
- * 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
- */
@Service
public class LoanCaseExecuteApplyService extends MybatisBaseService {
- @Autowired
- private SysUserFeign sysUserFeign;
- @Autowired
- private SysOrganizationFeign sysOrganizationFeign;
- @Autowired
- private SysStaffOrgFeign sysStaffOrgFeign;
- @Autowired
- private LoanCaseExecuteVehService loanCaseExecuteVehService;
- @Autowired
- private LoanCaseProgressService loanCaseProgressService;
- @Autowired
- private LoanCaseProgressTrialService loanCaseProgressTrialService;
- @Autowired
- private LoanCaseProgressVehService loanCaseProgressVehService;
- @Autowired
- private FileUploadComponent fileUploadComponent;
- @Autowired
- private LoanFileService loanFileService;
- @Autowired
- private FlowableFeign flowableFeign;
- @Autowired
- private MessageFeign messageFeign;
- @Autowired
- private FlowTaskFeign flowTaskFeign;
- @Autowired
- private FlowFeign flowFeign;
- @Autowired
- private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
- @Autowired
- private BusSalesOrderFeign busSalesOrderFeign;
- @Autowired
- private FinKingDeeFeign finKingDeeFeign;
- @Autowired
- private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
- @Autowired
- private BasePurchaseSystemFeign basePurchaseSystemFeign;
- @Autowired
- private LoanRestoreReportApplyService loanRestoreReportApplyService;
- @Autowired
- private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+ @Autowired
+ private SysUserFeign sysUserFeign;
+ @Autowired
+ private SysOrganizationFeign sysOrganizationFeign;
+ @Autowired
+ private SysStaffOrgFeign sysStaffOrgFeign;
+ @Autowired
+ private LoanCaseExecuteVehService loanCaseExecuteVehService;
+ @Autowired
+ private LoanCaseProgressService loanCaseProgressService;
+ @Autowired
+ private LoanCaseProgressTrialService loanCaseProgressTrialService;
+ @Autowired
+ private LoanCaseProgressVehService loanCaseProgressVehService;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private LoanFileService loanFileService;
+ @Autowired
+ private FlowableFeign flowableFeign;
+ @Autowired
+ private MessageFeign messageFeign;
+ @Autowired
+ private FlowTaskFeign flowTaskFeign;
+ @Autowired
+ private FlowFeign flowFeign;
+ @Autowired
+ private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+ @Autowired
+ private BusSalesOrderFeign busSalesOrderFeign;
+ @Autowired
+ private FinKingDeeFeign finKingDeeFeign;
+ @Autowired
+ private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+ @Autowired
+ private BasePurchaseSystemFeign basePurchaseSystemFeign;
+ @Autowired
+ private LoanRestoreReportApplyService loanRestoreReportApplyService;
+ @Autowired
+ private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
- public PagerVo listPageVo(PagerQuery pq) {
- LoanCaseExecuteApplyQuery query = pq.getParams();
- QueryWrapper qw = new QueryWrapper<>();
- //========================================数据授权开始
- if (StringUtils.isNotBlank(query.getMenuUrl())) {
- PrivilegeQuery privilegeQuery = new PrivilegeQuery();
- privilegeQuery.setOrgPath(query.getOrgPath());
- privilegeQuery.setMenuUrl(query.getMenuUrl());
- privilegeQuery.setMenuSid(query.getMenuSid());
- privilegeQuery.setUserSid(query.getUserSid());
- ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
- if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
- //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
- String orgSidPath = query.getOrgPath();
- orgSidPath = orgSidPath + "/";
- int i1 = orgSidPath.indexOf("/");
- int i2 = orgSidPath.indexOf("/", i1 + 1);
- int i3 = orgSidPath.indexOf("/", i2 + 1);
- int i4 = orgSidPath.indexOf("/", i3 + 1);
- String orgLevelKey = defaultIdReltBean.getData();
- if ("1".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i1);
- qw.like("orgPath", orgSidPath);
- } else if ("2".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i2);
- qw.like("orgPath", orgSidPath);
- } else if ("3".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i3);
- qw.like("orgPath", orgSidPath);
- } else if ("4".equals(orgLevelKey)) {
- orgSidPath = orgSidPath.substring(0, i4);
- qw.like("orgPath", orgSidPath);
- } else if ("5".equals(orgLevelKey)) {
- qw.eq("createBySid", query.getUserSid());
- } else {
- PagerVo p = new PagerVo<>();
- return p;
- }
- } else {
- PagerVo p = new PagerVo<>();
- return p;
- }
- }
- if (StringUtils.isNotBlank(query.getUseOrgName())) {
- qw.like("useOrgName", query.getUseOrgName());
- }
- if (StringUtils.isNotBlank(query.getDeptName())) {
- qw.like("deptName", query.getDeptName());
- }
- if (StringUtils.isNotBlank(query.getCreateByName())) {
- qw.like("createByName", query.getCreateByName());
- }
- qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
- apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
- );
- if (StringUtils.isNotBlank(query.getModifyStartTime()) && StringUtils.isNotBlank(query.getModifyEndTime())) {
- qw.and(wrapper -> wrapper.eq("nodeState", "终止").or().eq("nodeState", "已办结"));
- }
- qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
- apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
- );
- if (StringUtils.isNotBlank(query.getLoanContract())){
- qw.like("loanContract",query.getLoanContract());
- }
- if (StringUtils.isNotBlank(query.getCustomName())){
- qw.like("customName",query.getCustomName());
- }
- if (StringUtils.isNotBlank(query.getLenderName())){
- qw.like("lenderName",query.getLenderName());
- }
- if (StringUtils.isNotBlank(query.getExecuteDeadline())){
- qw.like("executeDeadline",query.getExecuteDeadline());
- }
- if (StringUtils.isNotBlank(query.getExecuteRegisMoney())){
- qw.like("executeRegisMoney",query.getExecuteRegisMoney());
- }
- qw.apply(StringUtils.isNotBlank(query.getExecuteRegisStartDate()), "date_format (executeRegisDate,'%Y-%m-%d') >= date_format('" + query.getExecuteRegisStartDate() + "','%Y-%m-%d')").
- apply(StringUtils.isNotBlank(query.getExecuteRegisEndDate()), "date_format (executeRegisDate,'%Y-%m-%d') <= date_format('" + query.getExecuteRegisEndDate() + "','%Y-%m-%d')"
- );
- qw.orderByDesc("createTime");
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- for (LoanCaseExecuteApplyVo record : pagging.getRecords()) {
- if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
- DateTime modifyTime = DateUtil.parse(record.getModifyTime());
- record.setModifyTime(DateUtil.formatDate(modifyTime));
- } else {
- record.setModifyTime("");
- }
- }
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
+ public PagerVo listPageVo(PagerQuery pq) {
+ LoanCaseExecuteApplyQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ //========================================数据授权开始
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setMenuSid(query.getMenuSid());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("orgPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("orgPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("orgPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("orgPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ if (StringUtils.isNotBlank(query.getUseOrgName())) {
+ qw.like("useOrgName", query.getUseOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getDeptName())) {
+ qw.like("deptName", query.getDeptName());
+ }
+ if (StringUtils.isNotBlank(query.getCreateByName())) {
+ qw.like("createByName", query.getCreateByName());
+ }
+ qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
+ );
+ if (StringUtils.isNotBlank(query.getModifyStartTime()) && StringUtils.isNotBlank(query.getModifyEndTime())) {
+ qw.and(wrapper -> wrapper.eq("nodeState", "终止").or().eq("nodeState", "已办结"));
+ }
+ qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
+ );
+ if (StringUtils.isNotBlank(query.getLoanContract())) {
+ qw.like("loanContract", query.getLoanContract());
+ }
+ if (StringUtils.isNotBlank(query.getCustomName())) {
+ qw.like("customName", query.getCustomName());
+ }
+ if (StringUtils.isNotBlank(query.getLenderName())) {
+ qw.like("lenderName", query.getLenderName());
+ }
+ if (StringUtils.isNotBlank(query.getExecuteDeadline())) {
+ qw.like("executeDeadline", query.getExecuteDeadline());
+ }
+ if (StringUtils.isNotBlank(query.getExecuteRegisMoney())) {
+ qw.like("executeRegisMoney", query.getExecuteRegisMoney());
+ }
+ qw.apply(StringUtils.isNotBlank(query.getExecuteRegisStartDate()), "date_format (executeRegisDate,'%Y-%m-%d') >= date_format('" + query.getExecuteRegisStartDate() + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(query.getExecuteRegisEndDate()), "date_format (executeRegisDate,'%Y-%m-%d') <= date_format('" + query.getExecuteRegisEndDate() + "','%Y-%m-%d')"
+ );
+ qw.orderByDesc("createTime");
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ for (LoanCaseExecuteApplyVo record : pagging.getRecords()) {
+ if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
+ DateTime modifyTime = DateUtil.parse(record.getModifyTime());
+ record.setModifyTime(DateUtil.formatDate(modifyTime));
+ } else {
+ record.setModifyTime("");
+ }
+ }
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
- public String saveOrUpdateDto(LoanCaseExecuteApplyDto dto){
- String dtoSid = dto.getSid();
- List pjclFiles = dto.getPjclFiles();
- List zxclFiles = dto.getZxclFiles();
- List loanCaseExecuteVehList = dto.getLoanCaseExecuteVehList();
- if (StringUtils.isBlank(dtoSid)) {
- //生成单据编号
- String billNo = "";
- String date = DateUtil.format(DateUtil.date(), "yyyyMM");
- SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
- billNo = "AJZXLA" + sysOrganizationVo.getOrgCode() + date;
- String i = baseMapper.selectNum(billNo);
- if (StringUtils.isNotBlank(i)) {
- billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
- } else {
- billNo = Rule.getBillNo(billNo, 0);
- }
- dto.setBillNo(billNo);
- String sid = this.insertByDto(dto);
- for (LoanCaseExecuteVehDto loanCaseExecuteVehDto : loanCaseExecuteVehList) {
- loanCaseExecuteVehDto.setMainSid(sid);
- loanCaseExecuteVehService.saveOrUpdateDto(loanCaseExecuteVehDto);
- }
- if (pjclFiles != null && pjclFiles.size() > 0) {
- for (LoanCaseExecuteFile file : pjclFiles) {
- LoanFile loanFile = new LoanFile();
- loanFile.setLinkSid(sid);
- loanFile.setAttachType(LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
- String filePath = file.getUrl();
- if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
- filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
- }
- loanFile.setFilePath(filePath);
- loanFileService.save(loanFile);
- }
- }
- if (zxclFiles != null && zxclFiles.size() > 0) {
- for (LoanCaseExecuteFile file : zxclFiles) {
- LoanFile loanFile = new LoanFile();
- loanFile.setLinkSid(sid);
- loanFile.setAttachType(LoanFileEnum.EXECUTE.getAttachType());
- String filePath = file.getUrl();
- if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
- filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
- }
- loanFile.setFilePath(filePath);
- loanFileService.save(loanFile);
- }
- }
- return sid;
- }
- this.updateByDto(dto);
- loanCaseExecuteVehService.delByMainSid(dtoSid);
- for (LoanCaseExecuteVehDto loanCaseExecuteVehDto : loanCaseExecuteVehList) {
- loanCaseExecuteVehDto.setSid("");
- loanCaseExecuteVehDto.setMainSid(dtoSid);
- loanCaseExecuteVehService.saveOrUpdateDto(loanCaseExecuteVehDto);
- }
- loanFileService.delByLinkSidOrType(dtoSid, LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
- if (pjclFiles != null && pjclFiles.size() > 0) {
- for (LoanCaseExecuteFile file : pjclFiles) {
- LoanFile loanFile = new LoanFile();
- loanFile.setLinkSid(dtoSid);
- loanFile.setAttachType(LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
- String filePath = file.getUrl();
- if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
- filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
- }
- loanFile.setFilePath(filePath);
- loanFileService.save(loanFile);
- }
- }
- loanFileService.delByLinkSidOrType(dtoSid, LoanFileEnum.EXECUTE.getAttachType());
- if (zxclFiles != null && zxclFiles.size() > 0) {
- for (LoanCaseExecuteFile file : zxclFiles) {
- LoanFile loanFile = new LoanFile();
- loanFile.setLinkSid(dtoSid);
- loanFile.setAttachType(LoanFileEnum.EXECUTE.getAttachType());
- String filePath = file.getUrl();
- if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
- filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
- }
- loanFile.setFilePath(filePath);
- loanFileService.save(loanFile);
- }
- }
- return dtoSid;
- }
+ public String saveOrUpdateDto(LoanCaseExecuteApplyDto dto) {
+ String dtoSid = dto.getSid();
+ List pjclFiles = dto.getPjclFiles();
+ List zxclFiles = dto.getZxclFiles();
+ List loanCaseExecuteVehList = dto.getLoanCaseExecuteVehList();
+ if (StringUtils.isBlank(dtoSid)) {
+ //生成单据编号
+ String billNo = "";
+ String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+ SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+ billNo = "AJZXLA" + sysOrganizationVo.getOrgCode() + date;
+ String i = baseMapper.selectNum(billNo);
+ if (StringUtils.isNotBlank(i)) {
+ billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+ } else {
+ billNo = Rule.getBillNo(billNo, 0);
+ }
+ dto.setBillNo(billNo);
+ String sid = this.insertByDto(dto);
+ for (LoanCaseExecuteVehDto loanCaseExecuteVehDto : loanCaseExecuteVehList) {
+ loanCaseExecuteVehDto.setMainSid(sid);
+ loanCaseExecuteVehService.saveOrUpdateDto(loanCaseExecuteVehDto);
+ }
+ if (pjclFiles != null && pjclFiles.size() > 0) {
+ for (LoanCaseExecuteFile file : pjclFiles) {
+ LoanFile loanFile = new LoanFile();
+ loanFile.setLinkSid(sid);
+ loanFile.setAttachType(LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
+ String filePath = file.getUrl();
+ if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+ }
+ loanFile.setFilePath(filePath);
+ loanFileService.save(loanFile);
+ }
+ }
+ if (zxclFiles != null && zxclFiles.size() > 0) {
+ for (LoanCaseExecuteFile file : zxclFiles) {
+ LoanFile loanFile = new LoanFile();
+ loanFile.setLinkSid(sid);
+ loanFile.setAttachType(LoanFileEnum.EXECUTE.getAttachType());
+ String filePath = file.getUrl();
+ if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+ }
+ loanFile.setFilePath(filePath);
+ loanFileService.save(loanFile);
+ }
+ }
+ return sid;
+ }
+ this.updateByDto(dto);
+ loanCaseExecuteVehService.delByMainSid(dtoSid);
+ for (LoanCaseExecuteVehDto loanCaseExecuteVehDto : loanCaseExecuteVehList) {
+ loanCaseExecuteVehDto.setSid("");
+ loanCaseExecuteVehDto.setMainSid(dtoSid);
+ loanCaseExecuteVehService.saveOrUpdateDto(loanCaseExecuteVehDto);
+ }
+ loanFileService.delByLinkSidOrType(dtoSid, LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
+ if (pjclFiles != null && pjclFiles.size() > 0) {
+ for (LoanCaseExecuteFile file : pjclFiles) {
+ LoanFile loanFile = new LoanFile();
+ loanFile.setLinkSid(dtoSid);
+ loanFile.setAttachType(LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
+ String filePath = file.getUrl();
+ if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+ }
+ loanFile.setFilePath(filePath);
+ loanFileService.save(loanFile);
+ }
+ }
+ loanFileService.delByLinkSidOrType(dtoSid, LoanFileEnum.EXECUTE.getAttachType());
+ if (zxclFiles != null && zxclFiles.size() > 0) {
+ for (LoanCaseExecuteFile file : zxclFiles) {
+ LoanFile loanFile = new LoanFile();
+ loanFile.setLinkSid(dtoSid);
+ loanFile.setAttachType(LoanFileEnum.EXECUTE.getAttachType());
+ String filePath = file.getUrl();
+ if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+ }
+ loanFile.setFilePath(filePath);
+ loanFileService.save(loanFile);
+ }
+ }
+ return dtoSid;
+ }
- public String insertByDto(LoanCaseExecuteApplyDto dto){
- LoanCaseExecuteApply entity = new LoanCaseExecuteApply();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- entity.setNodeState("待提交");
- baseMapper.insert(entity);
- return entity.getSid();
- }
+ public String insertByDto(LoanCaseExecuteApplyDto dto) {
+ LoanCaseExecuteApply entity = new LoanCaseExecuteApply();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ entity.setNodeState("待提交");
+ baseMapper.insert(entity);
+ return entity.getSid();
+ }
- public void updateByDto(LoanCaseExecuteApplyDto dto){
- String dtoSid = dto.getSid();
+ public void updateByDto(LoanCaseExecuteApplyDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
- LoanCaseExecuteApply entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
+ LoanCaseExecuteApply entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
- public LoanCaseExecuteApplyDetailsVo fetchDetailsVoBySid(String sid){
- LoanCaseExecuteApply entity = fetchBySid(sid);
- LoanCaseExecuteApplyDetailsVo vo = new LoanCaseExecuteApplyDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- List loanCaseExecuteVehDetailsVoList = loanCaseExecuteVehService.selByMainSid(sid);
- vo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVoList);
- List pjcl = loanFileService.selectByLinkSid(sid, LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
- List pjclFiles = new ArrayList<>();
- if (pjcl != null && pjcl.size() > 0) {
- for (LoanFile loanFile : pjcl) {
- LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
- String filePath = loanFile.getFilePath();
- String urlPrefix = fileUploadComponent.getUrlPrefix();
- filePath = urlPrefix + filePath;
- loanCaseExecuteFile.setUrl(filePath);
- pjclFiles.add(loanCaseExecuteFile);
- }
- }
- vo.setPjclFiles(pjclFiles);
- List zxcl = loanFileService.selectByLinkSid(sid, LoanFileEnum.ANSWERRELATE.getAttachType());
- List zxclFiles = new ArrayList<>();
- if (zxcl != null && zxcl.size() > 0) {
- for (LoanFile loanFile : zxcl) {
- LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
- String filePath = loanFile.getFilePath();
- String urlPrefix = fileUploadComponent.getUrlPrefix();
- filePath = urlPrefix + filePath;
- loanCaseExecuteFile.setUrl(filePath);
- zxclFiles.add(loanCaseExecuteFile);
- }
- }
- vo.setZxclFiles(zxclFiles);
- return vo;
- }
+ public LoanCaseExecuteApplyDetailsVo fetchDetailsVoBySid(String sid) {
+ LoanCaseExecuteApply entity = fetchBySid(sid);
+ LoanCaseExecuteApplyDetailsVo vo = new LoanCaseExecuteApplyDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ List loanCaseExecuteVehDetailsVoList = loanCaseExecuteVehService.selByMainSid(sid);
+ vo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVoList);
+ List pjcl = loanFileService.selectByLinkSid(sid, LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
+ List pjclFiles = new ArrayList<>();
+ if (pjcl != null && pjcl.size() > 0) {
+ for (LoanFile loanFile : pjcl) {
+ LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
+ String filePath = loanFile.getFilePath();
+ String urlPrefix = fileUploadComponent.getUrlPrefix();
+ filePath = urlPrefix + filePath;
+ loanCaseExecuteFile.setUrl(filePath);
+ pjclFiles.add(loanCaseExecuteFile);
+ }
+ }
+ vo.setPjclFiles(pjclFiles);
+ List zxcl = loanFileService.selectByLinkSid(sid, LoanFileEnum.ANSWERRELATE.getAttachType());
+ List zxclFiles = new ArrayList<>();
+ if (zxcl != null && zxcl.size() > 0) {
+ for (LoanFile loanFile : zxcl) {
+ LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
+ String filePath = loanFile.getFilePath();
+ String urlPrefix = fileUploadComponent.getUrlPrefix();
+ filePath = urlPrefix + filePath;
+ loanCaseExecuteFile.setUrl(filePath);
+ zxclFiles.add(loanCaseExecuteFile);
+ }
+ }
+ vo.setZxclFiles(zxclFiles);
+ return vo;
+ }
- public ResultBean delAll(String[] sids) {
- ResultBean rb = ResultBean.fireFail();
- //查询该sid中是否有流程不是待提交的
- int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
- if (count > 0) {
- return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
- }
- delBySids(sids);
- for (String sid : sids) {
- loanCaseExecuteVehService.delByMainSid(sid);
- loanFileService.delByLinkSidOrType(sid, LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
- loanFileService.delByLinkSidOrType(sid, LoanFileEnum.EXECUTE.getAttachType());
- }
- return rb.success();
- }
+ public ResultBean delAll(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ //查询该sid中是否有流程不是待提交的
+ int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+ if (count > 0) {
+ return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+ }
+ delBySids(sids);
+ for (String sid : sids) {
+ loanCaseExecuteVehService.delByMainSid(sid);
+ loanFileService.delByLinkSidOrType(sid, LoanFileEnum.AJZXLA_JUDGMENT.getAttachType());
+ loanFileService.delByLinkSidOrType(sid, LoanFileEnum.EXECUTE.getAttachType());
+ }
+ return rb.success();
+ }
- public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) {
- ResultBean rb = ResultBean.fireFail();
- LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(dto.getSid());
- int r = submitBusinessData(dto, loanCaseExecuteApply);
- if (r == 3) {
- return rb.setMsg("该申请不存在");
- }
- if (r == 0) {
- return rb.setMsg("操作失败!提交的数据不一致");
- }
- //新增修改保存
- String businessSid = saveOrUpdateDto(dto);
- loanCaseExecuteApply = fetchBySid(businessSid);
- //创建BusinessVariables实体对象
- BusinessVariables bv = new BusinessVariables();
- //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
- Map variables = new HashMap<>();
- //用户的部门全路径sid
- bv.setOrgSidPath(loanCaseExecuteApply.getOrgPath());
- //业务sid
- bv.setBusinessSid(businessSid);
- //用户sid
- bv.setUserSid(loanCaseExecuteApply.getCreateBySid());
- //若app移动端有此功能，则传递appMap参数
- Map appMap = new HashMap<>();
- appMap.put("sid", businessSid);
- //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
- variables.put("app", appMap);
- //流程定义id
- bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
- bv.setFormVariables(variables);
- if (r == 1) {
- ResultBean voResultBean = flowFeign.startProcess(bv);
- UpdateFlowFieldVo ufVo = voResultBean.getData();
- updateFlowFiled(BeanUtil.beanToMap(ufVo));
- //极光推送
- loanCaseExecuteApply = fetchBySid(businessSid);
- MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
- MessageFlowVo messageFlowVo = new MessageFlowVo();
- BeanUtil.copyProperties(ufVo, messageFlowVo);
- messageFlowableQuery.setUfVo(messageFlowVo);
- messageFlowableQuery.setAppMap(appMap);
- messageFlowableQuery.setBusinessSid(businessSid);
- messageFlowableQuery.setModuleName("案件执行立案申请");
- messageFlowableQuery.setMsgContent(loanCaseExecuteApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
- messageFlowableQuery.setMsgTitle("案件执行立案申请");
- messageFeign.pushMessage(messageFlowableQuery);
- return voResultBean;
- }
- if (r == 2) {
- // ToDo:驳回到发起人后再次提交
- if (StringUtils.isBlank(dto.getInstanceId())) {
- return rb.setMsg("参数错误：instanceId");
- }
- bv.setTaskId(loanCaseExecuteApply.getTaskId());
- bv.setTaskDefKey(loanCaseExecuteApply.getNodeSid());
- bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
- bv.setInstanceId(dto.getInstanceId());
- return complete(bv);
- }
- return rb;
- }
+ public ResultBean submit(SubmitLoanCaseExecuteApplyDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(dto.getSid());
+ int r = submitBusinessData(dto, loanCaseExecuteApply);
+ if (r == 3) {
+ return rb.setMsg("该申请不存在");
+ }
+ if (r == 0) {
+ return rb.setMsg("操作失败!提交的数据不一致");
+ }
+ //新增修改保存
+ String businessSid = saveOrUpdateDto(dto);
+ loanCaseExecuteApply = fetchBySid(businessSid);
+ //创建BusinessVariables实体对象
+ BusinessVariables bv = new BusinessVariables();
+ //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+ Map variables = new HashMap<>();
+ //用户的部门全路径sid
+ bv.setOrgSidPath(loanCaseExecuteApply.getOrgPath());
+ //业务sid
+ bv.setBusinessSid(businessSid);
+ //用户sid
+ bv.setUserSid(loanCaseExecuteApply.getCreateBySid());
+ //若app移动端有此功能，则传递appMap参数
+ Map appMap = new HashMap<>();
+ appMap.put("sid", businessSid);
+ //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+ variables.put("app", appMap);
+ //流程定义id
+ bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
+ bv.setFormVariables(variables);
+ if (r == 1) {
+ ResultBean voResultBean = flowFeign.startProcess(bv);
+ UpdateFlowFieldVo ufVo = voResultBean.getData();
+ updateFlowFiled(BeanUtil.beanToMap(ufVo));
+ //极光推送
+ loanCaseExecuteApply = fetchBySid(businessSid);
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(businessSid);
+ messageFlowableQuery.setModuleName("案件执行立案申请");
+ messageFlowableQuery.setMsgContent(loanCaseExecuteApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ messageFlowableQuery.setMsgTitle("案件执行立案申请");
+ messageFeign.pushMessage(messageFlowableQuery);
+ return voResultBean;
+ }
+ if (r == 2) {
+ // ToDo:驳回到发起人后再次提交
+ if (StringUtils.isBlank(dto.getInstanceId())) {
+ return rb.setMsg("参数错误：instanceId");
+ }
+ bv.setTaskId(loanCaseExecuteApply.getTaskId());
+ bv.setTaskDefKey(loanCaseExecuteApply.getNodeSid());
+ bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+ bv.setInstanceId(dto.getInstanceId());
+ return complete(bv);
+ }
+ return rb;
+ }
- private synchronized int submitBusinessData(SubmitLoanCaseExecuteApplyDto dto, LoanCaseExecuteApply loanCaseExecuteApply) {
- int r = 0;
- if (StringUtils.isBlank(dto.getSid())) {
- r = 1;
- } else {
- if (loanCaseExecuteApply != null) {
- String businessTaskId = loanCaseExecuteApply.getTaskId();
- if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
- //新提交
- r = 1;
- } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
- //二次提交//只有数据一致的时候才能进行下一步
- r = 2;
- }
- } else {
- r = 3;
- }
+ private synchronized int submitBusinessData(SubmitLoanCaseExecuteApplyDto dto, LoanCaseExecuteApply loanCaseExecuteApply) {
+ int r = 0;
+ if (StringUtils.isBlank(dto.getSid())) {
+ r = 1;
+ } else {
+ if (loanCaseExecuteApply != null) {
+ String businessTaskId = loanCaseExecuteApply.getTaskId();
+ if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+ //新提交
+ r = 1;
+ } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+ //二次提交//只有数据一致的时候才能进行下一步
+ r = 2;
+ }
+ } else {
+ r = 3;
+ }
- }
- return r;
- }
+ }
+ return r;
+ }
- private int updateFlowFiled(Map map) {
- return baseMapper.updateFlowFiled(map);
- }
+ private int updateFlowFiled(Map map) {
+ return baseMapper.updateFlowFiled(map);
+ }
- public ResultBean complete(BusinessVariables bv) {
- ResultBean rb = ResultBean.fireFail();
- String businessSid = bv.getBusinessSid();
- LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(businessSid);
- Map variables = new HashMap<>();
- Map appMap = new HashMap<>();
- appMap.put("sid", businessSid);
- variables.put("app", appMap);
- FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
- if (StringUtils.isBlank(loanCaseExecuteApply.getProcDefId())) {
- flowProcessMapQuery.setProDefKey(bv.getModelId());
- } else {
- flowProcessMapQuery.setProDefKey(loanCaseExecuteApply.getProcDefId());
- }
- flowProcessMapQuery.setVariables(variables);
- variables = flowableFeign.getMap(flowProcessMapQuery).getData();
- //=======================================
- bv.setFormVariables(variables);
- bv.setOrgSidPath(loanCaseExecuteApply.getOrgPath());
- if (bv.getTaskId().equals(loanCaseExecuteApply.getTaskId())) {
- ResultBean resultBean = flowFeign.handleProsess(bv);
- if (!resultBean.getSuccess()) {
- return rb.setMsg(resultBean.getMsg());
- }
- UpdateFlowFieldVo ufVo = resultBean.getData();
- updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
- if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
- try {
- ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
- .setNameFormat("demo-pool-%d").build();
- ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
- 0L, TimeUnit.MILLISECONDS,
- new LinkedBlockingQueue(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
- LoanCaseExecuteApply finalLoanCaseExecuteApply = loanCaseExecuteApply;
+ public ResultBean complete(BusinessVariables bv) {
+ ResultBean rb = ResultBean.fireFail();
+ String businessSid = bv.getBusinessSid();
+ LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(businessSid);
+ Map variables = new HashMap<>();
+ Map appMap = new HashMap<>();
+ appMap.put("sid", businessSid);
+ variables.put("app", appMap);
+ FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+ if (StringUtils.isBlank(loanCaseExecuteApply.getProcDefId())) {
+ flowProcessMapQuery.setProDefKey(bv.getModelId());
+ } else {
+ flowProcessMapQuery.setProDefKey(loanCaseExecuteApply.getProcDefId());
+ }
+ flowProcessMapQuery.setVariables(variables);
+ variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+ //=======================================
+ bv.setFormVariables(variables);
+ bv.setOrgSidPath(loanCaseExecuteApply.getOrgPath());
+ if (bv.getTaskId().equals(loanCaseExecuteApply.getTaskId())) {
+ ResultBean resultBean = flowFeign.handleProsess(bv);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ UpdateFlowFieldVo ufVo = resultBean.getData();
+ updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+ if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+ try {
+ ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+ .setNameFormat("demo-pool-%d").build();
+ ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
- //推送财务凭证
- //TOdO:
- pushRiskToFin(bv.getBusinessSid());
- //修改风控状态为执行
- //--更新销售订单车辆表的风控状态为执行
- List busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseExecuteApply.getBusSid());
- BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
- busVinStateSetQuery.setState(12);
- busVinStateSetQuery.setBusVinSidList(busVinSidList);
- ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- } else {
- //极光推送
- loanCaseExecuteApply = fetchBySid(businessSid);
- MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
- MessageFlowVo messageFlowVo = new MessageFlowVo();
- BeanUtil.copyProperties(ufVo, messageFlowVo);
- ufVo.setProcDefId(loanCaseExecuteApply.getProcDefId());
- ufVo.setProcInsId(loanCaseExecuteApply.getProcInstSid());
- messageFlowableQuery.setUfVo(messageFlowVo);
- messageFlowableQuery.setAppMap(appMap);
- messageFlowableQuery.setBusinessSid(businessSid);
- messageFlowableQuery.setModuleName("案件执行立案申请");
- messageFlowableQuery.setMsgContent(loanCaseExecuteApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
- messageFlowableQuery.setMsgTitle("案件执行立案申请");
- messageFeign.pushMessage(messageFlowableQuery);
- }
- return rb.success().setData(resultBean.getData());
- } else {
- return rb.setMsg("操作失败!提交的数据不一致");
- }
- }
-
- public void pushRiskToFin(String sid){
- LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(sid);
- if(loanCaseExecuteApply != null){
- Voucher voucher = new Voucher();
- SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getUseOrgSid()).getData();
- if (null != organizationVo) {
- voucher.setAccountBook(organizationVo.getOrgCode());
- voucher.setVoucherNo(organizationVo.getOrgCode());
- }
- List voucherResultDetailDtos = new ArrayList<>();
- List voucherResultDetailDtos2 = new ArrayList<>();
- SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData();
- List busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
- for (int i = 0; i < busVinSidList.size(); i++) {
- String busVinSid = busVinSidList.get(i);
- BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
- String customerNumber = "";
- BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
- if (salesOrder != null && busSalesOrderVehicle != null) {
- //判断财务系统是否有客户
- Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
- String linkNo = "";
- BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
- if (!aBoolean) {
- BdCustomer bdCustomer = new BdCustomer();
- bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
- bdCustomer.setFShortName(salesOrder.getContractNo());
- if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
- BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
- bdCustomer.setTOrgIds(data.getOrgCode());
- }
- bdCustomer.setTOrgIds(deptVo.getOrgCode());
- if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
- String vinNo = busSalesOrderVehicle.getLinkNo();
- if (vinNo.length() > 8) {
- linkNo = vinNo.substring(vinNo.length() - 8);
- } else {
- linkNo = busSalesOrderVehicle.getLinkNo();
- }
- if (null != borrowerDetailsVo) {
- bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
- }
- } else {
- if (null != borrowerDetailsVo) {
- bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
- }
- }
- // bdCustomers.add(bdCustomer);
- ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
- if (resultBean.getSuccess()) {
- customerNumber = bdCustomer.getFNumber();
- }
- } else {
- customerNumber = busSalesOrderVehicle.getTemporaryNo();
- }
- }
- AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
- //应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计--不含资金占用费
- BigDecimal all = BigDecimal.ZERO;
- //预申请坏账金额
- BigDecimal ysqhz = BigDecimal.ZERO;
- //其中执行欠款金额
- BigDecimal qzzxqk = BigDecimal.ZERO;
- String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
- String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
- all = all.add(StringUtils.isNotBlank(allMoney)?new BigDecimal(allMoney):BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney)?new BigDecimal(wdqMoney):BigDecimal.ZERO);
+ //推送财务凭证
+ //TOdO:
+ pushRiskToFin(bv.getBusinessSid());
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ //极光推送
+ loanCaseExecuteApply = fetchBySid(businessSid);
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ ufVo.setProcDefId(loanCaseExecuteApply.getProcDefId());
+ ufVo.setProcInsId(loanCaseExecuteApply.getProcInstSid());
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(businessSid);
+ messageFlowableQuery.setModuleName("案件执行立案申请");
+ messageFlowableQuery.setMsgContent(loanCaseExecuteApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ messageFlowableQuery.setMsgTitle("案件执行立案申请");
+ messageFeign.pushMessage(messageFlowableQuery);
+ }
+ return rb.success().setData(resultBean.getData());
+ } else {
+ return rb.setMsg("操作失败!提交的数据不一致");
+ }
+ }
- if("11".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案---二次销售后的诉讼后的执行
- //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
- if (all.compareTo(BigDecimal.ZERO) > 0) {
- //贷方
- Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
- voucherResultDetailDtoDf.setSummary(customerNumber+"转执行");
- voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
- //核算部门
- voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
- //核算客户
- voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
- voucherResultDetailDtoDf.setCredit(all.toString());
- voucherResultDetailDtos.add(voucherResultDetailDtoDf);
- }
- //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
- if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
- //借方
- Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
- voucherResultDetailDtoJf.setSummary(customerNumber+"转执行");
- voucherResultDetailDtoJf.setSubjectNo("1911.05");
- //核算部门
- voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
- //核算客户
- voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
- voucherResultDetailDtoJf.setDebit(ysqhz.toString());
- voucherResultDetailDtos.add(voucherResultDetailDtoJf);
- }
- //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
- if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
- Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
- voucherResultDetailDtoJf2.setSummary(customerNumber+"转执行");
- voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
- //核算部门
- voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
- //核算客户
- voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
- voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
- voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
- }
- }
- if("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "10".equals(busSalesOrderVehicle.getRiskState().toString())){
- //未交回立案-交回立案后的执行
- //-------------------------------------------应收贷款车欠款_待处理欠款_诉讼车辆
- if (all.compareTo(BigDecimal.ZERO) > 0) {
- //贷方
- Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
- voucherResultDetailDtoDf.setSummary(customerNumber+"转执行");
- voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
- //核算部门
- voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
- //核算客户
- voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
- voucherResultDetailDtoDf.setCredit(all.toString());
- voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
- }
- //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
- if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
- //借方
- Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
- voucherResultDetailDtoJf.setSummary(customerNumber+"转执行");
- voucherResultDetailDtoJf.setSubjectNo("1911.05");
- //核算部门
- voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
- //核算客户
- voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
- voucherResultDetailDtoJf.setDebit(ysqhz.toString());
- voucherResultDetailDtos2.add(voucherResultDetailDtoJf);
- }
- //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
- if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
- Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
- voucherResultDetailDtoJf2.setSummary(customerNumber+"转执行");
- voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
- //核算部门
- voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
- //核算客户
- voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
- voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
- voucherResultDetailDtos2.add(voucherResultDetailDtoJf2);
+ public void pushRiskToFin(String sid) {
+ LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(sid);
+ if (loanCaseExecuteApply != null) {
+ Voucher voucher = new Voucher();
+ SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getUseOrgSid()).getData();
+ if (null != organizationVo) {
+ voucher.setAccountBook(organizationVo.getOrgCode());
+ voucher.setVoucherNo(organizationVo.getOrgCode());
+ }
+ List voucherResultDetailDtos = new ArrayList<>();
+ SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData();
+ List busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
+ for (int i = 0; i < busVinSidList.size(); i++) {
+ String busVinSid = busVinSidList.get(i);
+ BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
+ String customerNumber = "";
+ BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+ if (salesOrder != null && busSalesOrderVehicle != null) {
+ //判断财务系统是否有客户
+ Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+ String linkNo = "";
+ BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+ if (!aBoolean) {
+ BdCustomer bdCustomer = new BdCustomer();
+ bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+ bdCustomer.setFShortName(salesOrder.getContractNo());
+ if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
+ BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+ bdCustomer.setTOrgIds(data.getOrgCode());
+ }
+ bdCustomer.setTOrgIds(deptVo.getOrgCode());
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+ String vinNo = busSalesOrderVehicle.getLinkNo();
+ if (vinNo.length() > 8) {
+ linkNo = vinNo.substring(vinNo.length() - 8);
+ } else {
+ linkNo = busSalesOrderVehicle.getLinkNo();
+ }
+ if (null != borrowerDetailsVo) {
+ bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+ }
+ } else {
+ if (null != borrowerDetailsVo) {
+ bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+ }
+ }
+ // bdCustomers.add(bdCustomer);
+ ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+ if (resultBean.getSuccess()) {
+ customerNumber = bdCustomer.getFNumber();
+ }
+ } else {
+ customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
+ }
+ AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
+ //应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计--不含资金占用费
+ BigDecimal all = BigDecimal.ZERO;
+ //预申请坏账金额
+ BigDecimal ysqhz = BigDecimal.ZERO;
+ //其中执行欠款金额
+ BigDecimal qzzxqk = BigDecimal.ZERO;
+ String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
+ String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
+ all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO);
+ //贷方
+ Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+ //借方
+ Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+ Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
+ //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
+ if (all.compareTo(BigDecimal.ZERO) > 0) {
+ voucherResultDetailDtoDf.setSummary(customerNumber + "转执行");
+ voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
+ //核算部门
+ voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+ //核算客户
+ voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+ voucherResultDetailDtoDf.setCredit(all.toString());
+ voucherResultDetailDtos.add(voucherResultDetailDtoDf);
+ }
+ //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
+ if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
+ voucherResultDetailDtoJf.setSummary(customerNumber + "转执行");
+ voucherResultDetailDtoJf.setSubjectNo("1911.05");
+ //核算部门
+ voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
+ //核算客户
+ voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
+ voucherResultDetailDtoJf.setDebit(ysqhz.toString());
+ voucherResultDetailDtos.add(voucherResultDetailDtoJf);
}
- }
- if (!voucherResultDetailDtos.isEmpty()) {
- voucher.setResultDetails(voucherResultDetailDtos);
- finKingDeeFeign.saveVoucher(voucher);
- }
+ //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
+ if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
+ voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行");
+ voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
+ //核算部门
+ voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
+ //核算客户
+ voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
+ voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
+ voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
+ }
+ }
- if (!voucherResultDetailDtos2.isEmpty()) {
- voucher.setResultDetails(voucherResultDetailDtos2);
+ if (!voucherResultDetailDtos.isEmpty()) {
+ voucher.setResultDetails(voucherResultDetailDtos);
finKingDeeFeign.saveVoucher(voucher);
}
- }
+ }
- }
+ }
- public ResultBean> getPreviousNodesForReject(LoanCaseExecuteApplyNodeQuery query) {
- ResultBean> rb = ResultBean.fireFail();
- BusinessVariables bv = new BusinessVariables();
- BeanUtil.copyProperties(query, bv);
- bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
- ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
- //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
- List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCaseExecuteApplyNodeVo.class)).collect(Collectors.toList());
- return rb.success().setData(voList);
- }
+ public ResultBean> getPreviousNodesForReject(LoanCaseExecuteApplyNodeQuery query) {
+ ResultBean> rb = ResultBean.fireFail();
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
+ ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+ //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+ List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCaseExecuteApplyNodeVo.class)).collect(Collectors.toList());
+ return rb.success().setData(voList);
+ }
- public ResultBean> getNextNodesForSubmit(LoanCaseExecuteApplyNodeQuery query) {
- ResultBean> rb = ResultBean.fireFail();
- BusinessVariables bv = new BusinessVariables();
- BeanUtil.copyProperties(query, bv);
- bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
- ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
- //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
- List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCaseExecuteApplyNodeVo.class)).collect(Collectors.toList());
- return rb.success().setData(voList);
- }
+ public ResultBean> getNextNodesForSubmit(LoanCaseExecuteApplyNodeQuery query) {
+ ResultBean> rb = ResultBean.fireFail();
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ bv.setModelId(ProcDefEnum.LOANCASEEXECUTEAPPLY.getProDefId());
+ ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+ //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+ List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCaseExecuteApplyNodeVo.class)).collect(Collectors.toList());
+ return rb.success().setData(voList);
+ }
- public ResultBean reject(LoanCaseExecuteApplyTaskQuery query) {
- ResultBean rb = ResultBean.fireFail();
- String businessSid = query.getBusinessSid();
- LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(businessSid);
- if (loanCaseExecuteApply == null) {
- return rb.setMsg("该申请不存在");
- }
- String businessTaskId = loanCaseExecuteApply.getTaskId();
- if (StringUtils.isNotBlank(businessTaskId)) {
- if (businessTaskId.equals(query.getTaskId())) {
- if (StringUtils.isBlank(query.getComment())) {
- return rb.setMsg("请填写意见");
- }
- if (StringUtils.isBlank(query.getUserSid())) {
- return rb.setMsg("参数错误：userSid");
- }
- FlowTaskVo flowTaskVo = new FlowTaskVo();
- BeanUtil.copyProperties(query, flowTaskVo);
- Map variables = new HashMap<>();
- Map appMap = new HashMap<>();
- appMap.put("sid", businessSid);
- variables.put("app", appMap);
- flowTaskVo.setValues(variables);
- ResultBean resultBean = flowableFeign.taskReject(flowTaskVo);
- if (!resultBean.getSuccess()) {
- return rb.setMsg(resultBean.getMsg());
- }
- UpdateFlowFieldVo ufVo = resultBean.getData();
- Map map = BeanUtil.beanToMap(ufVo);
- //更新业务中的流程相关的参数
- updateFlowFiled(map);
- //极光推送
- loanCaseExecuteApply = fetchBySid(businessSid);
- MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
- MessageFlowVo messageFlowVo = new MessageFlowVo();
- BeanUtil.copyProperties(ufVo, messageFlowVo);
- String procId = loanCaseExecuteApply.getProcInstSid();
- ufVo.setProcInsId(procId);
- ufVo.setProcDefId(loanCaseExecuteApply.getProcDefId());
- messageFlowableQuery.setUfVo(messageFlowVo);
- messageFlowableQuery.setAppMap(appMap);
- messageFlowableQuery.setBusinessSid(businessSid);
- messageFlowableQuery.setModuleName("案件执行立案申请");
- ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId);
- String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
- List receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
- if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(loanCaseExecuteApply.getCreateBySid())) {
- messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
- } else {
- messageFlowableQuery.setMsgContent(loanCaseExecuteApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
- }
- messageFlowableQuery.setMsgTitle("案件执行立案申请");
- messageFeign.pushMessage(messageFlowableQuery);
- return rb.success();
- }
- }
- return rb.setMsg("操作失败!提交的数据不一致!");
- }
+ public ResultBean reject(LoanCaseExecuteApplyTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ String businessSid = query.getBusinessSid();
+ LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(businessSid);
+ if (loanCaseExecuteApply == null) {
+ return rb.setMsg("该申请不存在");
+ }
+ String businessTaskId = loanCaseExecuteApply.getTaskId();
+ if (StringUtils.isNotBlank(businessTaskId)) {
+ if (businessTaskId.equals(query.getTaskId())) {
+ if (StringUtils.isBlank(query.getComment())) {
+ return rb.setMsg("请填写意见");
+ }
+ if (StringUtils.isBlank(query.getUserSid())) {
+ return rb.setMsg("参数错误：userSid");
+ }
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ Map variables = new HashMap<>();
+ Map appMap = new HashMap<>();
+ appMap.put("sid", businessSid);
+ variables.put("app", appMap);
+ flowTaskVo.setValues(variables);
+ ResultBean resultBean = flowableFeign.taskReject(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ UpdateFlowFieldVo ufVo = resultBean.getData();
+ Map map = BeanUtil.beanToMap(ufVo);
+ //更新业务中的流程相关的参数
+ updateFlowFiled(map);
+ //极光推送
+ loanCaseExecuteApply = fetchBySid(businessSid);
+ MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+ MessageFlowVo messageFlowVo = new MessageFlowVo();
+ BeanUtil.copyProperties(ufVo, messageFlowVo);
+ String procId = loanCaseExecuteApply.getProcInstSid();
+ ufVo.setProcInsId(procId);
+ ufVo.setProcDefId(loanCaseExecuteApply.getProcDefId());
+ messageFlowableQuery.setUfVo(messageFlowVo);
+ messageFlowableQuery.setAppMap(appMap);
+ messageFlowableQuery.setBusinessSid(businessSid);
+ messageFlowableQuery.setModuleName("案件执行立案申请");
+ ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId);
+ String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+ List receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+ if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(loanCaseExecuteApply.getCreateBySid())) {
+ messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+ } else {
+ messageFlowableQuery.setMsgContent(loanCaseExecuteApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+ }
+ messageFlowableQuery.setMsgTitle("案件执行立案申请");
+ messageFeign.pushMessage(messageFlowableQuery);
+ return rb.success();
+ }
+ }
+ return rb.setMsg("操作失败!提交的数据不一致!");
+ }
- public ResultBean revokeProcess(LoanCaseExecuteApplyTaskQuery query) {
- ResultBean rb = ResultBean.fireFail();
- if (StringUtils.isBlank(query.getUserSid())) {
- return rb.setMsg("参数错误：userSid");
- }
- LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(query.getBusinessSid());
- String businessTaskId = loanCaseExecuteApply.getTaskId();
- if (StringUtils.isNotBlank(businessTaskId)) {
- if (businessTaskId.equals(query.getTaskId())) {
- FlowTaskVo flowTaskVo = new FlowTaskVo();
- BeanUtil.copyProperties(query, flowTaskVo);
- ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo);
- if (!resultBean.getSuccess()) {
- return rb.setMsg(resultBean.getMsg());
- }
- updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
- return rb.success().setData(resultBean.getData());
- }
- }
- return rb.setMsg("操作失败，提交的数据不一致!");
- }
+ public ResultBean revokeProcess(LoanCaseExecuteApplyTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(query.getUserSid())) {
+ return rb.setMsg("参数错误：userSid");
+ }
+ LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(query.getBusinessSid());
+ String businessTaskId = loanCaseExecuteApply.getTaskId();
+ if (StringUtils.isNotBlank(businessTaskId)) {
+ if (businessTaskId.equals(query.getTaskId())) {
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+ return rb.success().setData(resultBean.getData());
+ }
+ }
+ return rb.setMsg("操作失败，提交的数据不一致!");
+ }
- public ResultBean breakProcess(LoanCaseExecuteApplyTaskQuery query) {
- ResultBean rb = ResultBean.fireFail();
- if (StringUtils.isBlank(query.getInstanceId())) {
- return rb.setMsg("参数错误：instanceId");
- }
- if (StringUtils.isBlank(query.getUserSid())) {
- return rb.setMsg("参数错误：userSid");
- }
- if (StringUtils.isBlank(query.getComment())) {
- return rb.setMsg("请填写意见");
- }
- LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(query.getBusinessSid());
- String businessTaskId = loanCaseExecuteApply.getTaskId();
- if (StringUtils.isNotBlank(businessTaskId)) {
- if (query.getUserSid().equals(loanCaseExecuteApply.getCreateBySid())) {
- FlowTaskVo flowTaskVo = new FlowTaskVo();
- BeanUtil.copyProperties(query, flowTaskVo);
- ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
- if (!resultBean.getSuccess()) {
- return rb.setMsg(resultBean.getMsg());
- }
- Map map = BeanUtil.beanToMap(resultBean.getData());
- updateFlowFiled(map);
- return rb.success().setData(resultBean.getData());
- } else {
- if (businessTaskId.equals(query.getTaskId())) {
- FlowTaskVo flowTaskVo = new FlowTaskVo();
- BeanUtil.copyProperties(query, flowTaskVo);
- ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
- if (!resultBean.getSuccess()) {
- return rb.setMsg(resultBean.getMsg());
- }
- Map map = BeanUtil.beanToMap(resultBean.getData());
- updateFlowFiled(map);
- return rb.success().setData(resultBean.getData());
- }
- }
+ public ResultBean breakProcess(LoanCaseExecuteApplyTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(query.getInstanceId())) {
+ return rb.setMsg("参数错误：instanceId");
+ }
+ if (StringUtils.isBlank(query.getUserSid())) {
+ return rb.setMsg("参数错误：userSid");
+ }
+ if (StringUtils.isBlank(query.getComment())) {
+ return rb.setMsg("请填写意见");
+ }
+ LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(query.getBusinessSid());
+ String businessTaskId = loanCaseExecuteApply.getTaskId();
+ if (StringUtils.isNotBlank(businessTaskId)) {
+ if (query.getUserSid().equals(loanCaseExecuteApply.getCreateBySid())) {
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ Map map = BeanUtil.beanToMap(resultBean.getData());
+ updateFlowFiled(map);
+ return rb.success().setData(resultBean.getData());
+ } else {
+ if (businessTaskId.equals(query.getTaskId())) {
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
+ BeanUtil.copyProperties(query, flowTaskVo);
+ ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ Map map = BeanUtil.beanToMap(resultBean.getData());
+ updateFlowFiled(map);
+ return rb.success().setData(resultBean.getData());
+ }
+ }
- }
- return rb.setMsg("操作失败!提交的数据不一致!");
- }
+ }
+ return rb.setMsg("操作失败!提交的数据不一致!");
+ }
- public ResultBean delegate(LoanCaseExecuteApplyDelegateQuery query) {
- ResultBean rb = ResultBean.fireFail();
- FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
- BeanUtil.copyProperties(query, delegateQuery);
- flowFeign.delegate(delegateQuery);
- return rb.success();
- }
+ public ResultBean delegate(LoanCaseExecuteApplyDelegateQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+ BeanUtil.copyProperties(query, delegateQuery);
+ flowFeign.delegate(delegateQuery);
+ return rb.success();
+ }
- public ResultBean details(String sid, String userSid, String orgPath) {
- ResultBean rb = ResultBean.fireFail();
- LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = new LoanCaseExecuteApplyDetailsVo();
- SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
- loanCaseExecuteApplyDetailsVo.setCreateBySid(userSid);
- loanCaseExecuteApplyDetailsVo.setCreateByName(sysUserVo.getName());
- SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
- loanCaseExecuteApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
- loanCaseExecuteApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
- loanCaseExecuteApplyDetailsVo.setCreateTime(new Date());
- LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
- loanCaseExecuteApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
- loanCaseExecuteApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
- loanCaseExecuteApplyDetailsVo.setLegalDeptHead(loanCaseProgress.getLegalHead());
- loanCaseExecuteApplyDetailsVo.setCaseNo(loanCaseProgress.getCaseNo());
- loanCaseExecuteApplyDetailsVo.setCaseType(loanCaseProgress.getCaseType());
- loanCaseExecuteApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
- loanCaseExecuteApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
- loanCaseExecuteApplyDetailsVo.setLenderIdNo(loanCaseProgress.getIdNumber());
- loanCaseExecuteApplyDetailsVo.setLenderAddress(loanCaseProgress.getBorrowerAddress());
- loanCaseExecuteApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
- loanCaseExecuteApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
- loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
- loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
- loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
- loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
- loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
- LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
- loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
- loanCaseExecuteApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult());
- LoanCaseProgressTrial loanCaseProgressTrialZs = loanCaseProgressTrialService.selByJdAndSid(sid, "再审");
- LoanCaseProgressTrial loanCaseProgressTrialEs = loanCaseProgressTrialService.selByJdAndSid(sid, "二审");
- LoanCaseProgressTrial loanCaseProgressTrialYs = loanCaseProgressTrialService.selByJdAndSid(sid, "一审");
- if (loanCaseProgressTrialZs != null && loanCaseProgressTrialZs.getVerdictAmount() != null){
- loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
- }else if (loanCaseProgressTrialEs != null && loanCaseProgressTrialEs.getVerdictAmount() != null){
- loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
- }else if (loanCaseProgressTrialYs != null && loanCaseProgressTrialYs.getVerdictAmount() != null){
- loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
- }else {
- return rb.setMsg("没有判决金额");
- }
- loanCaseExecuteApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
- String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
- SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
- loanCaseExecuteApplyDetailsVo.setUseOrgSid(useOrgSid);
- loanCaseExecuteApplyDetailsVo.setUseOrgName(organizationVo.getName());
- loanCaseExecuteApplyDetailsVo.setOrgPath(orgPath);
- loanCaseExecuteApplyDetailsVo.setBusSid(sid);
- List pjclFiles = new ArrayList<>();
- String verdictFiles = loanCaseProgressTrial.getVerdictFiles();
- if (StringUtils.isNotBlank(verdictFiles)){
- String[] files = verdictFiles.split(",");
- for (String file : files) {
- LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
- String urlPrefix = fileUploadComponent.getUrlPrefix();
- file = urlPrefix + file;
- loanCaseExecuteFile.setUrl(file);
- pjclFiles.add(loanCaseExecuteFile);
- }
- }
- loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles);
- List loanCaseExecuteVehDetailsVos = new ArrayList<>();
- List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
- for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
- LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo();
- loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo());
- loanCaseExecuteVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark());
- loanCaseExecuteVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany());
- loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus());
- loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks());
- loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo);
- }
- loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos);
- return rb.success().setData(loanCaseExecuteApplyDetailsVo);
- }
+ public ResultBean details(String sid, String userSid, String orgPath) {
+ ResultBean rb = ResultBean.fireFail();
+ LoanCaseExecuteApplyDetailsVo loanCaseExecuteApplyDetailsVo = new LoanCaseExecuteApplyDetailsVo();
+ SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+ loanCaseExecuteApplyDetailsVo.setCreateBySid(userSid);
+ loanCaseExecuteApplyDetailsVo.setCreateByName(sysUserVo.getName());
+ SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+ loanCaseExecuteApplyDetailsVo.setDeptSid(sysOrganizationVo.getSid());
+ loanCaseExecuteApplyDetailsVo.setDeptName(sysOrganizationVo.getName());
+ loanCaseExecuteApplyDetailsVo.setCreateTime(new Date());
+ LoanCaseProgress loanCaseProgress = loanCaseProgressService.fetchBySid(sid);
+ loanCaseExecuteApplyDetailsVo.setCaseCreateDate(DateUtil.formatDate(loanCaseProgress.getCreateTime()));
+ loanCaseExecuteApplyDetailsVo.setCompHead(loanCaseProgress.getCompanyHead());
+ loanCaseExecuteApplyDetailsVo.setLegalDeptHead(loanCaseProgress.getLegalHead());
+ loanCaseExecuteApplyDetailsVo.setCaseNo(loanCaseProgress.getCaseNo());
+ loanCaseExecuteApplyDetailsVo.setCaseType(loanCaseProgress.getCaseType());
+ loanCaseExecuteApplyDetailsVo.setLoanContract(loanCaseProgress.getLoanContractNo());
+ loanCaseExecuteApplyDetailsVo.setLenderName(loanCaseProgress.getLoanName());
+ loanCaseExecuteApplyDetailsVo.setLenderIdNo(loanCaseProgress.getIdNumber());
+ loanCaseExecuteApplyDetailsVo.setLenderAddress(loanCaseProgress.getBorrowerAddress());
+ loanCaseExecuteApplyDetailsVo.setCustomName(loanCaseProgress.getCustomerName());
+ loanCaseExecuteApplyDetailsVo.setBankName(loanCaseProgress.getBankName());
+ loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
+ loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
+ loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
+ if (loanCaseProgress.getSueMoney() != null){
+ loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+ }
+ loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
+ LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
+ loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
+ loanCaseExecuteApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult());
+ LoanCaseProgressTrial loanCaseProgressTrialZs = loanCaseProgressTrialService.selByJdAndSid(sid, "再审");
+ LoanCaseProgressTrial loanCaseProgressTrialEs = loanCaseProgressTrialService.selByJdAndSid(sid, "二审");
+ LoanCaseProgressTrial loanCaseProgressTrialYs = loanCaseProgressTrialService.selByJdAndSid(sid, "一审");
+ if (loanCaseProgressTrialZs != null && loanCaseProgressTrialZs.getVerdictAmount() != null) {
+ loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+ } else if (loanCaseProgressTrialEs != null && loanCaseProgressTrialEs.getVerdictAmount() != null) {
+ loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+ } else if (loanCaseProgressTrialYs != null && loanCaseProgressTrialYs.getVerdictAmount() != null) {
+ loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
+ } else {
+ return rb.setMsg("没有判决金额");
+ }
+ loanCaseExecuteApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
+ String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+ SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+ loanCaseExecuteApplyDetailsVo.setUseOrgSid(useOrgSid);
+ loanCaseExecuteApplyDetailsVo.setUseOrgName(organizationVo.getName());
+ loanCaseExecuteApplyDetailsVo.setOrgPath(orgPath);
+ loanCaseExecuteApplyDetailsVo.setBusSid(sid);
+ List pjclFiles = new ArrayList<>();
+ String verdictFiles = loanCaseProgressTrial.getVerdictFiles();
+ if (StringUtils.isNotBlank(verdictFiles)) {
+ String[] files = verdictFiles.split(",");
+ for (String file : files) {
+ LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
+ String urlPrefix = fileUploadComponent.getUrlPrefix();
+ file = urlPrefix + file;
+ loanCaseExecuteFile.setUrl(file);
+ pjclFiles.add(loanCaseExecuteFile);
+ }
+ }
+ loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles);
+ List loanCaseExecuteVehDetailsVos = new ArrayList<>();
+ List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
+ BigDecimal amountInArear = new BigDecimal("0");
+ for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
+ LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo();
+ loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo());
+ loanCaseExecuteVehDetailsVo.setCarNum(loanCaseProgressVeh.getVehMark());
+ loanCaseExecuteVehDetailsVo.setAffiliatedCompany(loanCaseProgressVeh.getAffiliatedCompany());
+ loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus());
+ loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks());
+ loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo);
+ AlrepaidAndArrVo alrepaidAndArr2 = loanRestoreReportApplyService.getAlrepaidAndArr2(loanCaseProgressVeh.getBusVinSid());
+ amountInArear = amountInArear.add(new BigDecimal(alrepaidAndArr2.getCurrentBeMoney()));
+ }
+ loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos);
+ loanCaseExecuteApplyDetailsVo.setAmountInArear(amountInArear);
+ return rb.success().setData(loanCaseExecuteApplyDetailsVo);
+ }
}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
index 6d275229f6..179346d215 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
@@ -173,9 +173,9 @@ public class AppInventoryAllocatebillService {
if ("1".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
} else if ("2".equals(type)) {
- getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
+ getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit2(getNodeQuery);
} else if ("3".equals(type)) {
- getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
+ getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit3(getNodeQuery);
}
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));