更改

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<FinPaymentrecord
         List<Voucher.VoucherResultDetailDto> 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<FinPaymentrecord
             voucherResultDetailDtoJF.setSubjectNo("1009.03");
             SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
             voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
-            String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+            String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
             voucherResultDetailDtoJF.setBank(key);
             voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
             voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@@ -1706,13 +1709,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             BigDecimal payAccount = finPaymentapplyDetailsBelow.getPayAccount();
             //查询已付款平仓款金额
             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.setSubjectNo("1009.03");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
-                String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+                String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
                 voucherResultDetailDtoJF.setBank(key);
                 voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@@ -1727,7 +1730,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoJF.setSubjectNo("2111");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
-                String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+                String key = dictCommonFeign.selectKeyByValue(finPaymentrecord.getReceiveBank()).getData();
                 voucherResultDetailDtoJF.setBank(key);
                 voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(payAccount).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
@@ -1739,7 +1742,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoDf.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
                 //贷方2
-                Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
                 voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
                 voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
                 voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());

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

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

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<String> selectKeyByValue(String dictValue) {
+        return null;
+    }
+
 }

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<DictCommon> {
     List<DictCommonH5Vo> 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);
 }

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<DictCommonVo> selectByDictTypeAndDictValue(String dictType, String dictValue) {
         return dictCommonService.selectByDictTypeAndDictValue(dictType,dictValue);
     }
+
+    @Override
+    public ResultBean<String> selectKeyByValue(String dictValue) {
+        return dictCommonService.selectKeyByValue(dictValue);
+    }
 }

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<DictCommonMapper, Dict
         }
         return rb;
     }
+
+    public ResultBean<String> selectKeyByValue(String dictValue) {
+        ResultBean rb = ResultBean.fireFail();
+        String dictKey = baseMapper.selectKeyByValue(dictValue);
+        return rb.success().setData(dictKey);
+    }
 }

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(案件上诉申请) <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 = "案件上诉申请")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanCaseAppealApply",
@@ -83,7 +68,7 @@ public interface LoanCaseAppealApplyFeign {
     @ApiOperation("初始化")
     @PostMapping("/details")
     @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("提交审批流程")
     @PostMapping("/submit")

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<LoanCaseAppea
 		loanCaseAppealApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
 		loanCaseAppealApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
 		loanCaseAppealApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
-		loanCaseAppealApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+		if (loanCaseProgress.getSueMoney() != null){
+			loanCaseAppealApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+		}
 		loanCaseAppealApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
 		LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
 		loanCaseAppealApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));