Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
commit
eb668d102a
  1. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java
  2. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/relation/amountpledged.vue
  3. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/relation/amountpledged.vue
  4. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditpeo/FinPreloanCreditPeoMapper.xml
  5. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  6. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanFileTypeEnum.java
  7. 19
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApply.java
  8. 23
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDetailsVo.java
  9. 22
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDto.java
  10. 41
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java
  11. 43
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java
  12. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyQuery.java
  13. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java
  14. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanSubmitCapitalRiskDto.java
  15. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanSubmitCompanyRiskDto.java
  16. 17
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeo.java
  17. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDetailsVo.java
  18. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDto.java
  19. 33
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoFeign.java
  20. 43
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoFeignFallback.java
  21. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoQuery.java
  22. 18
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoVo.java
  23. 50
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
  24. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml
  25. 49
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java
  26. 146
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
  27. 44
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoMapper.java
  28. 13
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoMapper.xml
  29. 46
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoRest.java
  30. 61
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoService.java
  31. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
  32. 98
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  33. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
  34. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@ -280,6 +280,7 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
//消息推送
AppScmMessageFlowableQuery messageFlowableQuery = new AppScmMessageFlowableQuery();
List<String> recipientSidList = new ArrayList<>();
recipientSidList.add(busTransferRecordss.getReceiveSid());
messageFlowableQuery.setRecipientSidList(recipientSidList);
messageFlowableQuery.setMsgTitle("业务");
messageFlowableQuery.setMsgContent(busTransferRecords.getReceiveName() + "的发票交接已准备好,请前往交车准备进行确认");

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/relation/amountpledged.vue

