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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 4 weeks ago
parent
936bccb031 b0f0922fb0
commit
edbf5d9a1d
17 changed files with 144 additions and 237 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  2. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeign.java
  3. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java
  4. 3
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java
  5. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java
  6. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java
  7. 17
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyFeign.java
  8. 75
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java
  9. 76
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java
  10. 77
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java
  11. 15
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java
  12. 14
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java
  13. 14
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyQuery.java
  14. 16
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyVo.java
  15. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  16. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java
  17. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -1652,12 +1652,15 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
Voucher.VoucherResultDetailDto voucherResultDetailDtoJF = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJF = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(finPaymentrecord.getPayBankAccount(), finPaymentrecord.getUseOrgSid()).getData(); FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(finPaymentrecord.getPayBankAccount(), finPaymentrecord.getUseOrgSid()).getData();
if (null != manufacturerBank) { if (null != manufacturerBank) {
if (manufacturerBank.getDueBankKey().equals("02")) { if (manufacturerBank.getDueBankKey().equals("02")) {
voucherResultDetailDtoDf.setSubjectNo("1002.01.00"); voucherResultDetailDtoDf.setSubjectNo("1002.01.00");
voucherResultDetailDtoDf2.setSubjectNo("1002.01.00");
} else if (manufacturerBank.getDueBankKey().equals("01")) { } else if (manufacturerBank.getDueBankKey().equals("01")) {
voucherResultDetailDtoDf.setSubjectNo("1002.02.01"); voucherResultDetailDtoDf.setSubjectNo("1002.02.01");
voucherResultDetailDtoDf2.setSubjectNo("1002.02.01");
} }
} }
if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金 if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金
@ -1666,7 +1669,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoJF.setSubjectNo("1009.03"); voucherResultDetailDtoJF.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData(); String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDtoJF.setBank(key); voucherResultDetailDtoJF.setBank(key);
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF); voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@ -1706,13 +1709,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
BigDecimal payAccount = finPaymentapplyDetailsBelow.getPayAccount(); BigDecimal payAccount = finPaymentapplyDetailsBelow.getPayAccount();
//查询已付款平仓款金额 //查询已付款平仓款金额
BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid()); BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid());
if (payPriceTotal.add(finPaymentrecord.getCost()).compareTo(exePayPriceTotal) == -1) { if (payPriceTotal.compareTo(exePayPriceTotal) == -1) {
//借方 //借方
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate()); voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoJF.setSubjectNo("1009.03"); voucherResultDetailDtoJF.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData(); String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDtoJF.setBank(key); voucherResultDetailDtoJF.setBank(key);
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF); voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@ -1727,7 +1730,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoJF.setSubjectNo("2111"); voucherResultDetailDtoJF.setSubjectNo("2111");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData(); String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDtoJF.setBank(key); voucherResultDetailDtoJF.setBank(key);
voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(payAccount).toString()); voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(payAccount).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF); voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@ -1739,7 +1742,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoDf.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString()); voucherResultDetailDtoDf.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf); voucherResultDetailDtos.add(voucherResultDetailDtoDf);
//贷方2 //贷方2
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate()); voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount()); voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString()); voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeign.java
View File

@ -82,4 +82,9 @@ public interface DictCommonFeign {
@ResponseBody @ResponseBody
@ApiOperation("根据数据字典类型和值查询") @ApiOperation("根据数据字典类型和值查询")
ResultBean<DictCommonVo> selectByDictTypeAndDictValue(@RequestParam("dictType") String dictType,@RequestParam("dictValue") String dictValue); ResultBean<DictCommonVo> selectByDictTypeAndDictValue(@RequestParam("dictType") String dictType,@RequestParam("dictValue") String dictValue);
@GetMapping("/selectKeyByValue")
@ResponseBody
@ApiOperation("根据数据字典value查询key")
ResultBean<String> selectKeyByValue(@RequestParam("dictValue") String dictValue);
} }

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java
View File

@ -75,4 +75,9 @@ public class DictCommonFeignFallback implements DictCommonFeign {
return null; return null;
} }
@Override
public ResultBean<String> selectKeyByValue(String dictValue) {
return null;
}
} }

3
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java
View File

