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-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..4a37dcb823 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,7 +397,9 @@ public class LoanCaseAppealApplyService extends MybatisBaseService