yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 weeks ago
parent
c788ec0753 639015a7ed
commit
081175c96f
8 changed files with 875 additions and 959 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
  2. 95
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java
  3. 25
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
  4. 19
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
  5. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
  6. 1601
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
  7. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java

82
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
View File

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApply.java <br/>
@ -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
}

95
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java
View File

@ -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(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo <br/>
* Description: 案件执行立案申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @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

25
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
View File

@ -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(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDto <br/>
* Description: 案件执行立案申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @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")

19
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
View File

@ -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(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo <br/>
* Description: 案件执行立案申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @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")

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
View File

@ -1033,7 +1033,9 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
loanCaseCloseApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
loanCaseCloseApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
loanCaseCloseApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
if (loanCaseProgress.getSueMoney() != null){
loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
}
loanCaseCloseApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

1601
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
View File

File diff suppressed because it is too large

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
View File

@ -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));

Write Preview
Loading…
Cancel
Save