Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -33,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinCollectionConfirmation.java <br/>
- * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation <br/>
- * Description: 收款确认表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "收款确认表", description = "收款确认表")
 @Data
 @TableName("fin_collection_confirmation")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java

@@ -25,25 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
-
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailedDto.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto <br/>
- * Description: 应收未收款项明细表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象")
 @Data
 public class FinUncollectedReceivablesDetailedDto implements Dto {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -34,23 +34,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-fin(应收未收款项明细表) <br/>
- * File: FinUncollectedReceivablesDetailedFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "应收未收款项明细表")
 @FeignClient(
         contextId = "anrui-fin-FinUncollectedReceivablesDetailed",

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java

@@ -33,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailed.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "金融认款应收未收款项明细表", description = "金融认款应收未收款项明细表")
 @Data
 @TableName("fin_uncollected_receivables_detailed_jr")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -38,19 +38,6 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-fin(应收未收款项明细表) <br/>
- * File: FinUncollectedReceivablesDetailedFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "金融认款应收未收款项明细表")
 @FeignClient(
         contextId = "anrui-fin-FinUncollectedReceivablesDetailedJR",

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -150,19 +150,6 @@ import java.util.concurrent.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinCollectionConfirmationService.java <br/>
- * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService <br/>
- * Description: 收款确认表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> {
     public static final Logger log = LoggerFactory.getLogger(FinCollectionConfirmationService.class);
@@ -205,8 +192,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     @Autowired
     private OtherReceivableBillCreditResultService creditResultService;
     @Autowired
-    private DictCommonFeign dictCommonFeign;
-    @Autowired
     private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
@@ -37,28 +36,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailedFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "应收未收款项明细表")
-@RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest")
+@RestController
 @RequestMapping("/finuncollectedreceivablesdetailed")
 public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign {
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
 
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -35,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-riskcenter(催收措施申请) <br/>
- * File: LoanBeCollectionVehFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign <br/>
- * Description: 逾期催收车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-12 16:06:20 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "逾期催收车辆")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanBeCollectionVeh",

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java

@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApply.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApply <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆远程解控申请", description = "车辆远程解控申请")
 @TableName("loan_veh_clearance_apply")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java

@@ -25,12 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
 
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,23 +36,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: LoanVehClearanceApplyFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyFeign <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆远程解控申请")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanVehClearanceApply",

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java

@@ -25,11 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,19 +34,6 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehVo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo <br/>
- * Description: 车辆远程解控车辆 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆远程解控车辆 视图数据详情", description = "车辆远程解控车辆 视图数据详情")
 public class LoanVehClearanceVehDetailsVo implements Vo {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java

@@ -36,25 +36,9 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(催收措施申请) <br/>
- * File: LoanBeCollectionVehMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehMapper <br/>
- * Description: 逾期催收车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-12 16:06:20 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVeh> {
 
-	//@Update("update loan_be_collection_veh set name=#{msg} where id=#{id}")
-	//IPage<LoanBeCollectionVehVo> voPage(IPage<LoanBeCollectionVeh> page, @Param(Constants.WRAPPER) QueryWrapper<LoanBeCollectionVeh> qw);
-	
     IPage<LoanBeCollectionVehVo> selectPageVo(IPage<LoanBeCollectionVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
 
     List<LoanBeCollectionVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
@@ -73,10 +57,10 @@ public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVe
 
     int selBjBySaleVehSid(String saleVehSid);
 
-	int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid,@Param("mainSid") String mainSid);
+    int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid, @Param("mainSid") String mainSid);
 
-	String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid,@Param("c") String c);
+    String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid, @Param("c") String c);
 
     @Update("update loan_be_collection_veh set lockCarState = #{s} where saleVehSid = #{saleVehSid} and lockCarState = #{x}")
-    void updateLockState(@Param("saleVehSid") String saleVehSid,@Param("s") String s,@Param("x") String x);
+    void updateLockState(@Param("saleVehSid") String saleVehSid, @Param("s") String s, @Param("x") String x);
 }

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

@@ -33,7 +33,8 @@
         MAX(a1.reaRepaymentName) AS repaymentName,
         MAX(a1.createTime) AS createTime,
         a1.orgSidPath,
