Merge remote-tracking branch 'origin/master'

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

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-riskcenter(案件执行立案申请) <br/>
  * File: LoanCaseExecuteApply.java <br/>
@@ -108,6 +110,14 @@ public class LoanCaseExecuteApply extends BaseEntity {
     private String executeDeadline; // 执行时限
     @ApiModelProperty("执行立案金额")
     private String executeRegisMoney; // 执行立案金额
+    @ApiModelProperty("当前欠款金额")
+    private BigDecimal amountInArear;
+    @ApiModelProperty("其中执行欠款金额")
+    private BigDecimal executeAmountInArear;
+    @ApiModelProperty("其中执行费用金额")
+    private BigDecimal executeExpenseAmount;
+    @ApiModelProperty("预计申请还账金额")
+    private BigDecimal badDebtAmount;
     @ApiModelProperty("案件进程sid")
     private String busSid;
     @ApiModelProperty("分公司sid")

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
@@ -35,23 +34,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(案件执行立案申请) <br/>
- * File: LoanCaseExecuteApplyVo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo <br/>
- * Description: 案件执行立案申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-02-07 10:00:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "案件执行立案申请 视图数据详情", description = "案件执行立案申请 视图数据详情")
 public class LoanCaseExecuteApplyDetailsVo implements Vo {
@@ -123,6 +110,14 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
     private String executeDeadline; // 执行时限
     @ApiModelProperty("执行立案金额")
     private String executeRegisMoney; // 执行立案金额
+    @ApiModelProperty("当前欠款金额")
+    private BigDecimal amountInArear;
+    @ApiModelProperty("其中执行欠款金额")
+    private BigDecimal executeAmountInArear;
+    @ApiModelProperty("其中执行费用金额")
+    private BigDecimal executeExpenseAmount;
+    @ApiModelProperty("预计申请还账金额")
+    private BigDecimal badDebtAmount;
     @ApiModelProperty("案件进程sid")
     private String busSid;
     @ApiModelProperty("分公司sid")

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

@@ -25,9 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
 
-
-import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
-import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDto;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
 import com.yxt.common.core.dto.Dto;
 
@@ -35,21 +32,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(案件执行立案申请) <br/>
- * File: LoanCaseExecuteApplyDto.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDto <br/>
- * Description: 案件执行立案申请 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-02-07 10:00:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "案件执行立案申请 数据传输对象", description = "案件执行立案申请 数据传输对象")
 public class LoanCaseExecuteApplyDto implements Dto {
@@ -118,6 +103,14 @@ public class LoanCaseExecuteApplyDto implements Dto {
     private String executeDeadline; // 执行时限
 	@ApiModelProperty("执行立案金额")
     private String executeRegisMoney; // 执行立案金额
+    @ApiModelProperty("当前欠款金额")
+    private BigDecimal amountInArear;
+    @ApiModelProperty("其中执行欠款金额")
+    private BigDecimal executeAmountInArear;
+    @ApiModelProperty("其中执行费用金额")
+    private BigDecimal executeExpenseAmount;
+    @ApiModelProperty("预计申请还账金额")
+    private BigDecimal badDebtAmount;
     @ApiModelProperty("案件进程sid")
     private String busSid;
 	@ApiModelProperty("分公司sid")

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
@@ -33,21 +32,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Project: anrui-riskcenter(案件执行立案申请) <br/>
- * File: LoanCaseExecuteApplyVo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo <br/>
- * Description: 案件执行立案申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-02-07 10:00:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "案件执行立案申请 视图数据对象", description = "案件执行立案申请 视图数据对象")
 public class LoanCaseExecuteApplyVo implements Vo {
@@ -79,6 +66,10 @@ public class LoanCaseExecuteApplyVo implements Vo {
     private String executeDeadline;
     @ApiModelProperty("执行立案金额")
     private String executeRegisMoney;
+    @ApiModelProperty("当前欠款金额")
+    private BigDecimal amountInArear;
+    @ApiModelProperty("预计申请还账金额")
+    private BigDecimal badDebtAmount;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("流程实例的sid")

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

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

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

@@ -41,7 +41,6 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
@@ -61,14 +60,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply;
-import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
-import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo;
-import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto;
-import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.*;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*;
-import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVeh;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
 import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
@@ -76,7 +69,6 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
-import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
 import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@@ -95,28 +87,13 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-riskcenter(案件执行立案申请) <br/>
- * File: LoanCaseExecuteApplyService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyService <br/>
- * Description: 案件执行立案申请 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-02-07 10:00:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExecuteApplyMapper, LoanCaseExecuteApply> {
 
@@ -222,20 +199,20 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
                 );
-		if (StringUtils.isNotBlank(query.getLoanContract())){
+        if (StringUtils.isNotBlank(query.getLoanContract())) {
-			qw.like("loanContract",query.getLoanContract());
+            qw.like("loanContract", query.getLoanContract());
         }
-		if (StringUtils.isNotBlank(query.getCustomName())){
+        if (StringUtils.isNotBlank(query.getCustomName())) {
-			qw.like("customName",query.getCustomName());
+            qw.like("customName", query.getCustomName());
         }
-		if (StringUtils.isNotBlank(query.getLenderName())){
+        if (StringUtils.isNotBlank(query.getLenderName())) {
-			qw.like("lenderName",query.getLenderName());
+            qw.like("lenderName", query.getLenderName());
         }
-		if (StringUtils.isNotBlank(query.getExecuteDeadline())){
+        if (StringUtils.isNotBlank(query.getExecuteDeadline())) {
-			qw.like("executeDeadline",query.getExecuteDeadline());
+            qw.like("executeDeadline", query.getExecuteDeadline());
         }
-		if (StringUtils.isNotBlank(query.getExecuteRegisMoney())){
+        if (StringUtils.isNotBlank(query.getExecuteRegisMoney())) {
-			qw.like("executeRegisMoney",query.getExecuteRegisMoney());
+            qw.like("executeRegisMoney", query.getExecuteRegisMoney());
         }
         qw.apply(StringUtils.isNotBlank(query.getExecuteRegisStartDate()), "date_format (executeRegisDate,'%Y-%m-%d') >= date_format('" + query.getExecuteRegisStartDate() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getExecuteRegisEndDate()), "date_format (executeRegisDate,'%Y-%m-%d') <= date_format('" + query.getExecuteRegisEndDate() + "','%Y-%m-%d')"
@@ -255,7 +232,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         return p;
     }
 
-	public String saveOrUpdateDto(LoanCaseExecuteApplyDto dto){
+    public String saveOrUpdateDto(LoanCaseExecuteApplyDto dto) {
         String dtoSid = dto.getSid();
         List<LoanCaseExecuteFile> pjclFiles = dto.getPjclFiles();
         List<LoanCaseExecuteFile> zxclFiles = dto.getZxclFiles();
@@ -344,7 +321,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         return dtoSid;
     }
 
-	public String insertByDto(LoanCaseExecuteApplyDto dto){
+    public String insertByDto(LoanCaseExecuteApplyDto dto) {
         LoanCaseExecuteApply entity = new LoanCaseExecuteApply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
@@ -352,7 +329,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         return entity.getSid();
     }
 
-	public void updateByDto(LoanCaseExecuteApplyDto dto){
+    public void updateByDto(LoanCaseExecuteApplyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -362,7 +339,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         baseMapper.updateById(entity);
     }
 
-	public LoanCaseExecuteApplyDetailsVo fetchDetailsVoBySid(String sid){
+    public LoanCaseExecuteApplyDetailsVo fetchDetailsVoBySid(String sid) {
         LoanCaseExecuteApply entity = fetchBySid(sid);
         LoanCaseExecuteApplyDetailsVo vo = new LoanCaseExecuteApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
@@ -535,23 +512,14 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
                     ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
                             0L, TimeUnit.MILLISECONDS,
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
-                    LoanCaseExecuteApply finalLoanCaseExecuteApply = loanCaseExecuteApply;
                     Future future1 = pool.submit(() -> {
                         //推送财务凭证
                         //TOdO:
                         pushRiskToFin(bv.getBusinessSid());
-                        //修改风控状态为执行
-                        //--更新销售订单车辆表的风控状态为执行
-                        List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseExecuteApply.getBusSid());
-                        BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
-                        busVinStateSetQuery.setState(12);
-                        busVinStateSetQuery.setBusVinSidList(busVinSidList);
-                        ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
                     });
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-
             } else {
                 //极光推送
                 loanCaseExecuteApply = fetchBySid(businessSid);
@@ -574,9 +542,9 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         }
     }
 
-	public void pushRiskToFin(String sid){
+    public void pushRiskToFin(String sid) {
         LoanCaseExecuteApply loanCaseExecuteApply = fetchBySid(sid);
-		if(loanCaseExecuteApply != null){
+        if (loanCaseExecuteApply != null) {
             Voucher voucher = new Voucher();
             SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getUseOrgSid()).getData();
             if (null != organizationVo) {
@@ -584,7 +552,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
                 voucher.setVoucherNo(organizationVo.getOrgCode());
             }
             List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
-			List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos2 = new ArrayList<>();
             SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData();
             List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
             for (int i = 0; i < busVinSidList.size(); i++) {
@@ -639,89 +606,46 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
                 BigDecimal qzzxqk = BigDecimal.ZERO;
                 String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
                 String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
-				all = all.add(StringUtils.isNotBlank(allMoney)?new BigDecimal(allMoney):BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney)?new BigDecimal(wdqMoney):BigDecimal.ZERO);
+                all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO);
-
-				if("11".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案---二次销售后的诉讼后的执行
-					//-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
-					if (all.compareTo(BigDecimal.ZERO) > 0) {
                 //贷方
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
-						voucherResultDetailDtoDf.setSummary(customerNumber+"转执行");
-						voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
-						//核算部门
-						voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
-						//核算客户
-						voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
-						voucherResultDetailDtoDf.setCredit(all.toString());
-						voucherResultDetailDtos.add(voucherResultDetailDtoDf);
-					}
-					//---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
-					if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
                 //借方
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
-						voucherResultDetailDtoJf.setSummary(customerNumber+"转执行");
-						voucherResultDetailDtoJf.setSubjectNo("1911.05");
-						//核算部门
-						voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
-						//核算客户
-						voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
-						voucherResultDetailDtoJf.setDebit(ysqhz.toString());
-						voucherResultDetailDtos.add(voucherResultDetailDtoJf);
-					}
-					//--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
-					if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
-						voucherResultDetailDtoJf2.setSummary(customerNumber+"转执行");
+                //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
-						voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
-						//核算部门
-						voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
-						//核算客户
-						voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
-						voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
-						voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
-					}
-				}
-                if("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "10".equals(busSalesOrderVehicle.getRiskState().toString())){
-                    //未交回立案-交回立案后的执行
-                    //-------------------------------------------应收贷款车欠款_待处理欠款_诉讼车辆
                 if (all.compareTo(BigDecimal.ZERO) > 0) {
-                        //贷方
+                    voucherResultDetailDtoDf.setSummary(customerNumber + "转执行");
-                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                    voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
-                        voucherResultDetailDtoDf.setSummary(customerNumber+"转执行");
-                        voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
                     //核算部门
                     voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
                     //核算客户
                     voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
                     voucherResultDetailDtoDf.setCredit(all.toString());
-                        voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
+                    voucherResultDetailDtos.add(voucherResultDetailDtoDf);
                 }
+
                 //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
                 if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
-                        //借方
+                    voucherResultDetailDtoJf.setSummary(customerNumber + "转执行");
-                        Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
-                        voucherResultDetailDtoJf.setSummary(customerNumber+"转执行");
                     voucherResultDetailDtoJf.setSubjectNo("1911.05");
                     //核算部门
                     voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
                     //核算客户
                     voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
                     voucherResultDetailDtoJf.setDebit(ysqhz.toString());
-                        voucherResultDetailDtos2.add(voucherResultDetailDtoJf);
+                    voucherResultDetailDtos.add(voucherResultDetailDtoJf);
                 }
+
                 //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
                 if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
-                        Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
+                    voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行");
-                        voucherResultDetailDtoJf2.setSummary(customerNumber+"转执行");
                     voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
                     //核算部门
                     voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
                     //核算客户
                     voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
                     voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
-                        voucherResultDetailDtos2.add(voucherResultDetailDtoJf2);
+                    voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
-                    }
-
                 }
             }
 
@@ -729,11 +653,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
                 voucher.setResultDetails(voucherResultDetailDtos);
                 finKingDeeFeign.saveVoucher(voucher);
             }
-
-            if (!voucherResultDetailDtos2.isEmpty()) {
-                voucher.setResultDetails(voucherResultDetailDtos2);
-                finKingDeeFeign.saveVoucher(voucher);
-            }
         }
 
     }
@@ -916,7 +835,9 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
         loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
         loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
+        if (loanCaseProgress.getSueMoney() != null){
             loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
+        }
         loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
         LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
         loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
@@ -924,13 +845,13 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         LoanCaseProgressTrial loanCaseProgressTrialZs = loanCaseProgressTrialService.selByJdAndSid(sid, "再审");
         LoanCaseProgressTrial loanCaseProgressTrialEs = loanCaseProgressTrialService.selByJdAndSid(sid, "二审");
         LoanCaseProgressTrial loanCaseProgressTrialYs = loanCaseProgressTrialService.selByJdAndSid(sid, "一审");
-		if (loanCaseProgressTrialZs != null && loanCaseProgressTrialZs.getVerdictAmount() != null){
+        if (loanCaseProgressTrialZs != null && loanCaseProgressTrialZs.getVerdictAmount() != null) {
             loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
-		}else if (loanCaseProgressTrialEs != null && loanCaseProgressTrialEs.getVerdictAmount() != null){
+        } else if (loanCaseProgressTrialEs != null && loanCaseProgressTrialEs.getVerdictAmount() != null) {
             loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
-		}else if (loanCaseProgressTrialYs != null && loanCaseProgressTrialYs.getVerdictAmount() != null){
+        } else if (loanCaseProgressTrialYs != null && loanCaseProgressTrialYs.getVerdictAmount() != null) {
             loanCaseExecuteApplyDetailsVo.setJudgMoney(loanCaseProgressTrial.getVerdictAmount().toString());
-		}else {
+        } else {
             return rb.setMsg("没有判决金额");
         }
         loanCaseExecuteApplyDetailsVo.setJudgRemarks(loanCaseProgressTrial.getVerdictRemarks());
@@ -942,7 +863,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         loanCaseExecuteApplyDetailsVo.setBusSid(sid);
         List<LoanCaseExecuteFile> pjclFiles = new ArrayList<>();
         String verdictFiles = loanCaseProgressTrial.getVerdictFiles();
-		if (StringUtils.isNotBlank(verdictFiles)){
+        if (StringUtils.isNotBlank(verdictFiles)) {
             String[] files = verdictFiles.split(",");
             for (String file : files) {
                 LoanCaseExecuteFile loanCaseExecuteFile = new LoanCaseExecuteFile();
@@ -955,6 +876,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
         loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles);
         List<LoanCaseExecuteVehDetailsVo> loanCaseExecuteVehDetailsVos = new ArrayList<>();
         List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
+        BigDecimal amountInArear = new BigDecimal("0");
         for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
             LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo();
             loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo());
@@ -963,8 +885,11 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
             loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus());
             loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks());
             loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo);
+            AlrepaidAndArrVo alrepaidAndArr2 = loanRestoreReportApplyService.getAlrepaidAndArr2(loanCaseProgressVeh.getBusVinSid());
+            amountInArear = amountInArear.add(new BigDecimal(alrepaidAndArr2.getCurrentBeMoney()));
         }
         loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos);
+        loanCaseExecuteApplyDetailsVo.setAmountInArear(amountInArear);
         return rb.success().setData(loanCaseExecuteApplyDetailsVo);
     }
 }

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

@@ -173,9 +173,9 @@ public class AppInventoryAllocatebillService {
             if ("1".equals(type)) {
                 getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
             } else if ("2".equals(type)) {
-                getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
+                getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit2(getNodeQuery);
             } else if ("3".equals(type)) {
-                getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
+                getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit3(getNodeQuery);
             }
             if (getNextNodesForSubmit.getSuccess()) {
                 getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));