@ -69,4 +69,7 @@ public interface DictCommonMapper extends BaseMapper<DictCommon> {
List<DictCommonH5Vo> getTypeValuesH5(String key); List<DictCommonH5Vo> getTypeValuesH5(String key);
DictCommonVo selectByDictTypeAndDictValue(@Param("dictType")String dictType, @Param("dictValue")String dictValue); DictCommonVo selectByDictTypeAndDictValue(@Param("dictType")String dictType, @Param("dictValue")String dictValue);
@Select("select dictKey from dict_common where dictValue = #{dictValue}")
String selectKeyByValue(String dictValue);
} }

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java
View File

@ -167,4 +167,9 @@ public class DictCommonRest implements DictCommonFeign {
public ResultBean<DictCommonVo> selectByDictTypeAndDictValue(String dictType, String dictValue) { public ResultBean<DictCommonVo> selectByDictTypeAndDictValue(String dictType, String dictValue) {
return dictCommonService.selectByDictTypeAndDictValue(dictType,dictValue); return dictCommonService.selectByDictTypeAndDictValue(dictType,dictValue);
} }
@Override
public ResultBean<String> selectKeyByValue(String dictValue) {
return dictCommonService.selectKeyByValue(dictValue);
}
} }

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java
View File

@ -96,4 +96,10 @@ public class DictCommonService extends MybatisBaseService<DictCommonMapper, Dict
} }
return rb; return rb;
} }
public ResultBean<String> selectKeyByValue(String dictValue) {
ResultBean rb = ResultBean.fireFail();
String dictKey = baseMapper.selectKeyByValue(dictValue);
return rb.success().setData(dictKey);
}
} }

