Merge remote-tracking branch 'origin/master'

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() + "的发票交接已准备好，请前往交车准备进行确认");

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,

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,

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>

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, "");

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

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")
+@TableName("loan_preloan_credit_apply")
-public class FinPreloanCreditApply extends BaseEntity {
+public class LoanPreloanCreditApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("创建人接口")

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.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
-import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
 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<>();
 }

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<>();
 }

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",
+        contextId = "anrui-riskcenter-LoanPreloanCreditApply",
-        name = "anrui-fin",
+        name = "anrui-riskcenter",
-        path = "v1/finpreloancreditapply",
+        path = "v1/loanpreloancreditapply",
-        fallback = FinPreloanCreditApplyFeignFallback.class)
+        fallback = LoanPreloanCreditApplyFeignFallback.class)
-public interface FinPreloanCreditApplyFeign {
+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);
 }

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){
+	public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
-		return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditpeo/save无法访问");
+		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无法访问");
 	}
 }

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;

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;
 

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<>();
 }

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;
 

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")

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
 

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
 

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",
+        path = "v1/loanpreloancreditpeo",
-        fallback = FinPreloanCreditPeoFeignFallback.class)
+        fallback = LoanPreloanCreditPeoFeignFallback.class)
-public interface FinPreloanCreditPeoFeign {
+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);
 }

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无法访问");
+		return rb.setMsg("接口anrui-fin/loanpreloancreditpeo/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(FinPreloanCreditApplyDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/save无法访问");
-	}
-
-	@Override
-	public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
-		return null;
 	}
 
 	@Override
-	public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
+	public ResultBean save(LoanPreloanCreditPeoDto dto){
-		return null;
+		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无法访问");
 	}
 }

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

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
 

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 com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
-import org.apache.ibatis.annotations.Delete;
+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 org.apache.ibatis.annotations.Update;
-import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoVo;
 
 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> {
-
-	//@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);
+    IPage<LoanPreloanCreditApplyVo> selectPageVo(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditApply> qw);
 
-	List<FinPreloanCreditPeoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPreloanCreditPeo> qw);
+    List<LoanPreloanCreditApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditApply> qw);
 
-	@Select("select * from fin_preloan_credit_peo")
+    @Select("select * from loan_preloan_credit_apply")
-	List<FinPreloanCreditPeoVo> selectListVo();
+    List<LoanPreloanCreditApplyVo> selectListVo();
 
-	@Delete("delete from fin_preloan_credit_peo where mainSid = #{dtoSid}")
+    int selectBySid(String join);
-    void delByMainSid(String dtoSid);
 
-	@Select("select * from fin_preloan_credit_peo where mainSid = #{sid}")
+    @Update("update loan_preloan_credit_apply set gsfkjg = #{gsshjg},gsshDate = #{gsshDate},gsshRemarks = #{gsshRemarks} where sid=#{dtoSid}")
-	List<FinPreloanCreditPeoDetailsVo> fetchByMainSid(String sid);
+    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);
 }

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 id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo">
-        SELECT * FROM fin_preloan_credit_apply
+        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>

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")
+@RestController
-@RequestMapping("v1/finpreloancreditapply")
+@RequestMapping("v1/loanpreloancreditapply")
-public class FinPreloanCreditApplyRest implements FinPreloanCreditApplyFeign {
+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){
+	public ResultBean save(@RequestBody LoanPreloanCreditApplyDto dto){
-		return finPreloanCreditApplyService.saveOrUpdateDto(dto);
+		return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
 	}
 
 	@Override
-	public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
+	public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
-		return finPreloanCreditApplyService.submitCompanyRisk(dto);
+		return loanPreloanCreditApplyService.submitCompanyRisk(dto);
 	}
 
 	@Override
-	public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
+	public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
-		return finPreloanCreditApplyService.submitCapitalRisk(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);
 	}
 }

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.CommonAppendixDto;
-import com.yxt.anrui.base.api.commonappendix.*;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
-import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
-import com.yxt.anrui.fin.api.finpreloancreditapply.*;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
-import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
-import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
-import com.yxt.anrui.fin.biz.finpreloancreditpeo.FinPreloanCreditPeoService;
+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) {
+	public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
-		FinPreloanCreditApplyQuery query = pq.getParams();
+		LoanPreloanCreditApplyQuery query = pq.getParams();
-		QueryWrapper<FinPreloanCreditApply> qw = new QueryWrapper<>();
+		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<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
-		IPage<FinPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<FinPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
+		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) {
+			for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
-				String peoSid = finPreloanCreditPeoService.insertByDto(finPreloanCreditPeo).getData();
+				String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
-				List<String> idCardImages1 = finPreloanCreditPeo.getIdCardImages();
+				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);
+		loanPreloanCreditPeoService.delByMainSid(dtoSid);
-		for (FinPreloanCreditPeoDto finPreloanCreditPeo : finPreloanCreditPeos) {
+		for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
-			String peoSid = finPreloanCreditPeoService.insertByDto(finPreloanCreditPeo).getData();
+			String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
-			List<String> idCardImages1 = finPreloanCreditPeo.getIdCardImages();
+			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){
+	public LoanPreloanCreditApplyDetailsVo fetchDetailsVoBySid(String sid){
-		FinPreloanCreditApply entity = fetchBySid(sid);
+		LoanPreloanCreditApply entity = fetchBySid(sid);
-		FinPreloanCreditApplyDetailsVo vo = new FinPreloanCreditApplyDetailsVo();
+		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.setLinkSid(loanPreloanCreditPeoDetailsVo.getSid());
-			commonAppendixSelectQuery3.setAttachType(FinFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
+			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);
 		}
-
+		baseMapper.submitCompanyRisk(dtoSid,dto.getGsshjg(),dto.getGsshDate(),dto.getGsshRemarks());
-		return null;
+		return rb.success();
 	}
 
