Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basefiles;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataList.java <br/>
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataList <br/>
+ * Description: 资料清单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "附件清单", description = "附件清单")
+@TableName("base_files")
+@Data
+public class BaseFiles extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("业务类别key")
+    private String busTypeKey;
+    @ApiModelProperty("业务类别value")
+    private String busTypeValue;
+    @ApiModelProperty("文件编号")
+    private String fileNo;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+    @ApiModelProperty("文件格式")
+    private String fileType;
+    @ApiModelProperty("示例")
+    private String sample;
+    @ApiModelProperty("份数")
+    private Integer count;
+    @ApiModelProperty("是否必传0非必传，1必传")
+    private Integer isUpload;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名")
+    private String useOrgName;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDetailsVo.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.base.api.basefiles;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/26 15:40
+ * @Description
+ */
+@Data
+public class BaseFilesDetailsVo implements Vo {
+    private static final long serialVersionUID = -8075833659958149115L;
+    private String sid;
+    private String userSid;
+    @ApiModelProperty("业务类别key")
+    private String busTypeKey;
+    @ApiModelProperty("业务类别value")
+    private String busTypeValue;
+    @ApiModelProperty("文件编号")
+    private String fileNo;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+    @ApiModelProperty("文件格式")
+    private String fileType;
+    @ApiModelProperty("份数")
+    private Integer count;
+    @ApiModelProperty("是否必传0非必传，1必传")
+    private Integer isUpload;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("示例")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basefiles;
+
+
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListDto <br/>
+ * Description: 资料清单 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资料清单 数据传输对象", description = "资料清单 数据传输对象")
+@Data
+public class BaseFilesDto implements Dto {
+    private static final long serialVersionUID = 6031157146326125370L;
+
+    private String sid;
+    private String userSid;
+    @ApiModelProperty("业务类别key")
+    private String busTypeKey;
+    @ApiModelProperty("业务类别value")
+    private String busTypeValue;
+    @ApiModelProperty("文件编号")
+    private String fileNo;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+    @ApiModelProperty("文件格式")
+    private String fileType;
+    @ApiModelProperty("份数")
+    private Integer count;
+    @ApiModelProperty("是否必传0非必传，1必传")
+    private Integer isUpload;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("示例")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java

@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basefiles;
+
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListFeign <br/>
+ * Description: 资料清单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "附件清单")
+@FeignClient(
+        contextId = "anrui-base-BaseFiles",
+        name = "anrui-base",
+        path = "v1/basefiles",
+        fallback = BaseFilesFeignFallback.class)
+public interface BaseFilesFeign {
+    /**
+     * PC-附件清单分页列表
+     *
+     * @param pq 查询条件
+     * @return
+     */
+    @ApiOperation("PC-附件清单分页列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    ResultBean<PagerVo<BaseFilesVo>> listPage(@RequestBody PagerQuery<BaseFilesQuery> pq);
+
+    /**
+     * PC-附件清单新增保存
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    @ApiOperation("新增编辑")
+    @PostMapping("/saveOrUpdate")
+    ResultBean saveOrUpdateBaseFiles(@RequestBody BaseFilesDto dto);
+
+    /**
+     * PC-附件清单编辑初始化和详情
+     *
+     * @param sid 资料清单sid
+     * @return
+     */
+    @ApiOperation("编辑初始化、详情")
+    @GetMapping("/details/{sid}")
+    ResultBean<BaseFilesDetailsVo> selectDetails(@PathVariable("sid") String sid);
+
+    @ApiOperation("批量删除")
+    @DeleteMapping("/deleteBySids")
+    @ResponseBody
+    public ResultBean deleteBySids(@RequestBody String[] sids);
+
+
+    /**
+     * PC-生成文件编号
+     *
+     * @param busTypeKey 业务类型key
+     * @return
+     */
+    @ApiOperation("生成文件编号")
+    @GetMapping("/createFileNo")
+    ResultBean<String> createFileNo(@RequestParam("busTypeKey") String busTypeKey);
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basefiles;
+
+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-base(安瑞基础信息) <br/>
+ * File: BaseDataListFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListFeignFallback <br/>
+ * Description: 资料清单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseFilesFeignFallback implements BaseFilesFeign {
+
+
+    @Override
+    public ResultBean<PagerVo<BaseFilesVo>> listPage(PagerQuery<BaseFilesQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOrUpdateBaseFiles(BaseFilesDto dto) {
+        return null;
+    }
+
+
+    @Override
+    public ResultBean<BaseFilesDetailsVo> selectDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> createFileNo(String busTypeKey) {
+        return null;
+    }
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesQuery.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basefiles;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListQuery <br/>
+ * Description: 资料清单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资料清单 查询条件", description = "资料清单 查询条件")
+@Data
+public class BaseFilesQuery implements Query {
+
+    private String userSid;
+    @ApiModelProperty("业务类别key")
+    private String busTypeKey;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+    @ApiModelProperty("是否必传0非必传，1必传")
+    private Integer isUpload;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basefiles;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListVo <br/>
+ * Description: 资料清单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资料清单 视图数据对象", description = "资料清单 视图数据对象")
+@Data
+public class BaseFilesVo implements Vo {
+
+    private static final long serialVersionUID = 8585166912605249026L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty("业务类别value")
+    private String busTypeValue;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+    @ApiModelProperty("文件格式")
+    private String fileType;
+    @ApiModelProperty("份数")
+    private Integer count;
+    @ApiModelProperty("是否必传0非必传，1必传")
+    private Integer isUpload;
+    @ApiModelProperty("示例")
+    private String sample;
+    @ApiModelProperty("示例")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("查看附件按钮显示")
+    private Boolean showSampleBtn;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -67,8 +67,6 @@ public class BaseVehicleStateEnum {
         DDBA_SUBMIT("1", "订单提交"),
         DDBA_PASS("2", "订单审核通过"),
         CKKP_PASS("3", "出库开票审核通过"),
-        CKKP_SAVE("17", "出库申请保存"),
-        CKKP_DELETE("18", "出库申请修改"),
         JC_PASS("4", "交车审核通过"),
         BUS_STOP("5", "业务终止"),
         DDBA_SAVEVIN("6", "录入车架号"),
@@ -82,8 +80,10 @@ public class BaseVehicleStateEnum {
         TC("14", "退车"),
         JCZBTIJ("15", "交车准备提交"),
         JCTJ("16", "交车提交"),
-        QKKPTJ("17","欠款开票提交"),
-        QKKPZZ("18","欠款开票终止"),
+        CKKP_SAVE("17", "出库申请保存"),
+        CKKP_DELETE("18", "出库申请修改"),
+        QKKPTJ("19","欠款开票提交"),
+        QKKPZZ("20","欠款开票终止"),
         ;
 
         private String typeKey;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -254,5 +254,4 @@ public interface CommonContractFeign {
     @PostMapping("/getApprovalContractList")
     @ResponseBody
     ResultBean<PagerVo<ContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<ContractPageQuery> query);
-
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basefiles;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.base.api.basefiles.BaseFiles;
+import com.yxt.anrui.base.api.basefiles.BaseFilesVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basedatalist.BaseDataListMapper <br/>
+ * Description: 资料清单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseFilesMapper extends BaseMapper<BaseFiles> {
+
+    IPage<BaseFilesVo> listPage(IPage<BaseFiles> page, @Param(Constants.WRAPPER) QueryWrapper<BaseFiles> qw);
+
+
+    int updateBySidDelete(String sid);
+
+
+    String createFileNo(String busTypeKey);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml

@@ -0,0 +1,27 @@
+<?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.base.biz.basefiles.BaseFilesMapper">
+    <update id="updateBySidDelete">
+        update base_files
+        set isDelete = 1
+        where sid = #{sid}
+    </update>
+
+    <select id="listPage" resultType="com.yxt.anrui.base.api.basefiles.BaseFilesVo">
+        SELECT sid,
+        busTypeValue,
+        fileName,
+        fileType,
+        `count`,
+        isUpload,
+        sample,
+        remarks
+        from base_files
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="createFileNo" resultType="java.lang.String">
+        SELECT fileNo FROM base_files where busTypeKey = #{busTypeKey} order by fileNo  DESC limit 1
+    </select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basefiles;
+
+import com.yxt.anrui.base.api.basefiles.*;
+
+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 org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basedatalist.BaseDataListRest <br/>
+ * Description: 资料清单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "资料清单")
+@RestController("com.yxt.anrui.base.biz.basefiles.BaseFilesRest")
+@RequestMapping("v1/basefiles")
+public class BaseFilesRest implements BaseFilesFeign {
+
+    @Autowired
+    private BaseFilesService baseFilesService;
+
+    @Override
+    public ResultBean<PagerVo<BaseFilesVo>> listPage(PagerQuery<BaseFilesQuery> pq) {
+        ResultBean<PagerVo<BaseFilesVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseFilesVo> pv = baseFilesService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean saveOrUpdateBaseFiles(BaseFilesDto dto) {
+        return baseFilesService.saveOrUpdateBaseFiles(dto);
+    }
+
+
+    @Override
+    public ResultBean<BaseFilesDetailsVo> selectDetails(String sid) {
+        return baseFilesService.selectDetails(sid);
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return baseFilesService.deleteBySids(sids);
+    }
+
+    @Override
+    public ResultBean<String> createFileNo(String busTypeKey) {
+        return baseFilesService.createFileNo(busTypeKey);
+    }
+
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java

@@ -0,0 +1,257 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basefiles;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basefiles.*;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-base(安瑞基础信息) <br/>
+ * File: BaseDataListService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basedatalist.BaseDataListService <br/>
+ * Description: 资料清单 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-02-26 09:59:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseFilesService extends MybatisBaseService<BaseFilesMapper, BaseFiles> {
+
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private CommonAppendixService commonAppendixService;
+
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+    /**
+     * 编辑保存
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean saveOrUpdateBaseFiles(BaseFilesDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            BaseFiles baseFiles = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, baseFiles, "id", "sid");
+            StringBuilder sb = new StringBuilder();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            if (!dto.getFiles().isEmpty()) {
+                for (String filePath : dto.getFiles()) {
+                    String path = filePath.substring(urlPrefix.length());
+                    sb.append(path).append(",");
+                }
+                sb.delete(sb.length() - 1, sb.length());
+                baseFiles.setSample(sb.toString());
+            }
+            baseMapper.updateById(baseFiles);
+        } else {
+            BaseFiles baseFiles = new BaseFiles();
+            BeanUtil.copyProperties(dto, baseFiles, "id", "sid");
+            baseFiles.setCreateBySid(dto.getUserSid());
+            String userOrgSid = dto.getUseOrgSid();
+            baseFiles.setUseOrgSid(userOrgSid);
+            ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
+            if (organizationVo.getSuccess()) {
+                SysOrganizationVo organizationVoData = organizationVo.getData();
+                if (null != organizationVoData) {
+                    baseFiles.setUseOrgName(organizationVoData.getName());
+                }
+            }
+            StringBuilder sb = new StringBuilder();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            if (!dto.getFiles().isEmpty()) {
+                for (String filePath : dto.getFiles()) {
+                    String path = filePath.substring(urlPrefix.length());
+                    sb.append(path).append(",");
+                }
+                sb.delete(sb.length() - 1, sb.length());
+                baseFiles.setSample(sb.toString());
+            }
+            baseMapper.insert(baseFiles);
+        }
+        return rb.success();
+    }
+
+    /**
+     * 分页列表
+     *
+     * @param pq
+     * @return
+     */
+    public PagerVo<BaseFilesVo> listPage(PagerQuery<BaseFilesQuery> pq) {
+        IPage<BaseFiles> page = PagerUtil.queryToPage(pq);
+        BaseFilesQuery pagerQuery = pq.getParams();
+        QueryWrapper<BaseFiles> qw = new QueryWrapper<>();
+        //业务类型
+        if (StringUtils.isNotBlank(pagerQuery.getBusTypeKey())) {
+            qw.eq("busTypeKey", pagerQuery.getBusTypeKey());
+        }
+        //文件名称
+        if (StringUtils.isNotBlank(pagerQuery.getFileName())) {
+            qw.like("fileName", pagerQuery.getFileName());
+        }
+        //是否必传
+        if (null != pagerQuery.getIsUpload()) {
+            qw.eq("isUpload", pagerQuery.getIsUpload());
+        }
+        qw.eq("useOrgSid", pagerQuery.getUseOrgSid());
+        qw.eq("isDelete", 0);
+        qw.orderByDesc("createTime");
+        IPage<BaseFilesVo> pagging = baseMapper.listPage(page, qw);
+        List<BaseFilesVo> records = pagging.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if (!records.isEmpty()) {
+            for (BaseFilesVo record : records) {
+                record.setShowSampleBtn(false);
+                if (StringUtils.isNotBlank(record.getSample())) {
+                    record.setShowSampleBtn(true);
+                    String filePath = record.getSample();
+                    List<String> filePaths = new ArrayList<>();
+                    String array[] = filePath.split(",");
+                    for (int i = 0; i < array.length; i++) {
+                        String urlPrefix = fileUploadComponent.getUrlPrefix();
+                        filePath = urlPrefix + array[i];
+                        filePaths.add(filePath);
+                        record.setFiles(filePaths);
+                    }
+                }
+            }
+        }
+        PagerVo<BaseFilesVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    /**
+     * 编辑回显
+     *
+     * @param sid
+     * @return
+     */
+    public ResultBean<BaseFilesDetailsVo> selectDetails(String sid) {
+        ResultBean<BaseFilesDetailsVo> rb = ResultBean.fireFail();
+        BaseFilesDetailsVo vo = new BaseFilesDetailsVo();
+        BaseFiles baseFiles = fetchBySid(sid);
+        BeanUtil.copyProperties(baseFiles, vo);
+        if (StringUtils.isNotBlank(baseFiles.getSample())) {
+            String filePath = baseFiles.getSample();
+            List<String> filePaths = new ArrayList<>();
+            String array[] = filePath.split(",");
+            for (int i = 0; i < array.length; i++) {
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                filePath = urlPrefix + array[i];
+                filePaths.add(filePath);
+                vo.setFiles(filePaths);
+            }
+        }
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param sids
+     * @return
+     */
+    public ResultBean deleteBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            int count = baseMapper.updateBySidDelete(sid);
+            if (count == 0) {
+                return rb.setMsg("删除失败");
+            }
+        }
+        return ResultBean.fireSuccess().setMsg("删除成功");
+    }
+
+    /**
+     * 生成文件编号
+     *
+     * @param busTypeKey
+     * @return
+     */
+    public ResultBean<String> createFileNo(String busTypeKey) {
+        ResultBean rb = ResultBean.fireFail();
+        String fileNo = baseMapper.createFileNo(busTypeKey);
+        String finNo = "";
+        if (StringUtils.isNotBlank(fileNo)) {
+            String substringFileNo = fileNo.substring(busTypeKey.length());
+            int parseInt = Integer.parseInt(substringFileNo);
+            if (parseInt >= 999) {
+                int i = Integer.parseInt(substringFileNo);
+                int finalNo = i + 1;
+                String value = String.valueOf(finalNo);
+                finNo = busTypeKey + value;
+            } else {
+                String countNo = substringFileNo.substring(substringFileNo.lastIndexOf('0') + 1, substringFileNo.length());
+                int i = Integer.parseInt(countNo);
+                int finalNo = i + 1;
+                String value = String.valueOf(finalNo);
+                if (i == 99) {
+                    finNo = busTypeKey + value;
+                } else if (i < 99 && i >= 9) {
+                    finNo = busTypeKey + "0" + value;
+                } else if (i < 9) {
+                    finNo = busTypeKey + "00" + value;
+                }
+            }
+        } else {
+            finNo = busTypeKey + "001";
+        }
+        return rb.success().setData(finNo);
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2678,7 +2678,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         String staffSid = sysUserVo.getStaffSid();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
-        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
         qw.eq("staffSid", staffSid);
         qw.eq("orgSid", sysOrganizationVo.getSid());
         ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), params.getOrgPath());
@@ -2695,29 +2694,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         IPage<CommonContract> page = PagerUtil.queryToPage(query);
         IPage<CommonContractVo> pagging = baseMapper.selectByStaffSid(page, qw);
         List<CommonContractVo> records = pagging.getRecords();
-        List<CommonContractVo> recordsNew = new ArrayList<>();
         for (CommonContractVo record : records) {
             String createDate = record.getCreateDate();
             DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
             createDate = DateUtil.formatDate(dateTime);
             record.setCreateDate(createDate);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
-            if (!"已办结".equals(busSalesOrder.getNodeState()) || !"2".equals(busSalesOrder.getFinancePlan())) {
-                continue;
-            }
             record.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             record.setSaleTypeValue(busSalesOrder.getPayType());
-            BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery();
-            busVehicleQKKPQuery.setContractNo(record.getContractNo());
-            List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData();
-            if (busVehicleQKKPVos != null) {
-                if (busVehicleQKKPVos.size() != 0) {
-                    recordsNew.add(record);
-                }
         }
-        }
-        pagging.setRecords(recordsNew);
-        pagging.setTotal(recordsNew.size());
         PagerVo<CommonContractVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
@@ -2763,19 +2748,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         qw.orderByDesc("createDate");
         IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
         IPage<ContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
-        if (params.getStateType() == 2) {
-            List<ContractPageVo> records = iPage.getRecords();
-            List<ContractPageVo> recordsNew = new ArrayList<>();
-            if (records != null) {
-                for (ContractPageVo record : records) {
-                    Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractId()).getData();
-                    if (aBoolean){
-                        recordsNew.add(record);
-                    }
-                }
-            }
-            iPage.setRecords(recordsNew);
-        }
         return iPage;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -321,7 +321,7 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean<List<String>> selectBusinessSid(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
 
-    @ApiOperation("欠款开票三方金融-外部金融已审核通过的业务sid")
+    @ApiOperation("欠款开票三方金融已审核通过的业务sid")
     @GetMapping("/selectBusinessSidByQKKP")
     @ResponseBody
     ResultBean<List<String>> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("useOrgSid") String useOrgSid);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -87,6 +87,10 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/appVehicleQKKPList")
     ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query);
 
+    @ApiOperation("移动端-欠款开票选择车辆列表2")
+    @PostMapping("/appVehicleQKKPList2")
+    ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(@RequestBody BusVehicleQKKPQuery query);
+
     @ApiOperation("移动端欠款提车选择车辆")
     @PostMapping("/getCanUseCars")
     ResultBean<List<QCarVo>> getCanUseCars(@RequestBody QCarQuery query);
@@ -116,8 +120,4 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/selectListByvinNo")
     @ResponseBody
     ResultBean<List<String>> selectListByvinNo(@RequestParam("vinNo") String vinNo);
-
-    @ApiOperation("移动端-欠款开票选择车辆列表2")
-    @PostMapping("/appVehicleQKKPList2")
-    ResultBean<Boolean> appVehicleQKKPList2(@RequestParam("contractNo") String contractNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -78,6 +78,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<QCarVo>> getCanUseCars(QCarQuery query) {
         return null;
@@ -108,9 +113,4 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
-    @Override
-    public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) {
-        return null;
-    }
-
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -509,23 +509,43 @@
     </select>
 
     <select id="selectBusinessSid" resultType="java.lang.String">
-        select distinct bo.sid
+       <!-- select distinct bo.sid
         from bus_sales_order bo
         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+        left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-            and bo.financePlan = '2'
+            and ls.typeKey = '02'
             and length(bv.linkSid)>0
-        </where>
+        </where>-->
+        SELECT DISTINCT
+        bo.sid
+        FROM
+        anrui_base.base_vehicle_state bs
+        LEFT JOIN bus_sales_order bo ON bo.sid = bs.saleOrderSid
+        LEFT JOIN bus_sales_order_vehicle bv ON bv.salesOrderSid = bo.sid
+        WHERE
+        bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid}
+        and bs.finSourceKey = '2'
+        AND length( bv.linkSid )> 0
+        AND bs.finState = '0'
+        AND bs.carryVehicleState = '0'
+        and bs.busState = '401'
     </select>
 
     <select id="selectQKBusinessSid" resultType="java.lang.String">
-        select sid
-        from bus_sales_order
-        where createBySid = #{userSid}
-          and useOrgSid = #{useOrgSid}
-          and nodeState = '已办结'
-          and financePlan = '2'
+        SELECT DISTINCT bo.sid
+        FROM anrui_base.base_vehicle_state bs
+                     JOIN bus_sales_order bo
+                ON bs.saleOrderSid = bo.`sid`
+        WHERE bo.createBySid = #{userSid}
+          AND bo.useOrgSid = #{useOrgSid}
+          AND bs.finSourceKey = '2'
+          AND bs.finState = '0'
+          AND bs.carryVehicleState = '0'
+          AND bs.carryInvoiceState = '0'
+          AND bs.busState = '401'
+          AND bs.vinNo != ''
     </select>
 
     <select id="selectByContractNoToVin" resultType="java.lang.String">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1505,7 +1505,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                     }
                 }
-
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
                         //极光推送
                         MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                         MessageFlowVo messageFlowVo = new MessageFlowVo();
@@ -1529,6 +1535,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         messageFlowableQuery.setMsgTitle("销售订单");
                         ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
 
                 return rb.success();
             }
@@ -4887,9 +4898,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrderOne.getSid()).getData();
                                 if(loanSolutions != null){
                                     if(StringUtils.isBlank(loanSolutions.getTypeKey())){
-                                        baseVehicleStateDto.setFinSourceKey("4");
+                                        baseVehicleStateDto.setFinSourceKey("4");//担保
                                     }else{
-                                        baseVehicleStateDto.setFinSourceKey("3");
+                                        baseVehicleStateDto.setFinSourceKey("3");//自营非担保
                                     }
                                 }
                             }else{
@@ -4899,9 +4910,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                     if(loanSolutions != null){
                                         if(StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
                                             if("02".equals(loanSolutions.getTypeKey())){
-                                                baseVehicleStateDto.setFinSourceKey("2");
+                                                baseVehicleStateDto.setFinSourceKey("2");//三方金融
                                             }else{
-                                                baseVehicleStateDto.setFinSourceKey("3");
+                                                baseVehicleStateDto.setFinSourceKey("3");//自营非担保
                                             }
                                         }
                                     }
@@ -5416,7 +5427,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String contractSid = baseMapper.selectBySid(busSalesOrder.getSid());
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
-            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
+            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())?new BigDecimal(solutionsDetailsVo.getDiscountCar()):new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
             List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
@@ -7042,7 +7053,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         //查询已提交申请的欠款提车车辆
-        ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+      /*  ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
         resultBean.getData().removeAll(Collections.singleton(null));
         if (!resultBean.getData().isEmpty()) {
             List<String> stringList = new ArrayList<>();
@@ -7054,7 +7065,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (busSalesOrderVehicle != null) {
                     stringList.add(busSalesOrderVehicle.getSid());
                 }
-
             }
             stringList.removeAll(Collections.singleton(null));
             if (!stringList.isEmpty()) {
@@ -7066,7 +7076,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (!listResultBean.getData().isEmpty()) {
             listResultBean.getData().removeAll(Collections.singleton(null));
             qw.notIn("bv.sid", listResultBean.getData());
-        }
+        }*/
         List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw);
         stringList.removeAll(Collections.singleton(null));
         return rb.success().setData(stringList);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -119,6 +119,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
+    List<BusVehicleQKKPVo> appVehicleQKKPList2(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
     List<QCarVo> getCanUseCars(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     IPage<QCarVo> selectPageVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -101,10 +101,14 @@
     <select id="selectByNoAndVinSidsNew"
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.linkSid, bv.sid, bv.linkNo
-        from (select busSid from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = 1)) as bs
+        from (select busSid
+              from anrui_base.base_vehicle_state
+              where busState = '401'
+                and (finState = '1' or carryVehicleState = 1)) as bs
                      left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
                      left join bus_sales_order bo on bo.sid = bv.salesOrderSid
-        where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
+        where length(bv.linkSid) > 0
+          and bo.contractNo = #{contractNo}
     </select>
 
     <select id="appVehicleQKKPList" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo">
@@ -121,7 +125,7 @@
     </select>
 
     <select id="getCanUseCars" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo">
-        select bv.linkNo as vin,
+       <!-- select bv.linkNo as vin,
         bv.linkSid carSid,
         bm.finalPrice as price,
         bv.sid busVinSid,
@@ -133,6 +137,26 @@
         <where>
             ${ew.sqlSegment}
             and length(bv.linkSid)>0
+        </where>-->
+        SELECT
+        bv.linkNo AS vin,
+        bv.linkSid carSid,
+        bm.finalPrice AS price,
+        bv.sid busVinSid,
+        bo.contractNo,
+        bo.customerName
+        FROM
+        bus_sales_order_vehicle bv
+        LEFT JOIN bus_sales_order bo ON bo.sid = bv.salesOrderSid
+        LEFT JOIN bus_sales_order_model bm ON bo.sid = bm.salesOrderSid
+        LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
+        <where>
+            ${ew.sqlSegment}
+        AND bs.finSourceKey = '2'
+        AND length( bv.linkSid )> 0
+        AND bs.finState = '0'
+        AND bs.carryVehicleState = '0'
+        AND bs.busState = '401'
         </where>
     </select>
 
@@ -146,9 +170,14 @@
         from bus_sales_order_vehicle bv
         left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid
+        LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
         <where>
             ${ew.sqlSegment}
-            and length(bv.linkSid)>0
+            AND bs.finSourceKey = '2'
+            AND length( bv.linkSid )> 0
+            AND bs.finState = '0'
+            AND bs.carryVehicleState = '0'
+            AND bs.busState = '401'
         </where>
     </select>
 
@@ -164,4 +193,27 @@
         from bus_sales_order_vehicle
         WHERE `linkNo` LIKE "%"#{vinNo}"%"
     </select>
+
+    <select id="appVehicleQKKPList2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo">
+        SELECT
+        bsov.linkNo AS vinNo,
+        bsov.`linkSid` AS vehSid,
+        bso.`customerName`,
+        bso.`contractNo`
+        FROM
+        bus_sales_order_vehicle bsov
+        JOIN bus_sales_order bso
+        ON bsov.`salesOrderSid` = bso.`sid`
+        JOIN anrui_base.base_vehicle_state bs
+        ON bsov.sid = bs.busSid
+        <where>
+            ${ew.sqlSegment}
+            AND bs.finSourceKey = '2'
+            AND bs.finState = '0'
+            AND bs.carryVehicleState = '0'
+            AND bs.carryInvoiceState = '0'
+            AND bs.busState = '401'
+            AND bs.vinNo != ''
+        </where>
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -89,6 +89,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.appVehicleQKKPList(query);
     }
 
+    @Override
+    public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) {
+        return busSalesOrderVehicleService.appVehicleQKKPList2(query);
+    }
+
     @Override
     public ResultBean<List<QCarVo>> getCanUseCars(QCarQuery query) {
         return busSalesOrderVehicleService.getCanUseCars(query);
@@ -123,8 +128,5 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectListByvinNo(vinNo);
     }
 
-    @Override
-    public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) {
-        return busSalesOrderVehicleService.appVehicleQKKPList2(contractNo);
-    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -294,6 +294,61 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByOrderSid(saleOrderSid);
     }
 
+    public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        qw.eq("bso.contractNo", query.getContractNo());
+        if (query.getVinSids() != null) {
+            if (query.getVinSids().size() > 0) {
+                qw.notIn("bsov.linkSid", query.getVinSids());
+            }
+        }
+        List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList2(qw);
+        List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
+        if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) {
+            for (BusVehicleQKKPVo record : busVehicleQKKPVos) {
+                //判断相同车辆是否存在已提交的申请
+                FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
+                if (finBillVehicleDetailsVo != null) {
+                    busVehicleQKKPVos.remove(record);
+                    if (busVehicleQKKPVos.size() == 0){
+                        break;
+                    }
+                }
+                String vehSid = record.getVehSid();
+                if (StringUtils.isNotBlank(vehSid)){
+                    BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData();
+                    if (busArrearsCarryVehicleApply != null){
+                        busVehicleQKKPVos.remove(record);
+                        if (busVehicleQKKPVos.size() == 0){
+                            break;
+                        }
+                    }
+                    BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData();
+                    if (baseVehicleCertificateVo != null) {
+                        record.setCertificateState(baseVehicleCertificateVo.getCertificateState());
+                        record.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                        List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                        record.setZcHgzImages(stringList);
+                    }
+                    TraliveredVo traliveredVo = baseTrailerFeign.trailerList(vehSid, query.getContractNo()).getData();
+                    List<TrailerVo> trailerVos = traliveredVo.getList();
+                    if (trailerVos != null && trailerVos.size() > 0) {
+                        for (TrailerVo trailerVo : trailerVos) {
+                            BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo();
+                            busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo());
+                            busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                            busVehicleQKKPTrailerVo.setOneBillMoney(trailerVo.getDealPrice());
+                            busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo);
+                            record.setTrailers(busVehicleQKKPTrailerVos);
+                        }
+                    }
+                }
+            }
+        }
+        return rb.success().setData(busVehicleQKKPVos);
+    }
+
     public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(BusVehicleQKKPQuery query) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