17
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyFeign.java
View File

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseappealapply; package com.yxt.anrui.riskcenter.api.loancaseappealapply;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -35,23 +34,9 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件上诉申请) <br/>
* File: LoanCaseAppealApplyFeign.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyFeign <br/>
* Description: 案件上诉申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-06 10:26:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "案件上诉申请") @Api(tags = "案件上诉申请")
@FeignClient( @FeignClient(
contextId = "anrui-riskcenter-LoanCaseAppealApply", contextId = "anrui-riskcenter-LoanCaseAppealApply",
@ -83,7 +68,7 @@ public interface LoanCaseAppealApplyFeign {
@ApiOperation("初始化") @ApiOperation("初始化")
@PostMapping("/details") @PostMapping("/details")
@ResponseBody @ResponseBody
public ResultBean<LoanCaseAppealApplyDetailsVo> details(@RequestParam("sid") String sid,@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath); public ResultBean<LoanCaseAppealApplyDetailsVo> details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
@ApiOperation("提交审批流程") @ApiOperation("提交审批流程")
@PostMapping("/submit") @PostMapping("/submit")

75
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java
View File

@ -31,70 +31,57 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApply.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApply <br/>
* Description: 案件委托律师申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件委托律师申请", description = "案件委托律师申请") @ApiModel(value = "案件委托律师申请", description = "案件委托律师申请")
@TableName("loan_case_entrust_lawyer_apply") @TableName("loan_case_entrust_lawyer_apply")
public class LoanCaseEntrustLawyerApply extends BaseEntity { public class LoanCaseEntrustLawyerApply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createByName; // 创建人 private String createByName; // 创建人
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
private String billNo; // 申请编号 private String billNo; // 申请编号
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName; // 申请部门名称
@ApiModelProperty("贷款合同编号") @ApiModelProperty("贷款合同编号")
private String loanContract; // 贷款合同编号 private String loanContract; // 贷款合同编号
@ApiModelProperty("贷款人") @ApiModelProperty("贷款人")
private String lenderName; // 贷款人 private String lenderName; // 贷款人
@ApiModelProperty("客户") @ApiModelProperty("客户")
private String customName; // 客户 private String customName; // 客户
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("欠款合计") @ApiModelProperty("欠款合计")
private String arrearsTotal; private String arrearsTotal;
@ApiModelProperty("律师事务所") @ApiModelProperty("律师事务所")
private String lawyerFirm; // 律师事务所 private String lawyerFirm; // 律师事务所
@ApiModelProperty("承办律师") @ApiModelProperty("承办律师")
private String lawyerName; // 承办律师 private String lawyerName; // 承办律师
@ApiModelProperty("律师联系电话") @ApiModelProperty("律师联系电话")
private String lawyerPhone; // 律师联系电话 private String lawyerPhone; // 律师联系电话
@ApiModelProperty("诉讼方案") @ApiModelProperty("诉讼方案")
private String proceedProgramme; // 诉讼方案 private String proceedProgramme; // 诉讼方案
@ApiModelProperty("车辆欠款金额") @ApiModelProperty("车辆欠款金额")
private String carBeMoney; // 车辆欠款金额 private String carBeMoney; // 车辆欠款金额
@ApiModelProperty("资金占用费") @ApiModelProperty("资金占用费")
private String fundPossCostMoney; // 资金占用费 private String fundPossCostMoney; // 资金占用费
@ApiModelProperty("诉讼费用") @ApiModelProperty("诉讼费用")
private String proceedMoney; // 诉讼费用 private String proceedMoney; // 诉讼费用
@ApiModelProperty("律师费") @ApiModelProperty("律师费")
private String lawyerMoney; // 律师费 private String lawyerMoney; // 律师费
@ApiModelProperty("保全费") @ApiModelProperty("保全费")
private String defendMoney; // 保全费 private String defendMoney; // 保全费
@ApiModelProperty("其他费用") @ApiModelProperty("其他费用")
private String otherMoney; // 其他费用 private String otherMoney; // 其他费用
@ApiModelProperty("其他费用说明") @ApiModelProperty("其他费用说明")
private String otherMoneyRemarks; // 其他费用说明 private String otherMoneyRemarks; // 其他费用说明
@ApiModelProperty("起诉金额合计") @ApiModelProperty("起诉金额合计")
private String sueMoneyTotal; // 起诉金额合计 private String sueMoneyTotal; // 起诉金额合计
@ApiModelProperty("是否全额诉讼") @ApiModelProperty("是否全额诉讼")
private String isFullProceed; // 是否全额诉讼 private String isFullProceed; // 是否全额诉讼
@ApiModelProperty("部分诉讼说明") @ApiModelProperty("部分诉讼说明")
private String partProceedRemarks; // 部分诉讼说明 private String partProceedRemarks; // 部分诉讼说明
@ApiModelProperty("案件阶段") @ApiModelProperty("案件阶段")
private String caseStage; private String caseStage;
@ -102,23 +89,23 @@ public class LoanCaseEntrustLawyerApply extends BaseEntity {
private String bankName; // 资方 private String bankName; // 资方
@ApiModelProperty("资方合同编号") @ApiModelProperty("资方合同编号")
private String bankContractNo; private String bankContractNo;
@ApiModelProperty("案件进程sid") @ApiModelProperty("案件进程sid")
private String busSid; private String busSid;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径 private String orgPath; // 组织全路径
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
} }

76
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java
View File

@ -25,31 +25,15 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyVo <br/>
* Description: 案件委托律师申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件委托律师申请 视图数据详情", description = "案件委托律师申请 视图数据详情") @ApiModel(value = "案件委托律师申请 视图数据详情", description = "案件委托律师申请 视图数据详情")
public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
@ -63,51 +47,51 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
private Date createTime; private Date createTime;
@ApiModelProperty("创建人sid") @ApiModelProperty("创建人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createByName; // 创建人 private String createByName; // 创建人
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
private String billNo; // 申请编号 private String billNo; // 申请编号
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName; // 申请部门名称
@ApiModelProperty("贷款合同编号") @ApiModelProperty("贷款合同编号")
private String loanContract; // 贷款合同编号 private String loanContract; // 贷款合同编号
@ApiModelProperty("贷款人") @ApiModelProperty("贷款人")
private String lenderName; // 贷款人 private String lenderName; // 贷款人
@ApiModelProperty("客户") @ApiModelProperty("客户")
private String customName; // 客户 private String customName; // 客户
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("欠款合计") @ApiModelProperty("欠款合计")
private String arrearsTotal; private String arrearsTotal;
@ApiModelProperty("律师事务所") @ApiModelProperty("律师事务所")
private String lawyerFirm; // 律师事务所 private String lawyerFirm; // 律师事务所
@ApiModelProperty("承办律师") @ApiModelProperty("承办律师")
private String lawyerName; // 承办律师 private String lawyerName; // 承办律师
@ApiModelProperty("律师联系电话") @ApiModelProperty("律师联系电话")
private String lawyerPhone; // 律师联系电话 private String lawyerPhone; // 律师联系电话
@ApiModelProperty("诉讼方案") @ApiModelProperty("诉讼方案")
private String proceedProgramme; // 诉讼方案 private String proceedProgramme; // 诉讼方案
@ApiModelProperty("车辆欠款金额") @ApiModelProperty("车辆欠款金额")
private String carBeMoney; // 车辆欠款金额 private String carBeMoney; // 车辆欠款金额
@ApiModelProperty("资金占用费") @ApiModelProperty("资金占用费")
private String fundPossCostMoney; // 资金占用费 private String fundPossCostMoney; // 资金占用费
@ApiModelProperty("诉讼费用") @ApiModelProperty("诉讼费用")
private String proceedMoney; // 诉讼费用 private String proceedMoney; // 诉讼费用
@ApiModelProperty("律师费") @ApiModelProperty("律师费")
private String lawyerMoney; // 律师费 private String lawyerMoney; // 律师费
@ApiModelProperty("保全费") @ApiModelProperty("保全费")
private String defendMoney; // 保全费 private String defendMoney; // 保全费
@ApiModelProperty("其他费用") @ApiModelProperty("其他费用")
private String otherMoney; // 其他费用 private String otherMoney; // 其他费用
@ApiModelProperty("其他费用说明") @ApiModelProperty("其他费用说明")
private String otherMoneyRemarks; // 其他费用说明 private String otherMoneyRemarks; // 其他费用说明
@ApiModelProperty("起诉金额合计") @ApiModelProperty("起诉金额合计")
private String sueMoneyTotal; // 起诉金额合计 private String sueMoneyTotal; // 起诉金额合计
@ApiModelProperty("是否全额诉讼") @ApiModelProperty("是否全额诉讼")
private String isFullProceed; // 是否全额诉讼 private String isFullProceed; // 是否全额诉讼
@ApiModelProperty("部分诉讼说明") @ApiModelProperty("部分诉讼说明")
private String partProceedRemarks; // 部分诉讼说明 private String partProceedRemarks; // 部分诉讼说明
@ApiModelProperty("案件阶段") @ApiModelProperty("案件阶段")
private String caseStage; private String caseStage;
@ -121,21 +105,21 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo {
private String shsSid; private String shsSid;
@ApiModelProperty("案件进程sid") @ApiModelProperty("案件进程sid")
private String busSid; private String busSid;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径 private String orgPath; // 组织全路径
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@ApiModelProperty @ApiModelProperty

77
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java
View File

@ -25,29 +25,12 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApplyDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyDto <br/>
* Description: 案件委托律师申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件委托律师申请 数据传输对象", description = "案件委托律师申请 数据传输对象") @ApiModel(value = "案件委托律师申请 数据传输对象", description = "案件委托律师申请 数据传输对象")
public class LoanCaseEntrustLawyerApplyDto implements Dto { public class LoanCaseEntrustLawyerApplyDto implements Dto {
@ -58,51 +41,51 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto {
private String remarks; private String remarks;
@ApiModelProperty("创建人sid") @ApiModelProperty("创建人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createByName; // 创建人 private String createByName; // 创建人
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
private String billNo; // 申请编号 private String billNo; // 申请编号
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName; // 申请部门名称
@ApiModelProperty("贷款合同编号") @ApiModelProperty("贷款合同编号")
private String loanContract; // 贷款合同编号 private String loanContract; // 贷款合同编号
@ApiModelProperty("贷款人") @ApiModelProperty("贷款人")
private String lenderName; // 贷款人 private String lenderName; // 贷款人
@ApiModelProperty("客户") @ApiModelProperty("客户")
private String customName; // 客户 private String customName; // 客户
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("欠款合计") @ApiModelProperty("欠款合计")
private String arrearsTotal; private String arrearsTotal;
@ApiModelProperty("律师事务所") @ApiModelProperty("律师事务所")
private String lawyerFirm; // 律师事务所 private String lawyerFirm; // 律师事务所
@ApiModelProperty("承办律师") @ApiModelProperty("承办律师")
private String lawyerName; // 承办律师 private String lawyerName; // 承办律师
@ApiModelProperty("律师联系电话") @ApiModelProperty("律师联系电话")
private String lawyerPhone; // 律师联系电话 private String lawyerPhone; // 律师联系电话
@ApiModelProperty("诉讼方案") @ApiModelProperty("诉讼方案")
private String proceedProgramme; // 诉讼方案 private String proceedProgramme; // 诉讼方案
@ApiModelProperty("车辆欠款金额") @ApiModelProperty("车辆欠款金额")
private String carBeMoney; // 车辆欠款金额 private String carBeMoney; // 车辆欠款金额
@ApiModelProperty("资金占用费") @ApiModelProperty("资金占用费")
private String fundPossCostMoney; // 资金占用费 private String fundPossCostMoney; // 资金占用费
@ApiModelProperty("诉讼费用") @ApiModelProperty("诉讼费用")
private String proceedMoney; // 诉讼费用 private String proceedMoney; // 诉讼费用
@ApiModelProperty("律师费") @ApiModelProperty("律师费")
private String lawyerMoney; // 律师费 private String lawyerMoney; // 律师费
@ApiModelProperty("保全费") @ApiModelProperty("保全费")
private String defendMoney; // 保全费 private String defendMoney; // 保全费
@ApiModelProperty("其他费用") @ApiModelProperty("其他费用")
private String otherMoney; // 其他费用 private String otherMoney; // 其他费用
@ApiModelProperty("其他费用说明") @ApiModelProperty("其他费用说明")
private String otherMoneyRemarks; // 其他费用说明 private String otherMoneyRemarks; // 其他费用说明
@ApiModelProperty("起诉金额合计") @ApiModelProperty("起诉金额合计")
private String sueMoneyTotal; // 起诉金额合计 private String sueMoneyTotal; // 起诉金额合计
@ApiModelProperty("是否全额诉讼") @ApiModelProperty("是否全额诉讼")
private String isFullProceed; // 是否全额诉讼 private String isFullProceed; // 是否全额诉讼
@ApiModelProperty("部分诉讼说明") @ApiModelProperty("部分诉讼说明")
private String partProceedRemarks; // 部分诉讼说明 private String partProceedRemarks; // 部分诉讼说明
@ApiModelProperty("案件阶段") @ApiModelProperty("案件阶段")
private String caseStage; private String caseStage;
@ -112,21 +95,21 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto {
private String bankContractNo; private String bankContractNo;
@ApiModelProperty("案件进程sid") @ApiModelProperty("案件进程sid")
private String busSid; private String busSid;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径 private String orgPath; // 组织全路径
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@ApiModelProperty @ApiModelProperty

15
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java
View File

@ -25,8 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.flowable.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -40,19 +38,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApplyFeign.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyFeign <br/>
* Description: 案件委托律师申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "案件委托律师申请") @Api(tags = "案件委托律师申请")
@FeignClient( @FeignClient(
contextId = "anrui-riskcenter-LoanCaseEntrustLawyerApply", contextId = "anrui-riskcenter-LoanCaseEntrustLawyerApply",

14
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java
View File

@ -31,22 +31,8 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyFeignFallback <br/>
* Description: 案件委托律师申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component @Component
public class LoanCaseEntrustLawyerApplyFeignFallback implements LoanCaseEntrustLawyerApplyFeign { public class LoanCaseEntrustLawyerApplyFeignFallback implements LoanCaseEntrustLawyerApplyFeign {

14
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyQuery.java
View File

@ -26,24 +26,10 @@
package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApplyQuery.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyQuery <br/>
* Description: 案件委托律师申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件委托律师申请 查询条件", description = "案件委托律师申请 查询条件") @ApiModel(value = "案件委托律师申请 查询条件", description = "案件委托律师申请 查询条件")
public class LoanCaseEntrustLawyerApplyQuery implements Query { public class LoanCaseEntrustLawyerApplyQuery implements Query {

16
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyVo.java
View File

@ -25,29 +25,13 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/**
* Project: anrui-riskcenter(案件委托律师申请) <br/>
* File: LoanCaseEntrustLawyerApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyVo <br/>
* Description: 案件委托律师申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-23 14:26:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件委托律师申请 视图数据对象", description = "案件委托律师申请 视图数据对象") @ApiModel(value = "案件委托律师申请 视图数据对象", description = "案件委托律师申请 视图数据对象")
public class LoanCaseEntrustLawyerApplyVo implements Vo { public class LoanCaseEntrustLawyerApplyVo implements Vo {

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
View File

@ -62,12 +62,7 @@
WHEN 1 THEN '控制成功' WHEN 1 THEN '控制成功'
WHEN 2 THEN '控制失败' WHEN 2 THEN '控制失败'
WHEN 3 THEN '已解控' WHEN 3 THEN '已解控'
END AS lockCarState, END AS lockCarState
CASE
WHEN lrpd.dueDate > lrpd.updateDate or lrpd.updateDate IS NULL THEN '1'
WHEN lrpd.dueDate &lt;= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
WHEN lrpd.dueDate &lt;= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) &lt;= 0 THEN '1'
END AS nowOverdue
FROM loan_repayment_plan_details lrpd FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid ON lrh.planDetailSid = lrpd.sid

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java
View File

@ -397,12 +397,16 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
loanCaseAppealApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo()); loanCaseAppealApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
loanCaseAppealApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString()); loanCaseAppealApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
loanCaseAppealApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull()); loanCaseAppealApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
loanCaseAppealApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString()); if (loanCaseProgress.getSueMoney() != null){
loanCaseAppealApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
}
loanCaseAppealApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows()); loanCaseAppealApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage()); LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
loanCaseAppealApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime())); loanCaseAppealApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
loanCaseAppealApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult()); loanCaseAppealApplyDetailsVo.setJudgResult(loanCaseProgressTrial.getVerdictResult());
loanCaseAppealApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString()); if (loanCaseProgressTrial.getVerdictAmount() != null){
loanCaseAppealApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
}
loanCaseAppealApplyDetailsVo.setReceivejudgDate(loanCaseProgressTrial.getReceiveTime()); loanCaseAppealApplyDetailsVo.setReceivejudgDate(loanCaseProgressTrial.getReceiveTime());
loanCaseAppealApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks()); loanCaseAppealApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
loanCaseAppealApplyDetailsVo.setBusSid(sid); loanCaseAppealApplyDetailsVo.setBusSid(sid);
@ -430,10 +434,12 @@ public class LoanCaseAppealApplyService extends MybatisBaseService<LoanCaseAppea
loanCaseAppealApplyDetailsVo.setCaseStage("再审"); loanCaseAppealApplyDetailsVo.setCaseStage("再审");
} }
String ajssyxq = sysParameterFeign.fetchByParNo("AJSSYXQ").getData(); String ajssyxq = sysParameterFeign.fetchByParNo("AJSSYXQ").getData();
Calendar calendar = Calendar.getInstance(); if (StringUtils.isNotBlank(loanCaseProgressTrial.getReceiveTime())){
calendar.setTime(DateUtil.parseDate(loanCaseProgressTrial.getReceiveTime())); Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_YEAR, Integer.parseInt(ajssyxq)); calendar.setTime(DateUtil.parseDate(loanCaseProgressTrial.getReceiveTime()));
loanCaseAppealApplyDetailsVo.setAppealDueDate(DateUtil.formatDate(calendar.getTime())); calendar.add(Calendar.DAY_OF_YEAR, Integer.parseInt(ajssyxq));
loanCaseAppealApplyDetailsVo.setAppealDueDate(DateUtil.formatDate(calendar.getTime()));
}
List<LoanCaseAppealVehDetailsVo> loanCaseAppealVehDetailsVos = new ArrayList<>(); List<LoanCaseAppealVehDetailsVo> loanCaseAppealVehDetailsVos = new ArrayList<>();
List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java
View File

@ -333,10 +333,6 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
public ResultBean submit(SubmitLoanCaseEntrustLawyerApplyDto dto) { public ResultBean submit(SubmitLoanCaseEntrustLawyerApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LoanCaseEntrustLawyerApply loanCaseEntrustLawyerApply = fetchBySid(dto.getSid()); LoanCaseEntrustLawyerApply loanCaseEntrustLawyerApply = fetchBySid(dto.getSid());
int i = baseMapper.selectBusSisAndCaseStage(loanCaseEntrustLawyerApply.getBusSid(), loanCaseEntrustLawyerApply.getCaseStage());
if (i > 0){
return rb.setMsg("相同阶段案件进程已存在提交中或已办结的委托律师申请");
}
int r = submitBusinessData(dto, loanCaseEntrustLawyerApply); int r = submitBusinessData(dto, loanCaseEntrustLawyerApply);
if (r == 3) { if (r == 3) {
return rb.setMsg("该申请不存在"); return rb.setMsg("该申请不存在");
@ -347,6 +343,10 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
//新增修改保存 //新增修改保存
String businessSid = saveOrUpdateDto(dto); String businessSid = saveOrUpdateDto(dto);
loanCaseEntrustLawyerApply = fetchBySid(businessSid); loanCaseEntrustLawyerApply = fetchBySid(businessSid);
int i = baseMapper.selectBusSisAndCaseStage(loanCaseEntrustLawyerApply.getBusSid(), loanCaseEntrustLawyerApply.getCaseStage());
if (i > 0){
return rb.setMsg("相同阶段案件进程已存在提交中或已办结的委托律师申请");
}
//创建BusinessVariables实体对象 //创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。 //流程中的参数赋值、若有网关，则赋值网关中判断的字段。

Write Preview
Loading…
Cancel
Save