diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 235995669b..6ff80ed666 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -1652,12 +1652,15 @@ public class FinPaymentrecordService extends MybatisBaseService voucherResultDetailDtos = new ArrayList<>(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJF = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(finPaymentrecord.getPayBankAccount(), finPaymentrecord.getUseOrgSid()).getData(); if (null != manufacturerBank) { if (manufacturerBank.getDueBankKey().equals("02")) { voucherResultDetailDtoDf.setSubjectNo("1002.01.00"); + voucherResultDetailDtoDf2.setSubjectNo("1002.01.00"); } else if (manufacturerBank.getDueBankKey().equals("01")) { voucherResultDetailDtoDf.setSubjectNo("1002.02.01"); + voucherResultDetailDtoDf2.setSubjectNo("1002.02.01"); } } if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金 @@ -1666,7 +1669,7 @@ public class FinPaymentrecordService extends MybatisBaseService selectByDictTypeAndDictValue(@RequestParam("dictType") String dictType,@RequestParam("dictValue") String dictValue); + + @GetMapping("/selectKeyByValue") + @ResponseBody + @ApiOperation("根据数据字典value查询key") + ResultBean selectKeyByValue(@RequestParam("dictValue") String dictValue); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java index 9e193f286c..be176a16f5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java @@ -75,4 +75,9 @@ public class DictCommonFeignFallback implements DictCommonFeign { return null; } + @Override + public ResultBean selectKeyByValue(String dictValue) { + return null; + } + } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java index f050454d34..9cd42b5a10 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java @@ -69,4 +69,7 @@ public interface DictCommonMapper extends BaseMapper { List getTypeValuesH5(String key); DictCommonVo selectByDictTypeAndDictValue(@Param("dictType")String dictType, @Param("dictValue")String dictValue); + + @Select("select dictKey from dict_common where dictValue = #{dictValue}") + String selectKeyByValue(String dictValue); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java index daa3ee6032..c7917375c0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java @@ -167,4 +167,9 @@ public class DictCommonRest implements DictCommonFeign { public ResultBean selectByDictTypeAndDictValue(String dictType, String dictValue) { return dictCommonService.selectByDictTypeAndDictValue(dictType,dictValue); } + + @Override + public ResultBean selectKeyByValue(String dictValue) { + return dictCommonService.selectKeyByValue(dictValue); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java index 8bdb62cb72..1ff5b5a018 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java @@ -96,4 +96,10 @@ public class DictCommonService extends MybatisBaseService selectKeyByValue(String dictValue) { + ResultBean rb = ResultBean.fireFail(); + String dictKey = baseMapper.selectKeyByValue(dictValue); + return rb.success().setData(dictKey); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyFeign.java index fa84426d16..b88b832d04 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseappealapply/LoanCaseAppealApplyFeign.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancaseappealapply; -import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.*; import io.swagger.annotations.Api; 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.SpringQueryMap; import org.springframework.web.bind.annotation.*; - import javax.validation.Valid; import java.util.List; -/** - * Project: anrui-riskcenter(案件上诉申请)
- * File: LoanCaseAppealApplyFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApplyFeign
- * Description: 案件上诉申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-06 10:26:59
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "案件上诉申请") @FeignClient( contextId = "anrui-riskcenter-LoanCaseAppealApply", @@ -69,12 +54,12 @@ public interface LoanCaseAppealApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanCaseAppealApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -83,7 +68,7 @@ public interface LoanCaseAppealApplyFeign { @ApiOperation("初始化") @PostMapping("/details") @ResponseBody - public ResultBean details(@RequestParam("sid") String sid,@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath); + public ResultBean details(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); @ApiOperation("提交审批流程") @PostMapping("/submit") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java index 7daeccae7d..efc2492f7f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApply.java @@ -31,70 +31,57 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApply.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApply
- * Description: 案件委托律师申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件委托律师申请", description = "案件委托律师申请") @TableName("loan_case_entrust_lawyer_apply") public class LoanCaseEntrustLawyerApply 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 loanContract; // 贷款合同编号 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String lenderName; // 贷款人 - @ApiModelProperty("客户") + @ApiModelProperty("客户") private String customName; // 客户 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("欠款合计") private String arrearsTotal; - @ApiModelProperty("律师事务所") + @ApiModelProperty("律师事务所") private String lawyerFirm; // 律师事务所 - @ApiModelProperty("承办律师") + @ApiModelProperty("承办律师") private String lawyerName; // 承办律师 - @ApiModelProperty("律师联系电话") + @ApiModelProperty("律师联系电话") private String lawyerPhone; // 律师联系电话 - @ApiModelProperty("诉讼方案") + @ApiModelProperty("诉讼方案") private String proceedProgramme; // 诉讼方案 - @ApiModelProperty("车辆欠款金额") + @ApiModelProperty("车辆欠款金额") private String carBeMoney; // 车辆欠款金额 - @ApiModelProperty("资金占用费") + @ApiModelProperty("资金占用费") private String fundPossCostMoney; // 资金占用费 - @ApiModelProperty("诉讼费用") + @ApiModelProperty("诉讼费用") private String proceedMoney; // 诉讼费用 - @ApiModelProperty("律师费") + @ApiModelProperty("律师费") private String lawyerMoney; // 律师费 - @ApiModelProperty("保全费") + @ApiModelProperty("保全费") private String defendMoney; // 保全费 - @ApiModelProperty("其他费用") + @ApiModelProperty("其他费用") private String otherMoney; // 其他费用 - @ApiModelProperty("其他费用说明") + @ApiModelProperty("其他费用说明") private String otherMoneyRemarks; // 其他费用说明 - @ApiModelProperty("起诉金额合计") + @ApiModelProperty("起诉金额合计") private String sueMoneyTotal; // 起诉金额合计 - @ApiModelProperty("是否全额诉讼") + @ApiModelProperty("是否全额诉讼") private String isFullProceed; // 是否全额诉讼 - @ApiModelProperty("部分诉讼说明") + @ApiModelProperty("部分诉讼说明") private String partProceedRemarks; // 部分诉讼说明 @ApiModelProperty("案件阶段") private String caseStage; @@ -102,23 +89,23 @@ public class LoanCaseEntrustLawyerApply extends BaseEntity { private String bankName; // 资方 @ApiModelProperty("资方合同编号") private String bankContractNo; - @ApiModelProperty("案件进程sid") + @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/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java index 53beb02fc0..21f8960268 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDetailsVo.java @@ -25,31 +25,15 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApplyVo.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyVo
- * Description: 案件委托律师申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件委托律师申请 视图数据详情", description = "案件委托律师申请 视图数据详情") public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { @@ -63,51 +47,51 @@ public class LoanCaseEntrustLawyerApplyDetailsVo 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 loanContract; // 贷款合同编号 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String lenderName; // 贷款人 - @ApiModelProperty("客户") + @ApiModelProperty("客户") private String customName; // 客户 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("欠款合计") private String arrearsTotal; - @ApiModelProperty("律师事务所") + @ApiModelProperty("律师事务所") private String lawyerFirm; // 律师事务所 - @ApiModelProperty("承办律师") + @ApiModelProperty("承办律师") private String lawyerName; // 承办律师 - @ApiModelProperty("律师联系电话") + @ApiModelProperty("律师联系电话") private String lawyerPhone; // 律师联系电话 - @ApiModelProperty("诉讼方案") + @ApiModelProperty("诉讼方案") private String proceedProgramme; // 诉讼方案 - @ApiModelProperty("车辆欠款金额") + @ApiModelProperty("车辆欠款金额") private String carBeMoney; // 车辆欠款金额 - @ApiModelProperty("资金占用费") + @ApiModelProperty("资金占用费") private String fundPossCostMoney; // 资金占用费 - @ApiModelProperty("诉讼费用") + @ApiModelProperty("诉讼费用") private String proceedMoney; // 诉讼费用 - @ApiModelProperty("律师费") + @ApiModelProperty("律师费") private String lawyerMoney; // 律师费 - @ApiModelProperty("保全费") + @ApiModelProperty("保全费") private String defendMoney; // 保全费 - @ApiModelProperty("其他费用") + @ApiModelProperty("其他费用") private String otherMoney; // 其他费用 - @ApiModelProperty("其他费用说明") + @ApiModelProperty("其他费用说明") private String otherMoneyRemarks; // 其他费用说明 - @ApiModelProperty("起诉金额合计") + @ApiModelProperty("起诉金额合计") private String sueMoneyTotal; // 起诉金额合计 - @ApiModelProperty("是否全额诉讼") + @ApiModelProperty("是否全额诉讼") private String isFullProceed; // 是否全额诉讼 - @ApiModelProperty("部分诉讼说明") + @ApiModelProperty("部分诉讼说明") private String partProceedRemarks; // 部分诉讼说明 @ApiModelProperty("案件阶段") private String caseStage; @@ -121,21 +105,21 @@ public class LoanCaseEntrustLawyerApplyDetailsVo implements Vo { private String shsSid; @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/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java index 14ae08e39c..f63c055796 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyDto.java @@ -25,29 +25,12 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; - -import com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseFile; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.List; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApplyDto.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyDto
- * Description: 案件委托律师申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件委托律师申请 数据传输对象", description = "案件委托律师申请 数据传输对象") public class LoanCaseEntrustLawyerApplyDto implements Dto { @@ -58,51 +41,51 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto { private String remarks; @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 loanContract; // 贷款合同编号 - @ApiModelProperty("贷款人") + @ApiModelProperty("贷款人") private String lenderName; // 贷款人 - @ApiModelProperty("客户") + @ApiModelProperty("客户") private String customName; // 客户 - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("欠款合计") private String arrearsTotal; - @ApiModelProperty("律师事务所") + @ApiModelProperty("律师事务所") private String lawyerFirm; // 律师事务所 - @ApiModelProperty("承办律师") + @ApiModelProperty("承办律师") private String lawyerName; // 承办律师 - @ApiModelProperty("律师联系电话") + @ApiModelProperty("律师联系电话") private String lawyerPhone; // 律师联系电话 - @ApiModelProperty("诉讼方案") + @ApiModelProperty("诉讼方案") private String proceedProgramme; // 诉讼方案 - @ApiModelProperty("车辆欠款金额") + @ApiModelProperty("车辆欠款金额") private String carBeMoney; // 车辆欠款金额 - @ApiModelProperty("资金占用费") + @ApiModelProperty("资金占用费") private String fundPossCostMoney; // 资金占用费 - @ApiModelProperty("诉讼费用") + @ApiModelProperty("诉讼费用") private String proceedMoney; // 诉讼费用 - @ApiModelProperty("律师费") + @ApiModelProperty("律师费") private String lawyerMoney; // 律师费 - @ApiModelProperty("保全费") + @ApiModelProperty("保全费") private String defendMoney; // 保全费 - @ApiModelProperty("其他费用") + @ApiModelProperty("其他费用") private String otherMoney; // 其他费用 - @ApiModelProperty("其他费用说明") + @ApiModelProperty("其他费用说明") private String otherMoneyRemarks; // 其他费用说明 - @ApiModelProperty("起诉金额合计") + @ApiModelProperty("起诉金额合计") private String sueMoneyTotal; // 起诉金额合计 - @ApiModelProperty("是否全额诉讼") + @ApiModelProperty("是否全额诉讼") private String isFullProceed; // 是否全额诉讼 - @ApiModelProperty("部分诉讼说明") + @ApiModelProperty("部分诉讼说明") private String partProceedRemarks; // 部分诉讼说明 @ApiModelProperty("案件阶段") private String caseStage; @@ -112,21 +95,21 @@ public class LoanCaseEntrustLawyerApplyDto implements Dto { private String bankContractNo; @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/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java index f036491335..a903a20737 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeign.java @@ -25,8 +25,6 @@ *********************************************************/ 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -40,19 +38,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApplyFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyFeign
- * Description: 案件委托律师申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "案件委托律师申请") @FeignClient( contextId = "anrui-riskcenter-LoanCaseEntrustLawyerApply", @@ -70,12 +55,12 @@ public interface LoanCaseEntrustLawyerApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanCaseEntrustLawyerApplyDto 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/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java index 905bec029f..8968bebb6a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyFeignFallback.java @@ -31,22 +31,8 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; - import java.util.List; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyFeignFallback
- * Description: 案件委托律师申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class LoanCaseEntrustLawyerApplyFeignFallback implements LoanCaseEntrustLawyerApplyFeign { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyQuery.java index a07e8f9509..0530ed810f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyQuery.java @@ -26,24 +26,10 @@ package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApplyQuery.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyQuery
- * Description: 案件委托律师申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件委托律师申请 查询条件", description = "案件委托律师申请 查询条件") public class LoanCaseEntrustLawyerApplyQuery implements Query { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyVo.java index ba9f37b98d..46f9fbe765 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyVo.java @@ -25,29 +25,13 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; -/** - * Project: anrui-riskcenter(案件委托律师申请)
- * File: LoanCaseEntrustLawyerApplyVo.java
- * Class: com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerApplyVo
- * Description: 案件委托律师申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-23 14:26:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "案件委托律师申请 视图数据对象", description = "案件委托律师申请 视图数据对象") public class LoanCaseEntrustLawyerApplyVo implements Vo { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 1c70152cb1..61f3d3f313 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -62,12 +62,7 @@ WHEN 1 THEN '控制成功' WHEN 2 THEN '控制失败' WHEN 3 THEN '已解控' - END AS lockCarState, - CASE - WHEN lrpd.dueDate > lrpd.updateDate or lrpd.updateDate IS NULL THEN '1' - WHEN lrpd.dueDate <= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0' - WHEN lrpd.dueDate <= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1' - END AS nowOverdue + END AS lockCarState FROM loan_repayment_plan_details lrpd LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java index cbc59b2a52..bf4536e819 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseappealapply/LoanCaseAppealApplyService.java @@ -397,12 +397,16 @@ public class LoanCaseAppealApplyService extends MybatisBaseService loanCaseAppealVehDetailsVos = new ArrayList<>(); List loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java index 204f38dbae..8f68a57931 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java @@ -333,10 +333,6 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService 0){ - return rb.setMsg("相同阶段案件进程已存在提交中或已办结的委托律师申请"); - } int r = submitBusinessData(dto, loanCaseEntrustLawyerApply); if (r == 3) { return rb.setMsg("该申请不存在"); @@ -347,6 +343,10 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService 0){ + return rb.setMsg("相同阶段案件进程已存在提交中或已办结的委托律师申请"); + } //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关,则赋值网关中判断的字段。