@@ -369,7 +424,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("bv.linkNo", query.getVinNo());
         }
-        //查询已提交申请的欠款提车车辆
+       /* //查询已提交申请的欠款提车车辆
         ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
         if (!resultBean.getData().isEmpty()) {
             resultBean.getData().removeAll(Collections.singleton(null));
@@ -384,7 +439,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (!listResultBean.getData().isEmpty()) {
             listResultBean.getData().removeAll(Collections.singleton(null));
             qw.notIn("bv.sid", listResultBean.getData());
-        }
+        }*/
         List<QCarVo> list = baseMapper.getCanUseCars(qw);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
@@ -435,7 +490,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
             qw.like("bv.linkNo", params.getVinNo());
         }
         //查询已提交申请的欠款提车车辆
-        ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+       /* ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
         if (!resultBean.getData().isEmpty()) {
             resultBean.getData().removeAll(Collections.singleton(null));
             List<String> vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList());
@@ -449,7 +504,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (!listResultBean.getData().isEmpty()) {
             listResultBean.getData().removeAll(Collections.singleton(null));
             qw.notIn("bv.sid", listResultBean.getData());
-        }
+        }*/
         IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
         List<QCarVo> list = pagging.getRecords();
@@ -517,20 +572,4 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
 
         return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid);
     }