-        MAX(a1.lockCarState) AS lockCarState  -- 保证聚合正确性
+        MAX(a1.lockCarState) AS lockCarState,  -- 保证聚合正确性
+        a1.nowOverdue
         FROM (
         SELECT
         lrpd.sid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java

@@ -106,6 +106,7 @@ public class LoanBeOverdueVehService {
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("a1.vinNo", query.getVinNo());
         }
+        qw.eq("a1.nowOverdue", "0");
         String collectionStartDate = query.getCollectionStartDate();
         String collectionEndDate = query.getCollectionEndDate();
         qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java

@@ -41,25 +41,9 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyV
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyMapper <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearanceApply> {
 
-	//@Update("update loan_veh_clearance_apply set name=#{msg} where id=#{id}")
-	//IPage<LoanVehClearanceApplyVo> voPage(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceApply> qw);
-	
     IPage<LoanVehClearanceApplyVo> selectPageVo(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
 
     List<LoanVehClearanceApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java

@@ -32,7 +32,6 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -43,21 +42,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆远程解控申请")
-@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest")
+@RestController
 @RequestMapping("v1/loanvehclearanceapply")
 public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 
@@ -67,7 +53,7 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq){
+    public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<LoanVehClearanceApplyVo> pv = loanVehClearanceApplyService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -83,7 +69,7 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto){
+    public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         loanVehClearanceApplyService.saveOrUpdateDto(dto);
         return rb.success();
@@ -92,7 +78,7 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
     @Override
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return loanVehClearanceApplyService.delAllBySids(sids);
     }
 
@@ -106,7 +92,7 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@@ -31,13 +31,14 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -54,10 +55,6 @@ 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.loanbecollectionapply.LoanBeCollectionApply;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.LoanBeCollectionApplyNodeVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.SubmitLoanBeCollectionApplyDto;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -88,19 +85,6 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyService <br/>
- * Description: 车辆远程解控申请 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClearanceApplyMapper, LoanVehClearanceApply> {
 
@@ -121,8 +105,6 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
     @Autowired
     private LoanSolutionsService loanSolutionsService;
     @Autowired
-    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
-    @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
     @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
@@ -136,6 +118,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
     private FlowFeign flowFeign;
     @Autowired
     private LoanBeCollectionVehService loanBeCollectionVehService;
+    @Autowired
+    private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
 
     public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
         LoanVehClearanceApplyQuery query = pq.getParams();
@@ -511,9 +495,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
-            messageFlowableQuery.setModuleName("催收措施申请");
+            messageFlowableQuery.setModuleName("远程解控申请");
             messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-            messageFlowableQuery.setMsgTitle("催收措施申请");
+            messageFlowableQuery.setMsgTitle("远程解控申请");
             messageFeign.pushMessage(messageFlowableQuery);
             return voResultBean;
         }
@@ -597,7 +581,29 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
-                    loanBeCollectionVehService.updateLockState(loanVehClearanceVehDetailsVo.getSaleVehSid(), "4", "3");
+                    FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR();
+                    finUncollectedReceivablesDetailedJR.setCreateByName(loanVehClearanceApply.getCreateByName());
+                    finUncollectedReceivablesDetailedJR.setCreateBySid(loanVehClearanceApply.getCreateBySid());
+                    //查询销售订单信息
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(loanVehClearanceVehDetailsVo.getSaleVehSid()).getData();
+                    BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                    finUncollectedReceivablesDetailedJR.setApplySid(loanVehClearanceApply.getSid());
+                    finUncollectedReceivablesDetailedJR.setBusSid(loanVehClearanceVehDetailsVo.getSid());
+                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("015");
+                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("远程控制费");
+                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanVehClearanceVehDetailsVo.getLockCarRealityMoney()));
+                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanVehClearanceVehDetailsVo.getLockCarRealityMoney()));
+                    finUncollectedReceivablesDetailedJR.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+                    finUncollectedReceivablesDetailedJR.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
+                    finUncollectedReceivablesDetailedJR.setStaffUserSid(busSalesOrder.getCreateBySid());
+                    finUncollectedReceivablesDetailedJR.setStaffName(busSalesOrder.getStaffName());
+                    finUncollectedReceivablesDetailedJR.setStaffDeptSid(busSalesOrder.getOrgSid());
+                    finUncollectedReceivablesDetailedJR.setStaffDeptName(busSalesOrder.getOrgName());
+                    finUncollectedReceivablesDetailedJR.setUseOrgSid(loanVehClearanceApply.getUseOrgSid());
+                    finUncollectedReceivablesDetailedJR.setUseOrgName(loanVehClearanceApply.getUseOrgName());
+                    finUncollectedReceivablesDetailedJR.setOrgSidPath(loanVehClearanceApply.getOrgPath());
+                    finUncollectedReceivablesDetailedJR.setKxState("01");
+                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
                 }
             } else {
                 //极光推送
@@ -610,9 +616,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("催收措施申请");
+                messageFlowableQuery.setModuleName("远程解控申请");
                 messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                messageFlowableQuery.setMsgTitle("催收措施申请");
+                messageFlowableQuery.setMsgTitle("远程解控申请");
                 messageFeign.pushMessage(messageFlowableQuery);
             }
             return rb.success().setData(resultBean.getData());
@@ -685,7 +691,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("催收措施申请");
+                messageFlowableQuery.setModuleName("远程解控申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
@@ -694,7 +700,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 } else {
                     messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
-                messageFlowableQuery.setMsgTitle("催收措施申请");
+                messageFlowableQuery.setMsgTitle("远程解控申请");
                 messageFeign.pushMessage(messageFlowableQuery);
                 return rb.success();
             }