@ -186,7 +186,7 @@ export default {
customerName: element.customerName,
customerPhone: element.customerPhone,
receivablesName: element.receivablesName,
currentReceivableMoney: element.currentReceivableMoney,
currentReceivableMoney: '0',
subscribedOf: element.subscribedOf,
sid: element.sid,
VIN: element.VIN,

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/relation/amountpledged.vue

@ -186,7 +186,7 @@ export default {
customerName: element.customerName,
customerPhone: element.customerPhone,
receivablesName: element.receivablesName,
currentReceivableMoney: element.currentReceivableMoney,
currentReceivableMoney: '0',
subscribedOf: element.subscribedOf,
sid: element.sid,
VIN: element.VIN,

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditpeo/FinPreloanCreditPeoMapper.xml

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo">
SELECT * FROM fin_preloan_credit_peo <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo">
SELECT * FROM fin_preloan_credit_peo <where> ${ew.sqlSegment} </where>
</select>
</mapper>

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@ -377,6 +377,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
if(StringUtils.isNotBlank(params.getMobile())){
qw.like("fd.customerPhone",params.getMobile());
}
//应收未收中的当前应收小于等于0
qw.le("furd.currentReceivableMoney",0);
List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw, params.getName());
if (collList.isEmpty()) {
collList = baseMapper.selectPageList(qw, "");

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanFileTypeEnum.java

@ -1,11 +1,10 @@
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
@Data
public class FinFileTypeEnum {
public class LoanFileTypeEnum {
@Getter

19
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApply.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@ -31,23 +31,10 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApply.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApply <br/>
* Description: 贷前信用审核申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核申请表", description = "贷前信用审核申请表")
@TableName("fin_preloan_credit_apply")
public class FinPreloanCreditApply extends BaseEntity {
@TableName("loan_preloan_credit_apply")
public class LoanPreloanCreditApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口")

23
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDetailsVo.java

@ -23,13 +23,11 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDetailsVo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -37,22 +35,9 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyVo <br/>
* Description: 贷前信用审核申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核申请表 视图数据详情", description = "贷前信用审核申请表 视图数据详情")
public class FinPreloanCreditApplyDetailsVo implements Vo {
public class LoanPreloanCreditApplyDetailsVo implements Vo {
private String sid; // sid
@ -121,7 +106,7 @@ public class FinPreloanCreditApplyDetailsVo implements Vo {
@ApiModelProperty("身份证正反面附件")
private List<String> idCardImages = new ArrayList<>();
@ApiModelProperty("贷前信用审核人员列表")
private List<FinPreloanCreditPeoDetailsVo> finPreloanCreditPeos;
private List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeos;
@ApiModelProperty("公司风控要求的文件")
private List<String> comFkFiles = new ArrayList<>();
}

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDto.java

@ -23,12 +23,11 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -36,22 +35,9 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyDto <br/>
* Description: 贷前信用审核申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核申请表 数据传输对象", description = "贷前信用审核申请表 数据传输对象")
public class FinPreloanCreditApplyDto implements Dto {
public class LoanPreloanCreditApplyDto implements Dto {
private String sid; // sid
@ -102,7 +88,7 @@ public class FinPreloanCreditApplyDto implements Dto {
@ApiModelProperty("身份证正反面附件")
private List<String> idCardImages = new ArrayList<>();
@ApiModelProperty("贷前信用审核人员列表")
private List<FinPreloanCreditPeoDto> finPreloanCreditPeos;
private List<LoanPreloanCreditPeoDto> loanPreloanCreditPeos;
@ApiModelProperty("公司风控要求的文件")
private List<String> comFkFiles = new ArrayList<>();
}

41
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java

@ -23,58 +23,43 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyFeign <br/>
* Description: 贷前信用审核申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "贷前信用审核申请表")
@FeignClient(
contextId = "anrui-fin-FinPreloanCreditApply",
name = "anrui-fin",
path = "v1/finpreloancreditapply",
fallback = FinPreloanCreditApplyFeignFallback.class)
public interface FinPreloanCreditApplyFeign {
contextId = "anrui-riskcenter-LoanPreloanCreditApply",
name = "anrui-riskcenter",
path = "v1/loanpreloancreditapply",
fallback = LoanPreloanCreditApplyFeignFallback.class)
public interface LoanPreloanCreditApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<FinPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<FinPreloanCreditApplyQuery> pq);
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody FinPreloanCreditApplyDto dto);
public ResultBean save(@RequestBody LoanPreloanCreditApplyDto dto);
@ApiOperation("公司风控提交")
@PostMapping("/submitCompanyRisk")
@ResponseBody
public ResultBean submitCompanyRisk(@RequestBody FinSubmitCompanyRiskDto dto);
public ResultBean submitCompanyRisk(@RequestBody LoanSubmitCompanyRiskDto dto);
@ApiOperation("资方风控提交")
@PostMapping("/submitCapitalRisk")
@ResponseBody
public ResultBean submitCapitalRisk(@RequestBody FinSubmitCapitalRiskDto dto);
public ResultBean submitCapitalRisk(@RequestBody LoanSubmitCapitalRiskDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ -84,5 +69,5 @@ public interface FinPreloanCreditApplyFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<FinPreloanCreditApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
public ResultBean<LoanPreloanCreditApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

43
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeoFeignFallback.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java

@ -23,50 +23,45 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoFeignFallback <br/>
* Description: 贷前信用审核人员表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class FinPreloanCreditPeoFeignFallback implements FinPreloanCreditPeoFeign {
public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApplyFeign {
@Override
public ResultBean<PagerVo<FinPreloanCreditPeoVo>> listPage(PagerQuery<FinPreloanCreditPeoQuery> pq){
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> listPage(PagerQuery<LoanPreloanCreditApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finpreloancreditpeo/listPage无法访问");
return rb.setMsg("接口anrui-riskcenter/loanpreloancreditapply/listPage无法访问");
}
@Override
public ResultBean save(LoanPreloanCreditApplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/save无法访问");
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return null;
}
@Override
public ResultBean save(FinPreloanCreditPeoDto dto){
return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditpeo/save无法访问");
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
return null;
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditpeo/delBySids无法访问");
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/delBySids无法访问");
}
@Override
public ResultBean<FinPreloanCreditPeoDetailsVo> fetchDetailsBySid(String sid){
public ResultBean<LoanPreloanCreditApplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finpreloancreditpeo/fetchDetailsBySid无法访问");
return rb.setMsg("接口anrui-riskcenter/loanpreloancreditapply/fetchDetailsBySid无法访问");
}
}

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyQuery.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyQuery.java

@ -23,31 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyQuery.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyQuery <br/>
* Description: 贷前信用审核申请表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核申请表 查询条件", description = "贷前信用审核申请表 查询条件")
public class FinPreloanCreditApplyQuery implements Query {
public class LoanPreloanCreditApplyQuery implements Query {
@ApiModelProperty("分公司名称")
private String useOrgName;

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyVo.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java

@ -23,34 +23,20 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyVo <br/>
* Description: 贷前信用审核申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核申请表 视图数据对象", description = "贷前信用审核申请表 视图数据对象")
public class FinPreloanCreditApplyVo implements Vo {
public class LoanPreloanCreditApplyVo implements Vo {
private String sid;

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanSubmitCapitalRiskDto.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
@ -33,7 +33,7 @@ import java.util.ArrayList;
import java.util.List;
@Data
public class FinSubmitCapitalRiskDto implements Dto {
public class LoanSubmitCapitalRiskDto implements Dto {
private String sid;
@ -46,5 +46,5 @@ public class FinSubmitCapitalRiskDto implements Dto {
@ApiModelProperty("资方审核备注")
private String zfshRemarks;
@ApiModelProperty("查询结果截图")
private List<String> gsQueryResults = new ArrayList<>();
private List<String> zfQueryResults = new ArrayList<>();
}

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanSubmitCompanyRiskDto.java

@ -23,10 +23,9 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -35,22 +34,9 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyDto <br/>
* Description: 贷前信用审核申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核申请表 数据传输对象", description = "贷前信用审核申请表 数据传输对象")
public class FinSubmitCompanyRiskDto implements Dto {
public class LoanSubmitCompanyRiskDto implements Dto {
private String sid;

17
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeo.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeo.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@ -31,23 +31,10 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeo.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeo <br/>
* Description: 贷前信用审核人员表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核人员表", description = "贷前信用审核人员表")
@TableName("fin_preloan_credit_peo")
public class FinPreloanCreditPeo extends BaseEntity {
public class LoanPreloanCreditPeo extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("人员身份key")

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeoDetailsVo.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDetailsVo.java

@ -23,11 +23,10 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -35,22 +34,9 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo <br/>
* Description: 贷前信用审核人员表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核人员表 视图数据详情", description = "贷前信用审核人员表 视图数据详情")
public class FinPreloanCreditPeoDetailsVo implements Vo {
public class LoanPreloanCreditPeoDetailsVo implements Vo {
private String sid; // sid

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeoDto.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoDto.java

@ -23,11 +23,10 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -35,22 +34,9 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoDto.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto <br/>
* Description: 贷前信用审核人员表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核人员表 数据传输对象", description = "贷前信用审核人员表 数据传输对象")
public class FinPreloanCreditPeoDto implements Dto {
public class LoanPreloanCreditPeoDto implements Dto {
private String sid; // sid

33
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeoFeign.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoFeign.java

@ -23,48 +23,33 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoFeign <br/>
* Description: 贷前信用审核人员表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "贷前信用审核人员表")
@FeignClient(
contextId = "anrui-fin-FinPreloanCreditPeo",
name = "anrui-fin",
path = "v1/finpreloancreditpeo",
fallback = FinPreloanCreditPeoFeignFallback.class)
public interface FinPreloanCreditPeoFeign {
path = "v1/loanpreloancreditpeo",
fallback = LoanPreloanCreditPeoFeignFallback.class)
public interface LoanPreloanCreditPeoFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<FinPreloanCreditPeoVo>> listPage(@RequestBody PagerQuery<FinPreloanCreditPeoQuery> pq);
public ResultBean<PagerVo<LoanPreloanCreditPeoVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditPeoQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody FinPreloanCreditPeoDto dto);
public ResultBean save(@RequestBody LoanPreloanCreditPeoDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ -74,5 +59,5 @@ public interface FinPreloanCreditPeoFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<FinPreloanCreditPeoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
public ResultBean<LoanPreloanCreditPeoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

43
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoFeignFallback.java

@ -23,60 +23,35 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditapply;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyFeignFallback <br/>
* Description: 贷前信用审核申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class FinPreloanCreditApplyFeignFallback implements FinPreloanCreditApplyFeign {
public class LoanPreloanCreditPeoFeignFallback implements LoanPreloanCreditPeoFeign {
@Override
public ResultBean<PagerVo<FinPreloanCreditApplyVo>> listPage(PagerQuery<FinPreloanCreditApplyQuery> pq){
public ResultBean<PagerVo<LoanPreloanCreditPeoVo>> listPage(PagerQuery<LoanPreloanCreditPeoQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finpreloancreditapply/listPage无法访问");
}
@Override
public ResultBean save(FinPreloanCreditApplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/save无法访问");
}
@Override
public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
return null;
return rb.setMsg("接口anrui-fin/loanpreloancreditpeo/listPage无法访问");
}
@Override
public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
return null;
public ResultBean save(LoanPreloanCreditPeoDto dto){
return ResultBean.fireFail().setMsg("接口anrui-fin/loanpreloancreditpeo/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/delBySids无法访问");
return ResultBean.fireFail().setMsg("接口anrui-fin/loanpreloancreditpeo/delBySids无法访问");
}
@Override
public ResultBean<FinPreloanCreditApplyDetailsVo> fetchDetailsBySid(String sid){
public ResultBean<LoanPreloanCreditPeoDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finpreloancreditapply/fetchDetailsBySid无法访问");
return rb.setMsg("接口anrui-fin/loanpreloancreditpeo/fetchDetailsBySid无法访问");
}
}

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeoQuery.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoQuery.java

@ -23,31 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoQuery.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoQuery <br/>
* Description: 贷前信用审核人员表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核人员表 查询条件", description = "贷前信用审核人员表 查询条件")
public class FinPreloanCreditPeoQuery implements Query {
public class LoanPreloanCreditPeoQuery implements Query {
@ApiModelProperty("人员身份key")
private String peoTypeKey; // 人员身份key

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditpeo/FinPreloanCreditPeoVo.java → anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditpeo/LoanPreloanCreditPeoVo.java

@ -23,31 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.api.loanpreloancreditpeo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoVo.java <br/>
* Class: com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo <br/>
* Description: 贷前信用审核人员表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "贷前信用审核人员表 视图数据对象", description = "贷前信用审核人员表 视图数据对象")
public class FinPreloanCreditPeoVo implements Vo {
public class LoanPreloanCreditPeoVo implements Vo {
private String sid; // sid

50
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditpeo/FinPreloanCreditPeoMapper.java → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@ -23,52 +23,36 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.biz.loanpreloancreditapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDetailsVo;
import org.apache.ibatis.annotations.Delete;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoMapper.java <br/>
* Class: com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoMapper <br/>
* Description: 贷前信用审核人员表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface FinPreloanCreditPeoMapper extends BaseMapper<FinPreloanCreditPeo> {
public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCreditApply> {
IPage<LoanPreloanCreditApplyVo> selectPageVo(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditApply> qw);
List<LoanPreloanCreditApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditApply> qw);
//@Update("update fin_preloan_credit_peo set name=#{msg} where id=#{id}")
//IPage<FinPreloanCreditPeoVo> voPage(IPage<FinPreloanCreditPeo> page, @Param(Constants.WRAPPER) QueryWrapper<FinPreloanCreditPeo> qw);
IPage<FinPreloanCreditPeoVo> selectPageVo(IPage<FinPreloanCreditPeo> page, @Param(Constants.WRAPPER) Wrapper<FinPreloanCreditPeo> qw);
List<FinPreloanCreditPeoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPreloanCreditPeo> qw);
@Select("select * from fin_preloan_credit_peo")
List<FinPreloanCreditPeoVo> selectListVo();
@Select("select * from loan_preloan_credit_apply")
List<LoanPreloanCreditApplyVo> selectListVo();
@Delete("delete from fin_preloan_credit_peo where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
int selectBySid(String join);
@Select("select * from fin_preloan_credit_peo where mainSid = #{sid}")
List<FinPreloanCreditPeoDetailsVo> fetchByMainSid(String sid);
@Update("update loan_preloan_credit_apply set gsfkjg = #{gsshjg},gsshDate = #{gsshDate},gsshRemarks = #{gsshRemarks} where sid=#{dtoSid}")
void submitCompanyRisk(@Param("dtoSid") String dtoSid, @Param("gsshjg") String gsshjg, @Param("gsshDate") String gsshDate, @Param("gsshRemarks") String gsshRemarks);
@Update("update loan_preloan_credit_apply set capitalBalance = #{capitalBalance},zffkjg = #{zfshjg},zfshDate = #{zfshDate},zfshRemarks = #{zfshRemarks} where sid=#{dtoSid}")
void submitCapitalRisk(@Param("dtoSid") String dtoSid, @Param("zfshjg") String zfshjg, @Param("zfshDate") String zfshDate, @Param("zfshRemarks") String zfshRemarks, @Param("capitalBalance") String capitalBalance);
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyMapper.xml → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.fin.biz.finpreloancreditapply.FinPreloanCreditApplyMapper">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loanpreloancreditapply.LoanPreloanCreditApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyVo">
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo">
SELECT
*,
IF(custTypeValue = '个人',custName,qyName) AS khqyName
FROM
fin_preloan_credit_apply
loan_preloan_credit_apply
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyVo">
SELECT * FROM fin_preloan_credit_apply
<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo">
SELECT * FROM loan_preloan_credit_apply
<where>
${ew.sqlSegment}
</where>
@ -23,8 +23,8 @@
<select id="selectBySid" resultType="int">
select count(*)
from fin_preloan_credit_apply
from loan_preloan_credit_apply
where nodeState != '待提交'
and find_in_set(sid, #{list})
and loand_in_set(sid, #{list})
</select>
</mapper>

49
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java

@ -23,9 +23,9 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpreloancreditapply;
package com.yxt.anrui.riskcenter.biz.loanpreloancreditapply;
import com.yxt.anrui.fin.api.finpreloancreditapply.*;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,68 +34,53 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finpreloancreditapply.FinPreloanCreditApplyRest <br/>
* Description: 贷前信用审核申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "贷前信用审核申请表")
@RestController("com.yxt.anrui.fin.biz.finpreloancreditapply.FinPreloanCreditApplyRest")
@RequestMapping("v1/finpreloancreditapply")
public class FinPreloanCreditApplyRest implements FinPreloanCreditApplyFeign {
@RestController
@RequestMapping("v1/loanpreloancreditapply")
public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
@Autowired
private FinPreloanCreditApplyService finPreloanCreditApplyService;
private LoanPreloanCreditApplyService loanPreloanCreditApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<FinPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<FinPreloanCreditApplyQuery> pq){
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<FinPreloanCreditApplyVo> pv = finPreloanCreditApplyService.listPageVo(pq);
PagerVo<LoanPreloanCreditApplyVo> pv = loanPreloanCreditApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody FinPreloanCreditApplyDto dto){
return finPreloanCreditApplyService.saveOrUpdateDto(dto);
public ResultBean save(@RequestBody LoanPreloanCreditApplyDto dto){
return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
}
@Override
public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
return finPreloanCreditApplyService.submitCompanyRisk(dto);
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return loanPreloanCreditApplyService.submitCompanyRisk(dto);
}
@Override
public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
return finPreloanCreditApplyService.submitCapitalRisk(dto);
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
return loanPreloanCreditApplyService.submitCapitalRisk(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return finPreloanCreditApplyService.delAll(sids);
return loanPreloanCreditApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<FinPreloanCreditApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<LoanPreloanCreditApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
FinPreloanCreditApplyDetailsVo vo = finPreloanCreditApplyService.fetchDetailsVoBySid(sid);
LoanPreloanCreditApplyDetailsVo vo = loanPreloanCreditApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

146
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyService.java → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@ -23,50 +23,36 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpreloancreditapply;
package com.yxt.anrui.riskcenter.biz.loanpreloancreditapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.yxt.anrui.base.api.commonappendix.*;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo;
import com.yxt.anrui.fin.api.finpreloancreditapply.*;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDetailsVo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
import com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoService;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
import com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo.LoanPreloanCreditPeoService;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyService.java <br/>
* Class: com.yxt.anrui.fin.biz.finpreloancreditapply.FinPreloanCreditApplyService <br/>
* Description: 贷前信用审核申请表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanCreditApplyMapper, FinPreloanCreditApply> {
public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloanCreditApplyMapper, LoanPreloanCreditApply> {
@Autowired
private SysUserFeign sysUserFeign;
@ -75,11 +61,11 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private FinPreloanCreditPeoService finPreloanCreditPeoService;
private LoanPreloanCreditPeoService loanPreloanCreditPeoService;
public PagerVo<FinPreloanCreditApplyVo> listPageVo(PagerQuery<FinPreloanCreditApplyQuery> pq) {
FinPreloanCreditApplyQuery query = pq.getParams();
QueryWrapper<FinPreloanCreditApply> qw = new QueryWrapper<>();
public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
LoanPreloanCreditApplyQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@ -112,11 +98,11 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<FinPreloanCreditApplyVo> p = new PagerVo<>();
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FinPreloanCreditApplyVo> p = new PagerVo<>();
PagerVo<LoanPreloanCreditApplyVo> p = new PagerVo<>();
return p;
}
}
@ -153,18 +139,18 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
if (StringUtils.isNotBlank(query.getName())) {
//TODO
}
IPage<FinPreloanCreditApply> page = PagerUtil.queryToPage(pq);
IPage<FinPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdateDto(FinPreloanCreditApplyDto dto){
public ResultBean<String> saveOrUpdateDto(LoanPreloanCreditApplyDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<String> idCardImages = dto.getIdCardImages();
List<String> comFkFiles = dto.getComFkFiles();
List<FinPreloanCreditPeoDto> finPreloanCreditPeos = dto.getFinPreloanCreditPeos();
List<LoanPreloanCreditPeoDto> loanPreloanCreditPeos = dto.getLoanPreloanCreditPeos();
if (StringUtils.isBlank(dtoSid)) {//新增
String sid = this.insertByDto(dto).getData();
for (String idCardImage : idCardImages) {
@ -174,7 +160,7 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(idCardImage);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String comFkFile : comFkFiles) {
@ -184,12 +170,12 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(comFkFile);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (FinPreloanCreditPeoDto finPreloanCreditPeo : finPreloanCreditPeos) {
String peoSid = finPreloanCreditPeoService.insertByDto(finPreloanCreditPeo).getData();
List<String> idCardImages1 = finPreloanCreditPeo.getIdCardImages();
for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
for (String s : idCardImages1) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -197,7 +183,7 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(s);
commonAppendixDto.setLinkSid(peoSid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
}
@ -212,7 +198,7 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(idCardImage);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
for (String comFkFile : comFkFiles) {
@ -222,13 +208,13 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(comFkFile);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
finPreloanCreditPeoService.delByMainSid(dtoSid);
for (FinPreloanCreditPeoDto finPreloanCreditPeo : finPreloanCreditPeos) {
String peoSid = finPreloanCreditPeoService.insertByDto(finPreloanCreditPeo).getData();
List<String> idCardImages1 = finPreloanCreditPeo.getIdCardImages();
loanPreloanCreditPeoService.delByMainSid(dtoSid);
for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
for (String s : idCardImages1) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -236,43 +222,43 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(s);
commonAppendixDto.setLinkSid(peoSid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
}
return rb.success().setData(dtoSid);
}
public ResultBean<String> insertByDto(FinPreloanCreditApplyDto dto){
public ResultBean<String> insertByDto(LoanPreloanCreditApplyDto dto){
ResultBean rb = ResultBean.fireFail();
FinPreloanCreditApply entity = new FinPreloanCreditApply();
LoanPreloanCreditApply entity = new LoanPreloanCreditApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(FinPreloanCreditApplyDto dto){
public void updateByDto(LoanPreloanCreditApplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPreloanCreditApply entity = fetchBySid(dtoSid);
LoanPreloanCreditApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPreloanCreditApplyDetailsVo fetchDetailsVoBySid(String sid){
FinPreloanCreditApply entity = fetchBySid(sid);
FinPreloanCreditApplyDetailsVo vo = new FinPreloanCreditApplyDetailsVo();
public LoanPreloanCreditApplyDetailsVo fetchDetailsVoBySid(String sid){
LoanPreloanCreditApply entity = fetchBySid(sid);
LoanPreloanCreditApplyDetailsVo vo = new LoanPreloanCreditApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
CommonAppendixSelectQuery commonAppendixSelectQuery1 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery1.setLinkSid(sid);
commonAppendixSelectQuery1.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixSelectQuery1.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery1).getData();
CommonAppendixSelectQuery commonAppendixSelectQuery2 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery2.setLinkSid(sid);
commonAppendixSelectQuery2.setAttachType(FinFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
commonAppendixSelectQuery2.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery2).getData();
List<String> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>();
@ -288,12 +274,12 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
filePath = urlPrefix + filePath;
comFkFiles.add(filePath);
}
List<FinPreloanCreditPeoDetailsVo> finPreloanCreditPeoDetailsVos = finPreloanCreditPeoService.fetchByMainSid(sid);
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>();
for (FinPreloanCreditPeoDetailsVo finPreloanCreditPeoDetailsVo : finPreloanCreditPeoDetailsVos) {
for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) {
CommonAppendixSelectQuery commonAppendixSelectQuery3 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery3.setLinkSid(finPreloanCreditPeoDetailsVo.getSid());
commonAppendixSelectQuery3.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
commonAppendixSelectQuery3.setLinkSid(loanPreloanCreditPeoDetailsVo.getSid());
commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData();
for (CommonAppendixVo commonAppendixVo : data3) {
String filePath = commonAppendixVo.getFilePath();
@ -301,11 +287,11 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
filePath = urlPrefix + filePath;
idCardPeoImages.add(filePath);
}
finPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
}
vo.setIdCardImages(idCardImages);
vo.setComFkFiles(comFkFiles);
vo.setFinPreloanCreditPeos(finPreloanCreditPeoDetailsVos);
vo.setLoanPreloanCreditPeos(loanPreloanCreditPeoDetailsVos);
return vo;
}
@ -319,14 +305,15 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
delBySids(sids);
for (String sid : sids) {
commonAppendixFeign.deleteFiles(sid);
finPreloanCreditPeoService.delByMainSid(sid);
loanPreloanCreditPeoService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid,FinFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid,LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
List<String> gsQueryResults = dto.getGsQueryResults();
for (String gsQueryResult : gsQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
@ -335,14 +322,29 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
}
commonAppendixDto.setFilePath(gsQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
return null;
baseMapper.submitCompanyRisk(dtoSid,dto.getGsshjg(),dto.getGsshDate(),dto.getGsshRemarks());
return rb.success();
}
public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
return null;
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid,LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
List<String> zfQueryResults = dto.getZfQueryResults();
for (String zfQueryResult : zfQueryResults) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (zfQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
zfQueryResult = zfQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(zfQueryResult);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
commonAppendixFeign.save(commonAppendixDto);
}
baseMapper.submitCapitalRisk(dtoSid,dto.getZfshjg(),dto.getZfshDate(),dto.getZfshRemarks(),dto.getCapitalBalance());
return rb.success();
}
}

44
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyMapper.java → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoMapper.java

@ -23,45 +23,39 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpreloancreditapply;
package com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApply;
import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyVo;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditApplyMapper.java <br/>
* Class: com.yxt.anrui.fin.biz.finpreloancreditapply.FinPreloanCreditApplyMapper <br/>
* Description: 贷前信用审核申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface FinPreloanCreditApplyMapper extends BaseMapper<FinPreloanCreditApply> {
public interface LoanPreloanCreditPeoMapper extends BaseMapper<LoanPreloanCreditPeo> {
//@Update("update fin_preloan_credit_apply set name=#{msg} where id=#{id}")
//IPage<FinPreloanCreditApplyVo> voPage(IPage<FinPreloanCreditApply> page, @Param(Constants.WRAPPER) QueryWrapper<FinPreloanCreditApply> qw);
//@Update("update loan_preloan_credit_peo set name=#{msg} where id=#{id}")
//IPage<LoanPreloanCreditPeoVo> voPage(IPage<LoanPreloanCreditPeo> page, @Param(Constants.WRAPPER) QueryWrapper<LoanPreloanCreditPeo> qw);
IPage<FinPreloanCreditApplyVo> selectPageVo(IPage<FinPreloanCreditApply> page, @Param(Constants.WRAPPER) Wrapper<FinPreloanCreditApply> qw);
IPage<LoanPreloanCreditPeoVo> selectPageVo(IPage<LoanPreloanCreditPeo> page, @Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditPeo> qw);
List<FinPreloanCreditApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPreloanCreditApply> qw);
List<LoanPreloanCreditPeoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditPeo> qw);
@Select("select * from fin_preloan_credit_apply")
List<FinPreloanCreditApplyVo> selectListVo();
@Select("select * from loan_preloan_credit_peo")
List<LoanPreloanCreditPeoVo> selectListVo();
@Delete("delete from loan_preloan_credit_peo where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select * from loan_preloan_credit_peo where mainSid = #{sid}")
List<LoanPreloanCreditPeoDetailsVo> fetchByMainSid(String sid);
int selectBySid(String join);
}

13
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo.LoanPreloanCreditPeoMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoVo">
SELECT * FROM loan_preloan_credit_peo <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoVo">
SELECT * FROM loan_preloan_credit_peo <where> ${ew.sqlSegment} </where>
</select>
</mapper>

46
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditpeo/FinPreloanCreditPeoRest.java → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoRest.java

@ -23,8 +23,9 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -33,50 +34,29 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoQuery;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDetailsVo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoFeign;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoRest <br/>
* Description: 贷前信用审核人员表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "贷前信用审核人员表")
@RestController("com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoRest")
@RequestMapping("v1/finpreloancreditpeo")
public class FinPreloanCreditPeoRest implements FinPreloanCreditPeoFeign {
@RestController
@RequestMapping("v1/loanpreloancreditpeo")
public class LoanPreloanCreditPeoRest implements LoanPreloanCreditPeoFeign {
@Autowired
private FinPreloanCreditPeoService finPreloanCreditPeoService;
private LoanPreloanCreditPeoService loanPreloanCreditPeoService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<FinPreloanCreditPeoVo>> listPage(@RequestBody PagerQuery<FinPreloanCreditPeoQuery> pq){
public ResultBean<PagerVo<LoanPreloanCreditPeoVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditPeoQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<FinPreloanCreditPeoVo> pv = finPreloanCreditPeoService.listPageVo(pq);
PagerVo<LoanPreloanCreditPeoVo> pv = loanPreloanCreditPeoService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody FinPreloanCreditPeoDto dto){
public ResultBean save(@RequestBody LoanPreloanCreditPeoDto dto){
ResultBean rb = ResultBean.fireFail();
finPreloanCreditPeoService.saveOrUpdateDto(dto);
loanPreloanCreditPeoService.saveOrUpdateDto(dto);
return rb.success();
}
@ -85,16 +65,16 @@ public class FinPreloanCreditPeoRest implements FinPreloanCreditPeoFeign {
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
finPreloanCreditPeoService.delBySids(sids);
loanPreloanCreditPeoService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<FinPreloanCreditPeoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<LoanPreloanCreditPeoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
FinPreloanCreditPeoDetailsVo vo = finPreloanCreditPeoService.fetchDetailsVoBySid(sid);
LoanPreloanCreditPeoDetailsVo vo = loanPreloanCreditPeoService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

61
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditpeo/FinPreloanCreditPeoService.java → anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditpeo/LoanPreloanCreditPeoService.java

@ -23,60 +23,41 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.biz.finpreloancreditpeo;
package com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.*;
import com.yxt.common.base.service.MybatisBaseService;
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 com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoQuery;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDetailsVo;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-fin(贷前信用审核管理) <br/>
* File: FinPreloanCreditPeoService.java <br/>
* Class: com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoService <br/>
* Description: 贷前信用审核人员表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-07-11 11:04:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class FinPreloanCreditPeoService extends MybatisBaseService<FinPreloanCreditPeoMapper, FinPreloanCreditPeo> {
private QueryWrapper<FinPreloanCreditPeo> createQueryWrapper(FinPreloanCreditPeoQuery query) {
public class LoanPreloanCreditPeoService extends MybatisBaseService<LoanPreloanCreditPeoMapper, LoanPreloanCreditPeo> {
private QueryWrapper<LoanPreloanCreditPeo> createQueryWrapper(LoanPreloanCreditPeoQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinPreloanCreditPeo> qw = new QueryWrapper<>();
QueryWrapper<LoanPreloanCreditPeo> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<FinPreloanCreditPeoVo> listPageVo(PagerQuery<FinPreloanCreditPeoQuery> pq) {
FinPreloanCreditPeoQuery query = pq.getParams();
QueryWrapper<FinPreloanCreditPeo> qw = createQueryWrapper(query);
IPage<FinPreloanCreditPeo> page = PagerUtil.queryToPage(pq);
IPage<FinPreloanCreditPeoVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinPreloanCreditPeoVo> p = PagerUtil.pageToVo(pagging, null);
public PagerVo<LoanPreloanCreditPeoVo> listPageVo(PagerQuery<LoanPreloanCreditPeoQuery> pq) {
LoanPreloanCreditPeoQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditPeo> qw = createQueryWrapper(query);
IPage<LoanPreloanCreditPeo> page = PagerUtil.queryToPage(pq);
IPage<LoanPreloanCreditPeoVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanPreloanCreditPeoVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(FinPreloanCreditPeoDto dto){
public void saveOrUpdateDto(LoanPreloanCreditPeoDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
@ -85,27 +66,27 @@ public class FinPreloanCreditPeoService extends MybatisBaseService<FinPreloanCre
this.updateByDto(dto);
}
public ResultBean<String> insertByDto(FinPreloanCreditPeoDto dto){
public ResultBean<String> insertByDto(LoanPreloanCreditPeoDto dto){
ResultBean rb = ResultBean.fireFail();
FinPreloanCreditPeo entity = new FinPreloanCreditPeo();
LoanPreloanCreditPeo entity = new LoanPreloanCreditPeo();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(FinPreloanCreditPeoDto dto){
public void updateByDto(LoanPreloanCreditPeoDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
FinPreloanCreditPeo entity = fetchBySid(dtoSid);
LoanPreloanCreditPeo entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public FinPreloanCreditPeoDetailsVo fetchDetailsVoBySid(String sid){
FinPreloanCreditPeo entity = fetchBySid(sid);
FinPreloanCreditPeoDetailsVo vo = new FinPreloanCreditPeoDetailsVo();
public LoanPreloanCreditPeoDetailsVo fetchDetailsVoBySid(String sid){
LoanPreloanCreditPeo entity = fetchBySid(sid);
LoanPreloanCreditPeoDetailsVo vo = new LoanPreloanCreditPeoDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
@ -114,7 +95,7 @@ public class FinPreloanCreditPeoService extends MybatisBaseService<FinPreloanCre
baseMapper.delByMainSid(dtoSid);
}
public List<FinPreloanCreditPeoDetailsVo> fetchByMainSid(String sid) {
public List<LoanPreloanCreditPeoDetailsVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java

@ -112,6 +112,9 @@ public class AppScmVehicleGressionInfoVo implements Vo {
@ApiModelProperty("机构sid")
private String useOrgSid;
@ApiModelProperty("组织全路径")
@JsonProperty("orgPath")
private String orgSidPath;
}

98
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -248,14 +248,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
);
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuUrl())){
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
@ -276,23 +276,23 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("svg.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("svg.createBySid",query.getUserSid());
}else{
} else if ("5".equals(orgLevelKey)) {
qw.eq("svg.createBySid", query.getUserSid());
} else {
PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
if (StringUtils.isNotBlank(query.getUserSid())) {
qw.eq("svg.createBySid", query.getUserSid());
}
if(StringUtils.isNotBlank(query.getOrgPath())){
if (StringUtils.isNotBlank(query.getOrgPath())) {
String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("svg.useorgSid",orgpath);
qw.eq("svg.useorgSid", orgpath);
}
}
@ -301,11 +301,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
for (ScmVehicleGressionPageVo record : records) {
//根据sid查询该申请下的车辆
List<String> vinList = scmVehicleGressionVehService.selectByMainSid(record.getSid());
String vin = String.join(",",vinList);
String vin = String.join(",", vinList);
record.setVin(vin);
if(query.getUserSid().equals(record.getCreateBySid())){
if (query.getUserSid().equals(record.getCreateBySid())) {
record.setAllowModify(true);
}else{
} else {
record.setAllowModify(false);
}
String sid = record.getSid();
@ -367,9 +367,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (applicantDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
);
if(StringUtils.isNotBlank(query.getOrgPath())){
if (StringUtils.isNotBlank(query.getOrgPath())) {
String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("svg.useorgSid",orgpath);
qw.eq("svg.useorgSid", orgpath);
}
return qw;
}
@ -382,7 +382,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
qw.eq("svg.useOrgSid", pagerQuery.getParams().getUseOrgSid());
}
qw.eq("svg.nodeState","已办结");
qw.eq("svg.nodeState", "已办结");
IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
List<ScmVehicleGressionPageVo> records = iPage.getRecords();
for (ScmVehicleGressionPageVo record : records) {
@ -427,14 +427,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
qw.eq("svg.handleState", query.getType());
}
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuSid())){
if (StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
@ -455,17 +455,17 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("svg.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("svg.createBySid",query.getUserSid());
}else{
} else if ("5".equals(orgLevelKey)) {
qw.eq("svg.createBySid", query.getUserSid());
} else {
PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
if (StringUtils.isNotBlank(query.getOrgPath())) {
//切换机构
//根据用户所在组织全路径获取分公司sid
@ -485,14 +485,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
for (AppScmVehicleGressionPageVo record : records) {
List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
if(query.getUserSid().equals(record.getCreateBySid()) && record.isShowDetectBtn()){
if (query.getUserSid().equals(record.getCreateBySid()) && record.isShowDetectBtn()) {
record.setShowDetectBtn(true);
}else{
} else {
record.setShowDetectBtn(false);
}
if(query.getUserSid().equals(record.getCreateBySid()) && record.isShowUpdateBtn()){
if (query.getUserSid().equals(record.getCreateBySid()) && record.isShowUpdateBtn()) {
record.setShowUpdateBtn(true);
}else{
} else {
record.setShowUpdateBtn(false);
}
if ("已办结".equals(record.getState())) {
@ -561,13 +561,13 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String useOrgSid = "";
//当前组织机构全路径sid
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
orgSidPath = dto.getOrgPath();
}else{
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
if(StringUtils.isBlank(orgSidPath)){
if (StringUtils.isBlank(orgSidPath)) {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
@ -616,7 +616,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
if (scmVehicleGression == null) {
return rb.setMsg("该申请不存在");
}
BeanUtil.copyProperties(dto, scmVehicleGression,"orgSidPath");
BeanUtil.copyProperties(dto, scmVehicleGression, "orgSidPath");
baseMapper.updateById(scmVehicleGression);
scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid());
scmVehicleGressionVehService.saveOrUpdateDto(scmVehicleGressionVehDtos, scmVehicleGression.getSid());
@ -658,33 +658,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
vo.setImage(image);
vo.setUserSid(vo.getCreateBySid());
return rb.success().setData(vo);
/* String type1 = "04"; //保单照片
String type2 = "05"; //现场照片
List<String> policyImage = new ArrayList<>();
List<String> image = new ArrayList<>();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid, useOrgSid);
List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
vo.setApplicantName(data1.getName());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String format = simpleDateFormat.format(new Date());
vo.setApplicantDate(format);
vo.setUserSid(userSid);
List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
for (ScmFile scmFile : scmFiles1) {
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
}
vo.setPolicyImage(policyImage);
List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, type2);
for (ScmFile scmFile : scmFiles2) {
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
}
vo.setImage(image);
return vo;*/
}
/**
@ -890,10 +863,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
dto.setOrgPath(orgSidPath);
} else {
bv.setOrgSidPath(orgPath);
dto.setOrgPath(orgPath);
}
@ -969,7 +940,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
baseVehicleTempstateDto.setBusSid(businessSid);
baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
}
scmVehicleGression = fetchBySid(businessSid);
bv.setOrgSidPath(scmVehicleGression.getOrgSidPath());
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//业务sid
@ -1367,7 +1339,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
ScmVehicleGression scmVehicleGression = fetchBySid(query.getBusinessSid());
String businessTaskId = scmVehicleGression.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(scmVehicleGression.getCreateBySid())){
if (query.getUserSid().equals(scmVehicleGression.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -1378,7 +1350,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
//清除临时车辆表状态
baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid());
return rb.success().setData(resultBean.getData());
}else{
} else {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
@ -1584,7 +1556,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
File file = new File(targetPath + "outdoor"+seconds+".ftl");
File file = new File(targetPath + "outdoor" + seconds + ".ftl");
File dir = new File(targetPath);
WordConvertUtils.inputStreamToFile(inputStream, file);
WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@ -96,4 +96,6 @@ public class AdvanceInvoiceInfoVo implements Vo {
private String qkkpBillNo;
@ApiModelProperty("销售订单sid")
private String saleSid;
@ApiModelProperty("是否显示价值客户")
private Boolean showValueCustomer;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java

@ -36,6 +36,7 @@ public class HandoverPrepareVehicleInfoVo implements Vo {
private String remarks;
@ApiModelProperty("发票合格")
@JsonProperty("invoiceStateStr")
private String invoicingStateStr;
@ApiModelProperty("状态是false的情况下合格证状态")
private String certificateStateStr;

Loading…
Cancel
Save