-
-    public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) {
-        ResultBean rb = ResultBean.fireFail();
-        Boolean i = false;
-        BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo);
-        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(busSalesOrder.getSid());
-        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-            String sid = busSalesOrderVehicle.getSid();
-            BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneQKKPByBusSid(sid).getData();
-            if (baseVehicleState != null){
-                i = true;
-                break;
-            }
-        }
-        return rb.success().setData(i);
-    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java

@@ -31,4 +31,9 @@ public interface FlowFeign {
     @PostMapping(value = "/handleProsess")
     @ResponseBody
     ResultBean<UpdateFlowFieldVo> handleProsess(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "驳回流程")
+    @PostMapping(value = "/taskReject")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> taskReject(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java

@@ -100,5 +100,10 @@ public class FlowRest implements FlowFeign {
         return updateFlowFieldVoResultBean;
     }
 
+    @Override
+    public ResultBean<UpdateFlowFieldVo> taskReject(FlowTaskVo fl) {
+        return flowService.taskReject(fl);
+    }
+
 
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -134,6 +134,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
 
     /**
      * 根据业务参数取流程流转的环节 信息
+     *
      * @param bv
      * @return
      */
@@ -273,6 +274,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
 
     /**
      * 启动流程
+     *
      * @param bv
      * @return
      */
@@ -426,6 +428,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
 
     /**
      * 办理
+     *
      * @param bv
      * @param b
      * @return
@@ -746,4 +749,26 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
     }
 
 
+    public ResultBean<UpdateFlowFieldVo> taskReject(FlowTaskVo fl) {
+        ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
+        UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
+        //获取表单中的参数
+        Map<String, Object> formVariables = fl.getValues();
+        formVariables = formVariables == null ? new HashMap<>() : formVariables;
+        formVariables.put("businessSid", fl.getBusinessSid());
+        //当前任务task
+        Task task = taskService.createTaskQuery().taskId(fl.getTaskId()).singleResult();
+        if (task.isSuspended()) {
+            return rb.setMsg("任务处于挂起状态");
+        }
+        // 获取流程定义信息
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+        // 获取所有节点信息
+        Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0);
+        // 获取全部节点列表，包含子节点
+        Collection<FlowElement> allElements = FlowableUtils.getAllElements(process.getFlowElements(), null);
+
+
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -72,6 +72,11 @@ public interface LoanHomevisitInvestigateFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> listPage(@RequestBody PagerQuery<LoanHomevisitInvestigateQuery> pq);
 
+    @ApiOperation("家访资料审核")
+    @PostMapping("/homeInforListPage")
+    @ResponseBody
+    public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> homeInforListPage(@RequestBody PagerQuery<LoanHomevisitInvestigateQuery> pq);
+
     @ApiOperation("是否通过")
     @PostMapping("/isPassThrough")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -65,6 +65,11 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 		return rb.setMsg("接口anrui-riskcenter/loanhomevisitinvestigate/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> homeInforListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean isPassThrough(String sid, String pass) {
 		return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java

@@ -76,6 +76,7 @@ public class LoanHomevisitInvestigateQuery implements Query {
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuSid;
+    private String menuUrl;
     private String type;
     private String names;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java

@@ -28,6 +28,8 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo {
     private List<String> guarantorIdCard;
     @ApiModelProperty("担保人户口本")
     private List<String> guarantorAccount;
+    @ApiModelProperty("是否有配偶")
+    private Boolean spouseState = true;
     @ApiModelProperty("家访考察表sid")
     private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java

@@ -62,7 +62,7 @@ public interface LoanHomevisitPrepFeign {
     public ResultBean<PagerVo<LoanHomevisitPrepVo>> listPage(@RequestBody PagerQuery<LoanHomevisitPrepQuery> pq);
 
     @ApiOperation("准备完毕")
-    @PostMapping("/visit")
+    @GetMapping("/visit")
     @ResponseBody
     public ResultBean visit(@RequestParam("sid") String sid);
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java

@@ -67,6 +67,8 @@ public class LoanHomevisitPrepQuery implements Query {
     private String loanPeoName;
 	@ApiModelProperty("资方名称")
     private String capitalName;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
 	@ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuUrl;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.riskcenter.api.loanhomevisitprep;
 
 
+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-riskcenter(家访准备) <br/>
  * File: LoanHomevisitPrepVo.java <br/>
@@ -51,8 +54,11 @@ public class LoanHomevisitPrepVo implements Vo {
 
     private String sid;
 
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
     @ApiModelProperty("订单日期")
-    private String createDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createDate;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
     @ApiModelProperty("销售部门名称")
@@ -69,4 +75,6 @@ public class LoanHomevisitPrepVo implements Vo {
     private String mobile;
     @ApiModelProperty("资方名称")
     private String bankName;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameter.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+@ApiModel(value = "风控参数", description = "风控参数")
+@TableName("loan_parameter")
+public class LoanParameter extends BaseEntity {
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("使用组织全路径")
+    private String orgSidPath;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDetailsVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/21 9:13
+ */
+@Data
+public class LoanParameterDetailsVo implements Vo {
+    private String sid;
+    private String remarks;
+    private String userSid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("使用组织全路径")
+    private String orgPath;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDto.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/21 9:12
+ */
+@Data
+public class LoanParameterDto implements Dto {
+
+    private String sid;
+    private String remarks;
+    private String userSid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("使用组织全路径")
+    private String orgPath;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java

@@ -0,0 +1,53 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyApplyQuery;
+import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyApplyVo;
+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.*;
+
+
+/**
+ * @description: 风控参数
+ * @author: fan
+ * @date: 2023/7/6
+ **/
+@Api(tags = "风控参数")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanParameter",
+        name = "anrui-riskcenter",
+        path = "v1/loanparameter",
+        fallback = LoanParameterFeignFallback.class)
+public interface LoanParameterFeign {
+
+    /**
+     * 根据条件分页查询数据的列表（已测试）
+     *
+     * @param pq
+     */
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanParameterVo>> listPage(@RequestBody PagerQuery<LoanParameterQuery> pq);
+
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public ResultBean saveOrUpdateParameter(@RequestBody LoanParameterDto dto);
+
+    @ApiOperation("批量删除")
+    @DeleteMapping("/deleteBySids")
+    @ResponseBody
+    public ResultBean deleteBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<LoanParameterDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+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;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:36
+ */
+@Component
+public class LoanParameterFeignFallback implements LoanParameterFeign {
+    @Override
+    public ResultBean<PagerVo<LoanParameterVo>> listPage(PagerQuery<LoanParameterQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOrUpdateParameter(LoanParameterDto dto) {
+        return null;
+    }
+
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanParameterDetailsVo> fetchDetailsBySid(String sid) {
+        return null;
+    }
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterQuery.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 15:05
+ */
+@Data
+public class LoanParameterQuery implements Query {
+
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.riskcenter.api.loanparameter;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 15:04
+ */
+@Data
+public class LoanParameterVo implements Vo {
+    private String sid;
+    @ApiModelProperty("参数编码")
+    private String parameterNo;
+    @ApiModelProperty("参数名称")
+    private String parameterName;
+    @ApiModelProperty("参数值")
+    private String parameterValue;
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java

@@ -75,6 +75,13 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 		return rb.success().setData(pv);
 	}
 
+	@Override
+	public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> homeInforListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<LoanHomevisitInvestigateVo> pv = loanHomevisitInvestigateService.homeInforListPage(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	public ResultBean isPassThrough(String sid, String pass) {
 		return loanHomevisitInvestigateService.isPassThrough(sid,pass);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -190,6 +190,87 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         return p;
     }
 
+    public PagerVo<LoanHomevisitInvestigateVo> homeInforListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
+        LoanHomevisitInvestigateQuery query = pq.getParams();
+        QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
+        qw.eq("li.state", query.getType());
+        qw.eq("bb.busNo", 303);
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgSidPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgSidPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("bo.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<LoanHomevisitInvestigateVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<LoanHomevisitInvestigateVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("bo.useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getSaleDeptName())) {
+            qw.like("bo.orgName", query.getSaleDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getStaffName())) {
+            qw.like("bo.staffName", query.getStaffName());
+        }
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("bo.contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getLoanPeoName())) {
+            qw.like("bb.borrowerName", query.getLoanPeoName());
+        }
+        if (StringUtils.isNotBlank(query.getPolicyName())) {
+            qw.like("bb.policyName", query.getPolicyName());
+        }
+        if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
+            qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
+        }
+        String orderStartDate = query.getOrderStartDate();
+        String orderEndDate = query.getOrderEndDate();
+        qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')"
+                );
+        String resHomeVisStartDate = query.getResHomeVisStartDate();
+        String resHomeVisEndDate = query.getResHomeVisEndDate();
+        qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
+                );
+        IPage<LoanHomevisitInvestigate> page = PagerUtil.queryToPage(pq);
+        IPage<LoanHomevisitInvestigateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanHomevisitInvestigateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public void saveOrUpdateDto(LoanHomevisitInvestigateDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo">
         SELECT
         lp.`sid`,
+        lp.saleOrderSid,
         bo.createDate,
         bo.`useOrgName`,
         bo.`orgName`,
@@ -14,7 +15,8 @@
         bb.`vehCount`,
         bb.`borrowerName`,
         bb.`mobile`,
-        bb.`bankName`
+        bb.`bankName`,
+        bb.policyName
         FROM
         loan_homevisit_prep lp
         LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -130,6 +130,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         if (StringUtils.isNotBlank(query.getCapitalName())) {
             qw.like("bb.bankName", query.getCapitalName());
         }
+        if (StringUtils.isNotBlank(query.getPolicyName())) {
+            qw.like("bb.policyName", query.getPolicyName());
+        }
         String orderStartDate = query.getOrderStartDate();
         String orderEndDate = query.getOrderEndDate();
         qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.riskcenter.biz.loanparameter;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.loanparameter.LoanParameter;
+import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Mapper
+public interface LoanParameterMapper extends BaseMapper<LoanParameter> {
+
+    IPage<LoanParameterVo> listPage(IPage<LoanParameter> page, @Param(Constants.WRAPPER) QueryWrapper<LoanParameter> qw);
+
+    int updateBySidDelete(String sid);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml

@@ -0,0 +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.riskcenter.biz.loanparameter.LoanParameterMapper">
+    <update id="updateBySidDelete">
+        update loan_parameter
+        set isDelete = 1
+        where sid = #{sid}
+    </update>
+
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo">
+        SELECT sid,
+        parameterNo,
+        parameterName,
+        parameterValue,
+        remarks
+        from loan_parameter
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.riskcenter.biz.loanparameter;
+
+
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
+import com.yxt.anrui.riskcenter.api.loanparameter.*;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Api(tags = "风控参数")
+@RestController
+@RequestMapping("v1/loanparameter")
+public class LoanParameterRest implements LoanParameterFeign {
+
+    @Autowired
+    private LoanParameterService parameterService;
+
+    @Override
+    public ResultBean<PagerVo<LoanParameterVo>> listPage(PagerQuery<LoanParameterQuery> pq) {
+        ResultBean<PagerVo<LoanParameterVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanParameterVo> pv = parameterService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean saveOrUpdateParameter(LoanParameterDto dto) {
+        return parameterService.saveOrUpdateParameter(dto);
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return parameterService.deleteBySids(sids);
+    }
+
+    @Override
+    public ResultBean<LoanParameterDetailsVo> fetchDetailsBySid(String sid) {
+        return parameterService.fetchDetailsBySid(sid);
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java

@@ -0,0 +1,148 @@
+package com.yxt.anrui.riskcenter.biz.loanparameter;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loanparameter.*;
+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.Collections;
+import java.util.List;
+
+
+/**
+ * @description:
+ * @author: fan
+ * @date: 2023/8/21
+ **/
+@Service
+public class LoanParameterService extends MybatisBaseService<LoanParameterMapper, LoanParameter> {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+    public PagerVo<LoanParameterVo> listPage(PagerQuery<LoanParameterQuery> pq) {
+        IPage<LoanParameter> page = PagerUtil.queryToPage(pq);
+        LoanParameterQuery pagerQuery = pq.getParams();
+        QueryWrapper<LoanParameter> qw = new QueryWrapper<>();
+        //=======================
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
+        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+        privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
+        privilegeQuery.setUserSid(pagerQuery.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = pagerQuery.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("createBySid", pagerQuery.getUserSid());
+            } else {
+                PagerVo<LoanParameterVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<LoanParameterVo> p = new PagerVo<>();
+            return p;
+        }
+        //=======================
+        //参数编码
+        if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) {
+            qw.like("parameterNo", pagerQuery.getParameterNo());
+        }
+        //参数名称
+        if (StringUtils.isNotBlank(pagerQuery.getParameterName())) {
+            qw.like("parameterName", pagerQuery.getParameterName());
+        }
+        qw.eq("isDelete", 0);
+        qw.orderByDesc("createTime");
+        IPage<LoanParameterVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<LoanParameterVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateParameter(LoanParameterDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            LoanParameter loanParameter = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, loanParameter, "id", "sid");
+            baseMapper.updateById(loanParameter);
+        } else {
+            LoanParameter loanParameter = new LoanParameter();
+            BeanUtil.copyProperties(dto, loanParameter, "id", "sid");
+            loanParameter.setOrgSidPath(dto.getOrgPath());
+            loanParameter.setCreateBySid(dto.getUserSid());
+            ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath());
+            if (orgSidByPath.getSuccess()) {
+                String userOrgSid = orgSidByPath.getData();
+                loanParameter.setUseOrgSid(userOrgSid);
+                ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
+                if (organizationVo.getSuccess()) {
+                    SysOrganizationVo organizationVoData = organizationVo.getData();
+                    if (null != organizationVoData) {
+                        loanParameter.setUseOrgName(organizationVoData.getName());
+                    }
+                }
+            }
+            baseMapper.insert(loanParameter);
+        }
+        return rb.success();
+    }
+
+    public ResultBean deleteBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            int count = baseMapper.updateBySidDelete(sid);
+            if (count == 0) {
+                return rb.setMsg("删除失败");
+            }
+        }
+        return ResultBean.fireSuccess().setMsg("删除成功");
+    }
+
+    public ResultBean<LoanParameterDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean<LoanParameterDetailsVo> rb = ResultBean.fireFail();
+        LoanParameterDetailsVo vo = new LoanParameterDetailsVo();
+        LoanParameter loanParameter = fetchBySid(sid);
+        BeanUtil.copyProperties(loanParameter, vo);
+        vo.setUserSid(loanParameter.getCreateBySid());
+        vo.setOrgPath(loanParameter.getOrgSidPath());
+        return rb.success().setData(vo);
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java

@@ -11,7 +11,7 @@ public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo {
 
     private String sid;
     @ApiModelProperty("银行卡")
-    private List<String> yhkImages;
+    private List<String> bankCardProperty;
     @ApiModelProperty("房产")
     private List<String> houseProperty;
     @ApiModelProperty("车辆")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java

@@ -11,7 +11,7 @@ public class AppLoanHomeVisitInvestigateSaveZCLDto implements Vo {
 
     private String sid;
     @ApiModelProperty("银行卡")
-    private List<String> yhkImages;
+    private List<String> bankCardProperty;
     @ApiModelProperty("房产")
     private List<String> houseProperty;
     @ApiModelProperty("车辆")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

@@ -97,7 +97,7 @@ public class AppRovalService {
         BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery();
         busVehicleQKKPQuery.setContractNo(query.getContractNo());
         busVehicleQKKPQuery.setVinSids(query.getVinSids());
-        List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData();
+        List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList2(busVehicleQKKPQuery).getData();
         for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) {
             AppVehicleQKKPVo appVehicleQKKPVo = new AppVehicleQKKPVo();
             VinListVo vinListVo = new VinListVo();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -261,6 +261,7 @@ public class LoanHomeVisitInvestigateService {
         LoanHomeVisitInvestigateInitZCLVo data = loanHomevisitInvestigateFeign.getAssetCertificateInfo(sid).getData();
         AppLoanHomeVisitInvestigateInitZCLVo appLoanHomeVisitInvestigateInitZCLVo = new AppLoanHomeVisitInvestigateInitZCLVo();
         BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitZCLVo);
+        appLoanHomeVisitInvestigateInitZCLVo.setBankCardProperty(data.getYhkImages());
         return rb.success().setData(appLoanHomeVisitInvestigateInitZCLVo);
     }
 
@@ -268,6 +269,7 @@ public class LoanHomeVisitInvestigateService {
         ResultBean rb = ResultBean.fireFail();
         LoanHomeVisitInvestigateSaveZCLDto loanHomeVisitInvestigateInitZCLDto = new LoanHomeVisitInvestigateSaveZCLDto();
         BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZCLDto);
+        loanHomeVisitInvestigateInitZCLDto.setYhkImages(dto.getBankCardProperty());
         loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto);
         return rb.success();
     }