yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

master
ligaode 2 weeks ago
parent
dfea516ac0
commit
c0207c87ac
17 changed files with 274 additions and 391 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  2. 34
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
  3. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  4. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java
  5. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java
  6. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  7. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  8. 21
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java
  9. 37
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java
  10. 21
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java
  11. 44
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java
  12. 44
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
  13. 86
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  14. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
  15. 32
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java
  16. 198
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java
  17. 62
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

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

@ -33,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal; 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 = "收款确认表") @ApiModel(value = "收款确认表", description = "收款确认表")
@Data @Data
@TableName("fin_collection_confirmation") @TableName("fin_collection_confirmation")

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

@ -25,52 +25,38 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 = "应收未收款项明细表 数据传输对象") @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象")
@Data @Data
public class FinUncollectedReceivablesDetailedDto implements Dto { public class FinUncollectedReceivablesDetailedDto implements Dto {
@ApiModelProperty("应收未收款项sid") @ApiModelProperty("应收未收款项sid")
private String sid; // 应收未收款项sid private String sid; // 应收未收款项sid
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")
private String createByName; // 创建人接口 private String createByName; // 创建人接口
@ApiModelProperty("创建人sid") @ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid private String createBySid; // 创建人sid
@ApiModelProperty("合同sid") @ApiModelProperty("合同sid")
private String contractSid; // 合同sid private String contractSid; // 合同sid
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; // 合同编号 private String contractNo; // 合同编号
@ApiModelProperty("客户sid") @ApiModelProperty("客户sid")
private String customerSid; // 客户sid private String customerSid; // 客户sid
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private String customerName; // 客户名称 private String customerName; // 客户名称
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String VIN; // 车架号 private String VIN; // 车架号
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("联系电话") @ApiModelProperty("联系电话")
private String customerPhone; // 联系电话 private String customerPhone; // 联系电话
@ApiModelProperty("应收项目名称") @ApiModelProperty("应收项目名称")
private String receivablesName; // 应收项目名称 private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额") @ApiModelProperty("当前应收金额")
private String currentReceivableMoney; // 当前应收金额 private String currentReceivableMoney; // 当前应收金额
@ApiModelProperty("应收金额（不变）") @ApiModelProperty("应收金额（不变）")
private String reveivableMoney; private String reveivableMoney;

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

@ -34,23 +34,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; 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 = "应收未收款项明细表") @Api(tags = "应收未收款项明细表")
@FeignClient( @FeignClient(
contextId = "anrui-fin-FinUncollectedReceivablesDetailed", contextId = "anrui-fin-FinUncollectedReceivablesDetailed",

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

@ -33,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal; 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 = "金融认款应收未收款项明细表") @ApiModel(value = "金融认款应收未收款项明细表", description = "金融认款应收未收款项明细表")
@Data @Data
@TableName("fin_uncollected_receivables_detailed_jr") @TableName("fin_uncollected_receivables_detailed_jr")

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

@ -38,19 +38,6 @@ import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; 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 = "金融认款应收未收款项明细表") @Api(tags = "金融认款应收未收款项明细表")
@FeignClient( @FeignClient(
contextId = "anrui-fin-FinUncollectedReceivablesDetailedJR", contextId = "anrui-fin-FinUncollectedReceivablesDetailedJR",

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

@ -150,19 +150,6 @@ import java.util.concurrent.*;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; 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 @Service
public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> { public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> {
public static final Logger log = LoggerFactory.getLogger(FinCollectionConfirmationService.class); public static final Logger log = LoggerFactory.getLogger(FinCollectionConfirmationService.class);
@ -205,8 +192,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
@Autowired @Autowired
private OtherReceivableBillCreditResultService creditResultService; private OtherReceivableBillCreditResultService creditResultService;
@Autowired @Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign; private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
@Autowired @Autowired
private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService; private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;

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

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; 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.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
@ -37,28 +36,14 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.List; 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 = "应收未收款项明细表") @Api(tags = "应收未收款项明细表")
@RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest") @RestController
@RequestMapping("/finuncollectedreceivablesdetailed") @RequestMapping("/finuncollectedreceivablesdetailed")
public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign { public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign {

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

@ -25,8 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery; 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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; 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 = "逾期催收车辆") @Api(tags = "逾期催收车辆")
@FeignClient( @FeignClient(
contextId = "anrui-riskcenter-LoanBeCollectionVeh", contextId = "anrui-riskcenter-LoanBeCollectionVeh",
@ -67,12 +50,12 @@ public interface LoanBeCollectionVehFeign {
@PostMapping("/save") @PostMapping("/save")
@ResponseBody @ResponseBody
public ResultBean save(@RequestBody LoanBeCollectionVehDto dto); public ResultBean save(@RequestBody LoanBeCollectionVehDto dto);
@ApiOperation("根据sid删除记录") @ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
@ResponseBody @ResponseBody
public ResultBean delBySids(@RequestBody String[] sids); public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody @ResponseBody

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

@ -31,48 +31,35 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "车辆远程解控申请", description = "车辆远程解控申请") @ApiModel(value = "车辆远程解控申请", description = "车辆远程解控申请")
@TableName("loan_veh_clearance_apply") @TableName("loan_veh_clearance_apply")
public class LoanVehClearanceApply extends BaseEntity { public class LoanVehClearanceApply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createByName; // 创建人 private String createByName; // 创建人
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
private String billNo; // 申请编号 private String billNo; // 申请编号
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName; // 申请部门名称
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("组织全路径") @ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径 private String orgPath; // 组织全路径
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstSid; // 流程实例的sid private String procInstSid; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
} }

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

@ -25,12 +25,9 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loanvehclearanceapply; 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.loanvehclearanceapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery; 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.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; 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 = "车辆远程解控申请") @Api(tags = "车辆远程解控申请")
@FeignClient( @FeignClient(
contextId = "anrui-riskcenter-LoanVehClearanceApply", contextId = "anrui-riskcenter-LoanVehClearanceApply",
@ -78,7 +61,7 @@ public interface LoanVehClearanceApplyFeign {
@PostMapping("/save") @PostMapping("/save")
@ResponseBody @ResponseBody
public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto); public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto);
@ApiOperation("根据sid删除记录") @ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
@ResponseBody @ResponseBody
@ -88,7 +71,7 @@ public interface LoanVehClearanceApplyFeign {
@PostMapping("/init") @PostMapping("/init")
@ResponseBody @ResponseBody
public ResultBean<LoanVehClearanceApplyDetailsVo> init(@RequestBody LoanVehClearanceInitQuery loanVehClearanceInitQuery); public ResultBean<LoanVehClearanceApplyDetailsVo> init(@RequestBody LoanVehClearanceInitQuery loanVehClearanceInitQuery);
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody @ResponseBody

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

@ -25,11 +25,8 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loanvehclearanceveh; package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -37,55 +34,42 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List; 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 @Data
@ApiModel(value = "车辆远程解控车辆 视图数据详情", description = "车辆远程解控车辆 视图数据详情") @ApiModel(value = "车辆远程解控车辆 视图数据详情", description = "车辆远程解控车辆 视图数据详情")
public class LoanVehClearanceVehDetailsVo implements Vo { public class LoanVehClearanceVehDetailsVo implements Vo {
private String sid; // sid private String sid; // sid
@ApiModelProperty("贷款合同编号") @ApiModelProperty("贷款合同编号")
private String loanContractNo; // 贷款合同编号 private String loanContractNo; // 贷款合同编号
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("车牌号") @ApiModelProperty("车牌号")
private String carNum; // 车牌号 private String carNum; // 车牌号
@ApiModelProperty("资方") @ApiModelProperty("资方")
private String bankName; // 资方 private String bankName; // 资方
@ApiModelProperty("资方合同号") @ApiModelProperty("资方合同号")
private String bankContractNo; // 资方合同号 private String bankContractNo; // 资方合同号
@ApiModelProperty("客户姓名") @ApiModelProperty("客户姓名")
private String customerName; // 客户姓名 private String customerName; // 客户姓名
@ApiModelProperty("贷款人姓名") @ApiModelProperty("贷款人姓名")
private String borrowerName; // 贷款人姓名 private String borrowerName; // 贷款人姓名
@ApiModelProperty("首次逾期日期") @ApiModelProperty("首次逾期日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date firstBeDate; private Date firstBeDate;
@ApiModelProperty("逾期期数") @ApiModelProperty("逾期期数")
private String beOverduePeriod; // 逾期期数 private String beOverduePeriod; // 逾期期数
@ApiModelProperty("逾期金额") @ApiModelProperty("逾期金额")
private String beOverdueMoney; // 逾期金额 private String beOverdueMoney; // 逾期金额
@ApiModelProperty("逾期金额换算期数") @ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
@ApiModelProperty("远程控制费用") @ApiModelProperty("远程控制费用")
private String lockCarMoney; // 远程控制费用 private String lockCarMoney; // 远程控制费用
@ApiModelProperty("远程控制费实收") @ApiModelProperty("远程控制费实收")
private String lockCarRealityMoney; // 远程控制费实收 private String lockCarRealityMoney; // 远程控制费实收
@ApiModelProperty("销售订单车辆sid") @ApiModelProperty("销售订单车辆sid")
private String saleVehSid; // 销售订单车辆sid private String saleVehSid; // 销售订单车辆sid
@ApiModelProperty("远程控制申请sid") @ApiModelProperty("远程控制申请sid")
private String mainSid; // 远程控制申请sid private String mainSid; // 远程控制申请sid
@ApiModelProperty @ApiModelProperty

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

@ -36,47 +36,31 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo;
import java.util.List; 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 @Mapper
public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVeh> { public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVeh> {
//@Update("update loan_be_collection_veh set name=#{msg} where id=#{id}") IPage<LoanBeCollectionVehVo> selectPageVo(IPage<LoanBeCollectionVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
//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);
@Select("select * from loan_be_collection_veh")
List<LoanBeCollectionVehVo> selectListVo();
@Delete("delete from loan_be_collection_veh where mainSid = #{dtoSid}") List<LoanBeCollectionVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
@Select("select * from loan_be_collection_veh")
List<LoanBeCollectionVehVo> selectListVo();
@Delete("delete from loan_be_collection_veh where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid); void delByMainSid(String dtoSid);
@Select("select *,customerName as custName,customerPhone as custPhone from loan_be_collection_veh where mainSid = #{sid}") @Select("select *,customerName as custName,customerPhone as custPhone from loan_be_collection_veh where mainSid = #{sid}")
List<LoanBeCollectionVehDetailsVo> selByMainSid(String sid); List<LoanBeCollectionVehDetailsVo> selByMainSid(String sid);
@Update("update loan_be_collection_veh set lockCarState = '0' where mainSid = #{businessSid}") @Update("update loan_be_collection_veh set lockCarState = '0' where mainSid = #{businessSid}")
void updateByMainSid(String businessSid); void updateByMainSid(String businessSid);
int selBjBySaleVehSid(String saleVehSid); 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}") @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);
} }

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

@ -33,7 +33,8 @@
MAX(a1.reaRepaymentName) AS repaymentName, MAX(a1.reaRepaymentName) AS repaymentName,
MAX(a1.createTime) AS createTime, MAX(a1.createTime) AS createTime,
a1.orgSidPath, a1.orgSidPath,
MAX(a1.lockCarState) AS lockCarState -- 保证聚合正确性 MAX(a1.lockCarState) AS lockCarState, -- 保证聚合正确性
a1.nowOverdue
FROM ( FROM (
SELECT SELECT
lrpd.sid, lrpd.sid,
@ -62,7 +63,88 @@
WHEN 1 THEN '控制成功' WHEN 1 THEN '控制成功'
WHEN 2 THEN '控制失败' WHEN 2 THEN '控制失败'
WHEN 3 THEN '已解控' WHEN 3 THEN '已解控'
END AS lockCarState END AS lockCarState,
CASE
WHEN lrpd.dueDate > lrpd.updateDate or lrpd.updateDate IS NULL THEN '1'
WHEN lrpd.dueDate &lt;= lrpd.updateDate AND (IFNULL(
(
lrpd.dueMoney - IFNULL((
SELECT
SUM(
IFNULL( lrh.actualMoney, 0 ))
FROM
loan_repayment_history AS lrh
WHERE
lrh.planDetailSid = lrpd.sid
AND lrh.updateState = '1'
),
0
)),
0
) + IFNULL((
SELECT
( fjj.reveivableMoney - fjj.m )
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
WHERE
fjj.busSid = lrpd.sid
),0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
WHEN lrpd.dueDate &lt;= lrpd.updateDate AND (IFNULL(
(
lrpd.dueMoney - IFNULL((
SELECT
SUM(
IFNULL( lrh.actualMoney, 0 ))
FROM
loan_repayment_history AS lrh
WHERE
lrh.planDetailSid = lrpd.sid
AND lrh.updateState = '1'
),
0
)),
0
) + IFNULL((
SELECT
( fjj.reveivableMoney - fjj.m )
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
WHERE
fjj.busSid = lrpd.sid
),0) + IFNULL(lrpd.paymentInterest,0)) &lt;= 0 THEN '1'
END AS nowOverdue
FROM loan_repayment_plan_details lrpd FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid ON lrh.planDetailSid = lrpd.sid

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

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

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

@ -41,33 +41,17 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyV
import java.util.List; import java.util.List;
import java.util.Map; 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 @Mapper
public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearanceApply> { public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearanceApply> {
//@Update("update loan_veh_clearance_apply set name=#{msg} where id=#{id}") IPage<LoanVehClearanceApplyVo> selectPageVo(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
//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);
@Select("select * from loan_veh_clearance_apply")
List<LoanVehClearanceApplyVo> selectListVo();
String selectNum(String billNo); List<LoanVehClearanceApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
@Select("select * from loan_veh_clearance_apply")
List<LoanVehClearanceApplyVo> selectListVo();
String selectNum(String billNo);
IPage<LoanVehClearanceLockCarVo> lockCarList(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceApply> qw); IPage<LoanVehClearanceLockCarVo> lockCarList(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceApply> qw);
@ -75,5 +59,5 @@ public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearance
int selectBySid(String join); int selectBySid(String join);
LoanVehClearanceVehInit initVehListBySaleVehSidYCJK(String saleVehSid); LoanVehClearanceVehInit initVehListBySaleVehSidYCJK(String saleVehSid);
} }

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

@ -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.loanvehclearanceapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo; 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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -43,116 +42,103 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; 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 = "车辆远程解控申请") @Api(tags = "车辆远程解控申请")
@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest") @RestController
@RequestMapping("v1/loanvehclearanceapply") @RequestMapping("v1/loanvehclearanceapply")
public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign { public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
@Autowired @Autowired
private LoanVehClearanceApplyService loanVehClearanceApplyService; private LoanVehClearanceApplyService loanVehClearanceApplyService;
@Override @Override
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq){ public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<LoanVehClearanceApplyVo> pv = loanVehClearanceApplyService.listPageVo(pq); PagerVo<LoanVehClearanceApplyVo> pv = loanVehClearanceApplyService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@Override @Override
public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) { public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<LoanVehClearanceLockCarVo> pv = loanVehClearanceApplyService.lockCarList(pq); PagerVo<LoanVehClearanceLockCarVo> pv = loanVehClearanceApplyService.lockCarList(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@Override @Override
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto){ public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
loanVehClearanceApplyService.saveOrUpdateDto(dto); loanVehClearanceApplyService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@Override @Override
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){ public ResultBean delBySids(@RequestBody String[] sids) {
return loanVehClearanceApplyService.delAllBySids(sids); return loanVehClearanceApplyService.delAllBySids(sids);
} }
@Override @Override
public ResultBean<LoanVehClearanceApplyDetailsVo> init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) { public ResultBean<LoanVehClearanceApplyDetailsVo> init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery); LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery);
return rb.success().setData(loanVehClearanceApplyDetailsVo); return rb.success().setData(loanVehClearanceApplyDetailsVo);
} }
@Override @Override
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid); LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@Override @Override
public ResultBean submit(SubmitLoanVehClearanceApplyDto dto) { public ResultBean submit(SubmitLoanVehClearanceApplyDto dto) {
return loanVehClearanceApplyService.submit(dto); return loanVehClearanceApplyService.submit(dto);
} }
@Override @Override
public ResultBean complete(LoanVehClearanceApplyCompleteDto query) { public ResultBean complete(LoanVehClearanceApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANVEHCLEARANCEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.LOANVEHCLEARANCEAPPLY.getProDefId());
return loanVehClearanceApplyService.complete(bv); return loanVehClearanceApplyService.complete(bv);
} }
@Override @Override
public ResultBean<List<LoanVehClearanceApplyNodeVo>> getPreviousNodesForReject(LoanVehClearanceApplyNodeQuery query) { public ResultBean<List<LoanVehClearanceApplyNodeVo>> getPreviousNodesForReject(LoanVehClearanceApplyNodeQuery query) {
return loanVehClearanceApplyService.getPreviousNodesForReject(query); return loanVehClearanceApplyService.getPreviousNodesForReject(query);
} }
@Override @Override
public ResultBean<List<LoanVehClearanceApplyNodeVo>> getNextNodesForSubmit(LoanVehClearanceApplyNodeQuery query) { public ResultBean<List<LoanVehClearanceApplyNodeVo>> getNextNodesForSubmit(LoanVehClearanceApplyNodeQuery query) {
return loanVehClearanceApplyService.getNextNodesForSubmit(query); return loanVehClearanceApplyService.getNextNodesForSubmit(query);
} }
@Override @Override
public ResultBean reject(LoanVehClearanceApplyTaskQuery query) { public ResultBean reject(LoanVehClearanceApplyTaskQuery query) {
return loanVehClearanceApplyService.reject(query); return loanVehClearanceApplyService.reject(query);
} }
@Override @Override
public ResultBean revokeProcess(LoanVehClearanceApplyTaskQuery query) { public ResultBean revokeProcess(LoanVehClearanceApplyTaskQuery query) {
return loanVehClearanceApplyService.revokeProcess(query); return loanVehClearanceApplyService.revokeProcess(query);
} }
@Override @Override
public ResultBean breakProcess(LoanVehClearanceApplyTaskQuery query) { public ResultBean breakProcess(LoanVehClearanceApplyTaskQuery query) {
return loanVehClearanceApplyService.breakProcess(query); return loanVehClearanceApplyService.breakProcess(query);
} }
@Override @Override
public ResultBean delegate(LoanVehClearanceApplyDelegateQuery query) { public ResultBean delegate(LoanVehClearanceApplyDelegateQuery query) {
return loanVehClearanceApplyService.delegate(query); return loanVehClearanceApplyService.delegate(query);
} }
} }

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

@ -31,13 +31,14 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; 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.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; 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.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; 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.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@ -88,19 +85,6 @@ import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; 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 @Service
public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClearanceApplyMapper, LoanVehClearanceApply> { public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClearanceApplyMapper, LoanVehClearanceApply> {
@ -121,8 +105,6 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
@Autowired @Autowired
private LoanSolutionsService loanSolutionsService; private LoanSolutionsService loanSolutionsService;
@Autowired @Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private LoanHomevisitInvestigateService loanHomevisitInvestigateService; private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
@Autowired @Autowired
SysStaffOrgFeign sysStaffOrgFeign; SysStaffOrgFeign sysStaffOrgFeign;
@ -136,6 +118,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
private FlowFeign flowFeign; private FlowFeign flowFeign;
@Autowired @Autowired
private LoanBeCollectionVehService loanBeCollectionVehService; private LoanBeCollectionVehService loanBeCollectionVehService;
@Autowired
private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) { public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
LoanVehClearanceApplyQuery query = pq.getParams(); LoanVehClearanceApplyQuery query = pq.getParams();
@ -511,9 +495,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("催收措施申请"); messageFlowableQuery.setModuleName("远程解控申请");
messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("催收措施申请"); messageFlowableQuery.setMsgTitle("远程解控申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
return voResultBean; return voResultBean;
} }
@ -597,7 +581,29 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) { 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 { } else {
//极光推送 //极光推送
@ -610,9 +616,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("催收措施申请"); messageFlowableQuery.setModuleName("远程解控申请");
messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("催收措施申请"); messageFlowableQuery.setMsgTitle("远程解控申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
@ -685,7 +691,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("催收措施申请"); messageFlowableQuery.setModuleName("远程解控申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId); ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
@ -694,7 +700,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
} else { } else {
messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
} }
messageFlowableQuery.setMsgTitle("催收措施申请"); messageFlowableQuery.setMsgTitle("远程解控申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
return rb.success(); return rb.success();
} }

Write Preview
Loading…
Cancel
Save