-	public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
+	public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
-		return null;
+		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();
 	}
 }

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 loan_preloan_credit_peo set name=#{msg} where id=#{id}")
+	//IPage<LoanPreloanCreditPeoVo> voPage(IPage<LoanPreloanCreditPeo> page, @Param(Constants.WRAPPER) QueryWrapper<LoanPreloanCreditPeo> qw);
+	
+	IPage<LoanPreloanCreditPeoVo> selectPageVo(IPage<LoanPreloanCreditPeo> page, @Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditPeo> qw);
 	
-	//@Update("update fin_preloan_credit_apply set name=#{msg} where id=#{id}")
+	List<LoanPreloanCreditPeoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanPreloanCreditPeo> qw);
-	//IPage<FinPreloanCreditApplyVo> voPage(IPage<FinPreloanCreditApply> page, @Param(Constants.WRAPPER) QueryWrapper<FinPreloanCreditApply> qw);
 	
-	IPage<FinPreloanCreditApplyVo> selectPageVo(IPage<FinPreloanCreditApply> page, @Param(Constants.WRAPPER) Wrapper<FinPreloanCreditApply> qw);
+	@Select("select * from loan_preloan_credit_peo")
+	List<LoanPreloanCreditPeoVo> selectListVo();
 
-	List<FinPreloanCreditApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPreloanCreditApply> qw);
+	@Delete("delete from loan_preloan_credit_peo where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
 
-	@Select("select * from fin_preloan_credit_apply")
+	@Select("select * from loan_preloan_credit_peo where mainSid = #{sid}")
-	List<FinPreloanCreditApplyVo> selectListVo();
+	List<LoanPreloanCreditPeoDetailsVo> fetchByMainSid(String sid);
 
-	int selectBySid(String join);
 }

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>

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")
+@RestController
-@RequestMapping("v1/finpreloancreditpeo")
+@RequestMapping("v1/loanpreloancreditpeo")
-public class FinPreloanCreditPeoRest implements FinPreloanCreditPeoFeign {
+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);
 	}
 }

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 org.apache.commons.lang3.StringUtils;
-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.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> {
+public class LoanPreloanCreditPeoService extends MybatisBaseService<LoanPreloanCreditPeoMapper, LoanPreloanCreditPeo> {
-	private QueryWrapper<FinPreloanCreditPeo> createQueryWrapper(FinPreloanCreditPeoQuery query) {
+	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) {
+	public PagerVo<LoanPreloanCreditPeoVo> listPageVo(PagerQuery<LoanPreloanCreditPeoQuery> pq) {
-		FinPreloanCreditPeoQuery query = pq.getParams();
+		LoanPreloanCreditPeoQuery query = pq.getParams();
-		QueryWrapper<FinPreloanCreditPeo> qw = createQueryWrapper(query);
+		QueryWrapper<LoanPreloanCreditPeo> qw = createQueryWrapper(query);
-		IPage<FinPreloanCreditPeo> page = PagerUtil.queryToPage(pq);
+		IPage<LoanPreloanCreditPeo> page = PagerUtil.queryToPage(pq);
-		IPage<FinPreloanCreditPeoVo> pagging = baseMapper.selectPageVo(page, qw);
+		IPage<LoanPreloanCreditPeoVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<FinPreloanCreditPeoVo> p = PagerUtil.pageToVo(pagging, null);
+		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){
+	public LoanPreloanCreditPeoDetailsVo fetchDetailsVoBySid(String sid){
-		FinPreloanCreditPeo entity = fetchBySid(sid);
+		LoanPreloanCreditPeo entity = fetchBySid(sid);
-		FinPreloanCreditPeoDetailsVo vo = new FinPreloanCreditPeoDetailsVo();
+		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);
 	}
 }

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;
 
 
 }

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

@@ -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

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;
 }

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;