Merge remote-tracking branch 'origin/master'

2 years ago · 5cb7511795
35 changed files with 1772 additions and 147 deletions
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
@ -89,6 +89,11 @@ public interface BusSalesOrderFeign {
    @ResponseBody
    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(@PathVariable("contractNo") String contractNo);

+    @ApiOperation("根据sid获取一条数据")
+    @GetMapping("/fetchBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BusSalesOrder> fetchBySid(@PathVariable("sid") String sid);
+
    @ApiOperation("编辑初始化")
    @GetMapping("/fetchDetailsBySid/{sid}")
    @ResponseBody
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
@ -80,6 +80,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
        return null;
    }

+    @Override
+    public ResultBean<BusSalesOrder> fetchBySid(String sid) {
+        return null;
+    }
+
    @Override
    public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(String sid) {
        ResultBean rb = ResultBean.fireFail();
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@ -512,11 +512,9 @@
        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 lo on lo.salesOrderSid = bo.sid
        <where>
            ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-           <!-- and bo.financePlan = '2'-->
-            and (lo.typeKey = '01' or lo.typeKey = '02')
+            and bo.financePlan = '2'
            and length(bv.linkSid)>0
        </where>
    </select>
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
@ -118,6 +118,13 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
        return busSalesOrderService.fetchByContractNo(contractNo);
    }

+    @Override
+    public ResultBean<BusSalesOrder> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid);
+        return rb.success().setData(busSalesOrder);
+    }
+
    /**
     * 销售订单初始化
     *
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@ -6246,13 +6246,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
    public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
        ResultBean rb = ResultBean.fireFail();
        BusSalesOrder busSalesOrder = fetchBySid(orderFlowableQuery.getBusinessSid());
+        if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType()) || (com.yxt.common.base.utils.StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
+            if(com.yxt.common.base.utils.StringUtils.isBlank(orderFlowableQuery.getPurchaseSystemSid())){
+                return rb.setMsg("采购系统不能为空");
+            }
+        }
        BusinessVariables bv = new BusinessVariables();
        BeanUtil.copyProperties(orderFlowableQuery, bv);
 //        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
        bv.setModelId(busSalesOrder.getProcDefId());
        ResultBean resultBean = complete(bv);
        if (resultBean.getSuccess()) {
-            if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType())) {
+            if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType()) || (com.yxt.common.base.utils.StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
                //更新销售订单的采购系统
                //根据销售订单sid更新采购系统sid和采购系统名称
                String purchaseSystemName = orderFlowableQuery.getPurchaseSystemName();
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@ -52,6 +52,7 @@ public enum ProcDefEnum {
    LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:1:2847504"),
    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"),
    LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
+    LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"),

    /******************************测试流程id*********************************************/

--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppeal.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppeal.java
@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+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-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppeal.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppeal <br/>
+ * Description: 家访考察申诉. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访考察申诉", description = "家访考察申诉")
+@TableName("loan_homevisit_appeal")
+public class LoanHomevisitAppeal extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("家访考察意见")
+    private String homeVisOpinion; // 家访考察意见
+	@ApiModelProperty("申诉原因")
+    private String appealReason; // 申诉原因
+	@ApiModelProperty("家访考察sid")
+    private String homeVisitSid; // 家访考察sid
+	@ApiModelProperty("申请编号")
+    private String billNo; // 申请编号
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstSid; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDetailsVo.java
@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+
+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-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo <br/>
+ * Description: 家访考察申诉 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访考察申诉 视图数据详情", description = "家访考察申诉 视图数据详情")
+public class LoanHomevisitAppealDetailsVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("家访考察结果")
+    private String investigateValue;
+	@ApiModelProperty("家访考察意见")
+    private String homeVisOpinion;
+	@ApiModelProperty("申诉原因")
+    private String appealReason;
+	@ApiModelProperty("家访考察sid")
+    private String homeVisitSid;
+	@ApiModelProperty("申请编号")
+    private String billNo;
+	@ApiModelProperty("流程定义的id")
+    private String procDefId;
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+	@ApiModelProperty("流程实例的sid")
+    private String procInstSid;
+	@ApiModelProperty("流程状态")
+    private String nodeState;
+	@ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("申诉附件")
+    private List<String> ssImages = new ArrayList<>();
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java
@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealDto.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDto <br/>
+ * Description: 家访考察申诉 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访考察申诉 数据传输对象", description = "家访考察申诉 数据传输对象")
+public class LoanHomevisitAppealDto implements Dto {
+
+    private String sid;
+
+	@ApiModelProperty("家访考察意见")
+    private String homeVisOpinion;
+	@ApiModelProperty("申诉原因")
+    private String appealReason;
+	@ApiModelProperty("家访考察sid")
+    private String homeVisitSid;
+	@ApiModelProperty("申请编号")
+    private String billNo;
+    @ApiModelProperty("申诉附件")
+    private List<String> ssImages = new ArrayList<>();
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealFeign.java
@ -0,0 +1,109 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealFeign.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign <br/>
+ * Description: 家访考察申诉. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "家访考察申诉")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanHomevisitAppeal",
+        name = "anrui-riskcenter",
+        path = "v1/loanhomevisitappeal",
+        fallback = LoanHomevisitAppealFeignFallback.class)
+public interface LoanHomevisitAppealFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<LoanHomevisitAppealVo>> listPage(@RequestBody PagerQuery<LoanHomevisitAppealQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody LoanHomevisitAppealDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid")
+    @ResponseBody
+    public ResultBean<LoanHomevisitAppealDetailsVo> fetchDetailsBySid(@RequestParam("sid") String sid, @RequestParam("type") String type);
+
+    @ApiOperation("信用审核申诉审批流程")
+    @PostMapping("/submitHomeAppeal")
+    public ResultBean submitHomeAppeal(@RequestBody @Valid SubmitHomeAppealDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody LoanHomeAppealCompleteDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<LoanHomeAppealNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap LoanHomeAppealNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<LoanHomeAppealNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap LoanHomeAppealNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean reject(@Valid @RequestBody LoanHomeAppealTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody LoanHomeAppealTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody LoanHomeAppealTaskQuery query);
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealFeignFallback.java
@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
+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-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeignFallback <br/>
+ * Description: 家访考察申诉. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LoanHomevisitAppealFeignFallback implements LoanHomevisitAppealFeign {
+
+    @Override
+    public ResultBean<PagerVo<LoanHomevisitAppealVo>> listPage(PagerQuery<LoanHomevisitAppealQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-riskcenter/loanhomevisitappeal/listPage无法访问");
+    }
+
+    @Override
+    public ResultBean save(LoanHomevisitAppealDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitappeal/save无法访问");
+    }
+
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitappeal/delBySids无法访问");
+    }
+
+    @Override
+    public ResultBean<LoanHomevisitAppealDetailsVo> fetchDetailsBySid(String sid, String type) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-riskcenter/loanhomevisitappeal/fetchDetailsBySid无法访问");
+    }
+
+    @Override
+    public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(LoanHomeAppealTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(LoanHomeAppealTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean reject(LoanHomeAppealTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<LoanHomeAppealNodeVo>> getNextNodesForSubmit(LoanHomeAppealNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<LoanHomeAppealNodeVo>> getPreviousNodesForReject(LoanHomeAppealNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(LoanHomeAppealCompleteDto query) {
+        return null;
+    }
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealQuery.java
@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealQuery.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery <br/>
+ * Description: 家访考察申诉 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访考察申诉 查询条件", description = "家访考察申诉 查询条件")
+public class LoanHomevisitAppealQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String saleDeptName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("订单开始日期")
+    private String orderStartDate;
+    @ApiModelProperty("订单结束日期")
+    private String orderEndDate;
+    @ApiModelProperty("预约家访开始时间")
+    private String resHomeVisStartDate;
+    @ApiModelProperty("预约家访结束时间")
+    private String resHomeVisEndDate;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("贷款人名称")
+    private String loanPeoName;
+    @ApiModelProperty("资方名称")
+    private String bankName;
+    @ApiModelProperty("家访专员姓名")
+    private String homeVisStaffName;
+    @ApiModelProperty("考察结果value")
+    private String investigateValue;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    private String menuSid;
+    private String type;
+    private String names;
+
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java
@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo <br/>
+ * Description: 家访考察申诉 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访考察申诉 视图数据对象", description = "家访考察申诉 视图数据对象")
+public class LoanHomevisitAppealVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("考察状态")
+    private String state;
+    @ApiModelProperty("订单日期")
+    private String createDate;
+    @ApiModelProperty("预约家访时间")
+    private String resHomeVisDate;
+    @ApiModelProperty("家访地点")
+    private String homeVisAddress;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String orgName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("贷款人名称")
+    private String borrowerName;
+    @ApiModelProperty("手机号码")
+    private String mobile;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
+    @ApiModelProperty("家访专员姓名")
+    private String homeVisStaffName;
+    @ApiModelProperty("考察结果value")
+    private String investigateValue;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealCompleteDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealCompleteDto.java
@ -0,0 +1,37 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 14:57
+ * @Description
+ */
+@Data
+public class LoanHomeAppealCompleteDto implements Dto {
+    private static final long serialVersionUID = 6378752532534735663L;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id(PC)")
+    private String instanceId;
+    @ApiModelProperty(value = "流程id(移动)")
+    private String procInsId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+
+    private String orgPath;
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealNodeQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealNodeQuery.java
@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:04
+ * @Description
+ */
+@Data
+public class LoanHomeAppealNodeQuery implements Query {
+    private static final long serialVersionUID = 9117613683840483366L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    private Integer next;
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealNodeVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealNodeVo.java
@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:03
+ * @Description
+ */
+@Data
+public class LoanHomeAppealNodeVo implements Vo {
+    private static final long serialVersionUID = -833419512294877848L;
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealTaskQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/LoanHomeAppealTaskQuery.java
@ -0,0 +1,48 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:06
+ * @Description
+ */
+@Data
+public class LoanHomeAppealTaskQuery implements Query {
+    private static final long serialVersionUID = 1288615499873178778L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id(PC)")
+    private String instanceId;
+
+    @ApiModelProperty("流程实例Id(移动)")
+    private String procInsId;
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/SubmitHomeAppealDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/flowable/SubmitHomeAppealDto.java
@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuguohui
+ * @version 1.0
+ * @description
+ * @date 2022/04/13
+ */
+@ApiModel("提交")
+@Data
+public class SubmitHomeAppealDto extends LoanHomevisitAppealDto {
+
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigate.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigate.java
@ -51,20 +51,20 @@ public class LoanHomevisitInvestigate extends BaseEntity {
    private static final long serialVersionUID = 1L;

 	@ApiModelProperty("预约家访时间")
-    private String resHomeVisDate; // 预约家访时间
+    private String resHomeVisDate;
 	@ApiModelProperty("家访地点")
-    private String homeVisAddress; // 家访地点
+    private String homeVisAddress;
 	@ApiModelProperty("家访专员用户sid")
-    private String homeVisUserSid; // 家访专员用户sid
+    private String homeVisUserSid;
 	@ApiModelProperty("家访专员姓名")
-    private String homeVisStaffName; // 家访专员姓名
+    private String homeVisStaffName;
 	@ApiModelProperty("考察结果key")
-    private String investigateKey; // 考察结果key
+    private String investigateKey;
 	@ApiModelProperty("考察结果value")
-    private String investigateValue; // 考察结果value
+    private String investigateValue;
 	@ApiModelProperty("销售订单sid")
-    private String saleOrderSid; // 销售订单sid
+    private String saleOrderSid;
 	@ApiModelProperty("销售订单贷款人表sid")
-    private String saleOrderBorrowerSid; // 销售订单贷款人表sid
+    private String saleOrderBorrowerSid;

 }
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsVo.java
@ -52,20 +52,20 @@ public class LoanHomevisitInvestigateDetailsVo implements Vo {
    private String sid; // sid

 	@ApiModelProperty("预约家访时间")
-    private String resHomeVisDate; // 预约家访时间
+    private String resHomeVisDate;
 	@ApiModelProperty("家访地点")
-    private String homeVisAddress; // 家访地点
+    private String homeVisAddress;
 	@ApiModelProperty("家访专员用户sid")
-    private String homeVisUserSid; // 家访专员用户sid
+    private String homeVisUserSid;
 	@ApiModelProperty("家访专员姓名")
-    private String homeVisStaffName; // 家访专员姓名
+    private String homeVisStaffName;
 	@ApiModelProperty("考察结果key")
-    private String investigateKey; // 考察结果key
+    private String investigateKey;
 	@ApiModelProperty("考察结果value")
-    private String investigateValue; // 考察结果value
+    private String investigateValue;
 	@ApiModelProperty("销售订单sid")
-    private String saleOrderSid; // 销售订单sid
+    private String saleOrderSid;
 	@ApiModelProperty("销售订单贷款人表sid")
-    private String saleOrderBorrowerSid; // 销售订单贷款人表sid
+    private String saleOrderBorrowerSid;

 }
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDto.java
@ -49,23 +49,23 @@ import lombok.Data;
@ApiModel(value = "家访考察 数据传输对象", description = "家访考察 数据传输对象")
 public class LoanHomevisitInvestigateDto implements Dto {

-    private String sid; // sid
+    private String sid;

 	@ApiModelProperty("预约家访时间")
-    private String resHomeVisDate; // 预约家访时间
+    private String resHomeVisDate;
 	@ApiModelProperty("家访地点")
-    private String homeVisAddress; // 家访地点
+    private String homeVisAddress;
 	@ApiModelProperty("家访专员用户sid")
-    private String homeVisUserSid; // 家访专员用户sid
+    private String homeVisUserSid;
 	@ApiModelProperty("家访专员姓名")
-    private String homeVisStaffName; // 家访专员姓名
+    private String homeVisStaffName;
 	@ApiModelProperty("考察结果key")
-    private String investigateKey; // 考察结果key
+    private String investigateKey;
 	@ApiModelProperty("考察结果value")
-    private String investigateValue; // 考察结果value
+    private String investigateValue;
 	@ApiModelProperty("销售订单sid")
-    private String saleOrderSid; // 销售订单sid
+    private String saleOrderSid;
 	@ApiModelProperty("销售订单贷款人表sid")
-    private String saleOrderBorrowerSid; // 销售订单贷款人表sid
+    private String saleOrderBorrowerSid;

 }
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java
@ -186,12 +186,4 @@ public interface LoanHomevisitInvestigateFeign {
    @PostMapping("/saveAssetCertificateInfo")
    @ResponseBody
    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZCLDto dto);
-
-    /******************************************************家访进度*******************************************************/
-
-    @ApiOperation("家访进度分页列表")
-    @PostMapping("/jfjdListPage")
-    @ResponseBody
-    public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(@RequestBody PagerQuery<LoanHomevisitInvestigateQuery> pq);
-
 }
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java
@ -41,6 +41,8 @@ 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-riskcenter(家访考察) <br/>
 * File: LoanHomevisitInvestigateFeignFallback.java <br/>
@ -178,9 +180,4 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
 		return null;
 	}
-
-	@Override
-	public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
-		return null;
-	}
 }
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java
@ -69,14 +69,10 @@ public class LoanHomevisitInvestigateQuery implements Query {
    private String contractNo;
    @ApiModelProperty("贷款人名称")
    private String loanPeoName;
-    @ApiModelProperty("资方名称")
-    private String bankName;
    @ApiModelProperty("金融产品名称")
    private String policyName;
    @ApiModelProperty("家访专员姓名")
    private String homeVisStaffName;
-    @ApiModelProperty("考察结果value")
-    private String investigateValue;
    @ApiModelProperty("组织全路径")
    private String orgSidPath;
    private String menuSid;
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java
@ -23,7 +23,9 @@ public enum LoanAttachTypeEnum {
    DBRHKB("014", "担保人户口本"),
    YHK("015", "银行卡"),
    FC("016", "房产"),
-    CL("017", "车辆");
+    CL("017", "车辆"),
+    SSFJ("018", "申诉附件"),
+    ;

    /**
     * 附件类型
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java
@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanhomevisitappeal;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppeal;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealMapper.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitappeal.LoanHomevisitAppealMapper <br/>
+ * Description: 家访考察申诉. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface LoanHomevisitAppealMapper extends BaseMapper<LoanHomevisitAppeal> {
+
+	//@Update("update loan_homevisit_appeal set name=#{msg} where id=#{id}")
+	//IPage<LoanHomevisitAppealVo> voPage(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitAppeal> qw);
+	
+	IPage<LoanHomevisitAppealVo> selectPageVo(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitAppeal> qw);
+	
+	List<LoanHomevisitAppealVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitAppeal> qw);
+	
+	@Select("select * from loan_homevisit_appeal")
+	List<LoanHomevisitAppealVo> selectListVo();
+
+	int selectBySid(String join);
+
+	String selectNum(String billNo);
+
+	int updateFlowFiled(Map<String, Object> map);
+}
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml
@ -0,0 +1,69 @@
+<?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.loanhomevisitappeal.LoanHomevisitAppealMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo">
+        SELECT
+        li.`sid`,
+        li.state,
+        bo.createDate,
+        li.`resHomeVisDate`,
+        li.`homeVisAddress`,
+        bo.`useOrgName`,
+        bo.`orgName`,
+        bo.`staffName`,
+        bo.`contractNo`,
+        bb.`borrowerName`,
+        bb.`mobile`,
+        bb.`policyName`,
+        li.`homeVisStaffName`,
+        li.investigateValue
+        FROM
+        loan_homevisit_investigate li
+        LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
+        ON li.`saleOrderBorrowerSid` = bb.`sid`
+        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+        ON li.`saleOrderSid` = bo.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo">
+        SELECT * FROM loan_homevisit_appeal
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectBySid" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_homevisit_appeal
+        WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from loan_homevisit_appeal
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+                limit 1
+    </select>
+
+    <update id="updateFlowFiled">
+        UPDATE loan_homevisit_appeal
+        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstSid=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid=#{sid}
+    </update>
+</mapper>
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java
@ -0,0 +1,139 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanhomevisitappeal;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
+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.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppeal;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitappeal.LoanHomevisitAppealRest <br/>
+ * Description: 家访考察申诉. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "家访考察申诉")
+@RestController("com.yxt.anrui.riskcenter.biz.loanhomevisitappeal.LoanHomevisitAppealRest")
+@RequestMapping("v1/loanhomevisitappeal")
+public class LoanHomevisitAppealRest implements LoanHomevisitAppealFeign {
+
+    @Autowired
+    private LoanHomevisitAppealService loanHomevisitAppealService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanHomevisitAppealVo>> listPage(@RequestBody PagerQuery<LoanHomevisitAppealQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanHomevisitAppealVo> pv = loanHomevisitAppealService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody LoanHomevisitAppealDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        loanHomevisitAppealService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return loanHomevisitAppealService.delAll(sids);
+    }
+
+    @Override
+    public ResultBean<LoanHomevisitAppealDetailsVo> fetchDetailsBySid(String sid, String type) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitAppealDetailsVo vo = loanHomevisitAppealService.fetchDetailsVoBySid(sid,type);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) {
+        return loanHomevisitAppealService.submitHomeAppeal(dto);
+    }
+
+    @Override
+    public ResultBean complete(LoanHomeAppealCompleteDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId());
+        return loanHomevisitAppealService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<LoanHomeAppealNodeVo>> getPreviousNodesForReject(LoanHomeAppealNodeQuery query) {
+        return loanHomevisitAppealService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean<List<LoanHomeAppealNodeVo>> getNextNodesForSubmit(LoanHomeAppealNodeQuery query) {
+        return loanHomevisitAppealService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean reject(LoanHomeAppealTaskQuery query) {
+        return loanHomevisitAppealService.reject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(LoanHomeAppealTaskQuery query) {
+        return loanHomevisitAppealService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(LoanHomeAppealTaskQuery query) {
+        return loanHomevisitAppealService.breakProcess(query);
+    }
+}
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java
@ -0,0 +1,647 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanhomevisitappeal;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basetraileroutapply.BaseTrailerOutApply;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+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.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.SubmitLoanCreditApplyDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppeal;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui-riskcenter(家访考察申诉) <br/>
+ * File: LoanHomevisitAppealService.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitappeal.LoanHomevisitAppealService <br/>
+ * Description: 家访考察申诉 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-17 14:29:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisitAppealMapper, LoanHomevisitAppeal> {
+
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private BusSalesOrderFeign busSalesOrderFeign;
+	@Autowired
+	private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+	@Autowired
+	private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private MessageFeign messageFeign;
+	@Autowired
+	private FlowFeign flowFeign;
+	@Autowired
+	private FlowableFeign flowableFeign;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
+	
+	public PagerVo<LoanHomevisitAppealVo> listPageVo(PagerQuery<LoanHomevisitAppealQuery> pq) {
+		LoanHomevisitAppealQuery query = pq.getParams();
+		QueryWrapper<LoanHomevisitAppeal> qw = new QueryWrapper<>();
+		qw.eq("li.state", 2);
+		qw.eq("bb.busNo", 302);
+		if (StringUtils.isNotBlank(query.getMenuSid())) {
+			//=======================
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgSidPath());
+			privilegeQuery.setMenuUrl(query.getMenuSid());
+			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<LoanHomevisitAppealVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<LoanHomevisitAppealVo> 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.getBankName())) {
+			qw.like("bb.bankName", query.getBankName());
+		}
+		if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
+			qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
+		}
+		if (StringUtils.isNotBlank(query.getInvestigateValue())) {
+			qw.like("li.investigateValue", query.getInvestigateValue());
+		}
+		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<LoanHomevisitAppeal> page = PagerUtil.queryToPage(pq);
+		IPage<LoanHomevisitAppealVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<LoanHomevisitAppealVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public String saveOrUpdateDto(LoanHomevisitAppealDto dto){
+        String dtoSid = dto.getSid();
+		List<String> ssImages = dto.getSsImages();
+		if (StringUtils.isBlank(dtoSid)) {
+			//生成单据编号
+			String billNo = "";
+			//查询家访考察信息
+			LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getHomeVisitSid());
+			//查询销售订单信息
+			AppOrderDetailsVo data = busSalesOrderFeign.getSaleOrderDetails(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(data.getUseOrgSid()).getData();
+			String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+			billNo = "JFKCSS" + sysOrganizationVo.getOrgCode() + date;
+			String i = baseMapper.selectNum(billNo);
+			if (StringUtils.isNotBlank(i)) {
+				billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+			} else {
+				billNo = Rule.getBillNo(billNo, 0);
+			}
+			dto.setBillNo(billNo);
+			String sid = this.insertByDto(dto);
+			for (String ssImage : ssImages) {
+				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+				loanHomevisitInvestigateFileDto.setMainSid(sid);
+				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.SSFJ.getAttachType());
+				if (ssImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					ssImage = ssImage.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanHomevisitInvestigateFileDto.setFileUrl(ssImage);
+				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+			}
+			return sid;
+        } 
+		this.updateByDto(dto);
+		loanHomevisitInvestigateFileService.delByMainSid(dtoSid);
+		for (String ssImage : ssImages) {
+			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.SSFJ.getAttachType());
+			if (ssImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				ssImage = ssImage.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			loanHomevisitInvestigateFileDto.setFileUrl(ssImage);
+			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+		}
+		return dtoSid;
+	}
+	
+	public String insertByDto(LoanHomevisitAppealDto dto){
+		LoanHomevisitAppeal entity = new LoanHomevisitAppeal();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setNodeState("待提交");
+		baseMapper.insert(entity);
+		return entity.getSid();
+	}
+	
+	public void updateByDto(LoanHomevisitAppealDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		LoanHomevisitAppeal entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+
+	public ResultBean delAll(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		//查询该sid中是否有流程不是待提交的
+		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+		if (count > 0) {
+			return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+		}
+		delBySids(sids);
+		for (String sid : sids) {
+			loanHomevisitInvestigateFileService.delByMainSid(sid);
+		}
+		return rb.success().setMsg("删除成功");
+	}
+
+	public LoanHomevisitAppealDetailsVo fetchDetailsVoBySid(String sid,String type){
+		//type1 初始化 type2 编辑回显
+		LoanHomevisitAppealDetailsVo vo = new LoanHomevisitAppealDetailsVo();
+		LoanHomevisitInvestigate loanHomevisitInvestigate;
+		if (type.equals("1")){
+			loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(sid);
+			vo.setHomeVisitSid(sid);
+		}else {
+			LoanHomevisitAppeal entity = fetchBySid(sid);
+			BeanUtil.copyProperties(entity, vo);
+			loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(entity.getHomeVisitSid());
+			List<LoanHomevisitInvestigateFileDetailsVo> ssfjImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.SSFJ.getAttachType());
+			List<String> ssImages = new ArrayList<>();
+			if (ssfjImages != null && ssfjImages.size() > 0){
+				for (LoanHomevisitInvestigateFileDetailsVo ssfjImage : ssfjImages) {
+					ssImages.add(ssfjImage.getFileUrl());
+				}
+			}
+			vo.setSsImages(ssImages);
+		}
+		vo.setInvestigateValue(loanHomevisitInvestigate.getInvestigateValue());
+		return vo;
+	}
+
+	public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSid());
+		int r = submitBusinessData(dto, loanHomevisitAppeal);
+		if (r == 3) {
+			return rb.setMsg("该申请不存在");
+		}
+		if (r == 0) {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+		//新增修改保存
+		String businessSid = saveOrUpdateDto(dto);
+		loanHomevisitAppeal = fetchBySid(businessSid);
+		//查询家访考察信息
+		LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid());
+		//查询销售订单信息
+		BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+		//创建BusinessVariables实体对象
+		BusinessVariables bv = new BusinessVariables();
+		//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+		Map<String, Object> variables = new HashMap<>();
+		//用户的部门全路径sid
+		bv.setOrgSidPath(data.getOrgSidPath());
+		//业务sid
+		bv.setBusinessSid(businessSid);
+		//用户sid
+		bv.setUserSid(data.getCreateBySid());
+		//若app移动端有此功能，则传递appMap参数
+		Map<String, Object> appMap = new HashMap<>();
+		//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		//流程定义id
+		bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId());
+		bv.setFormVariables(variables);
+		if (r == 1) {
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
+			UpdateFlowFieldVo ufVo = voResultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(ufVo));
+			//极光推送
+			try {
+				ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+						.setNameFormat("demo-pool-%d").build();
+				ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100,
+						0L, TimeUnit.MILLISECONDS,
+						new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+				BusSalesOrder finalBusSalesOrder = data;
+				Future future1 = pool.submit(() -> {
+					//极光推送
+					MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+					MessageFlowVo messageFlowVo = new MessageFlowVo();
+					BeanUtil.copyProperties(ufVo, messageFlowVo);
+					messageFlowableQuery.setUfVo(messageFlowVo);
+					messageFlowableQuery.setAppMap(appMap);
+					messageFlowableQuery.setBusinessSid(businessSid);
+					messageFlowableQuery.setModuleName("信用审核申诉");
+					messageFlowableQuery.setMsgContent(finalBusSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+					messageFlowableQuery.setMsgTitle("信用审核申诉");
+					messageFeign.pushMessage(messageFlowableQuery);
+				});
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return voResultBean;
+		}
+		if (r == 2) {
+			// ToDo:驳回到发起人后再次提交
+			if (StringUtils.isBlank(dto.getInstanceId())) {
+				return rb.setMsg("参数错误：instanceId");
+			}
+			bv.setTaskId(loanHomevisitAppeal.getTaskId());
+			bv.setTaskDefKey(loanHomevisitAppeal.getNodeSid());
+			bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+			bv.setInstanceId(dto.getInstanceId());
+			return complete(bv);
+		}
+		return rb;
+	}
+
+	public ResultBean complete(BusinessVariables bv) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = bv.getBusinessSid();
+		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid);
+		Map<String, Object> variables = new HashMap<>();
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+		if (StringUtils.isBlank(loanHomevisitAppeal.getProcDefId())) {
+			flowProcessMapQuery.setProDefKey(bv.getModelId());
+		} else {
+			flowProcessMapQuery.setProDefKey(loanHomevisitAppeal.getProcDefId());
+		}
+		flowProcessMapQuery.setVariables(variables);
+		variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+		//=======================================
+		bv.setFormVariables(variables);
+		//查询家访考察信息
+		LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid());
+		//查询销售订单信息
+		BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+		bv.setOrgSidPath(data.getOrgSidPath());
+		if (bv.getTaskId().equals(loanHomevisitAppeal.getTaskId())) {
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
+			if (!resultBean.getSuccess()) {
+				return rb.setMsg(resultBean.getMsg());
+			}
+			UpdateFlowFieldVo ufVo = resultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+			if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+			} else {
+				//极光推送
+				try {
+					ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+							.setNameFormat("demo-pool-%d").build();
+					ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100,
+							0L, TimeUnit.MILLISECONDS,
+							new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+					BusSalesOrder finalBusSalesOrder = data;
+					Future future1 = pool.submit(() -> {
+						//极光推送
+						MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+						MessageFlowVo messageFlowVo = new MessageFlowVo();
+						BeanUtil.copyProperties(ufVo, messageFlowVo);
+						messageFlowableQuery.setUfVo(messageFlowVo);
+						messageFlowableQuery.setAppMap(appMap);
+						messageFlowableQuery.setBusinessSid(businessSid);
+						messageFlowableQuery.setModuleName("信用审核申诉");
+						messageFlowableQuery.setMsgContent(finalBusSalesOrder.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+						messageFlowableQuery.setMsgTitle("信用审核申诉");
+						messageFeign.pushMessage(messageFlowableQuery);
+					});
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+			return rb.success().setData(resultBean.getData());
+		} else {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+	}
+
+	public ResultBean<List<LoanHomeAppealNodeVo>> getPreviousNodesForReject(LoanHomeAppealNodeQuery query) {
+		ResultBean<List<LoanHomeAppealNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+		List<LoanHomeAppealNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanHomeAppealNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean<List<LoanHomeAppealNodeVo>> getNextNodesForSubmit(LoanHomeAppealNodeQuery query) {
+		ResultBean<List<LoanHomeAppealNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+		List<LoanHomeAppealNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanHomeAppealNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean reject(LoanHomeAppealTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = query.getBusinessSid();
+		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid);
+		if (loanHomevisitAppeal == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		String businessTaskId = loanHomevisitAppeal.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				if (StringUtils.isBlank(query.getComment())) {
+					return rb.setMsg("请填写意见");
+				}
+				if (StringUtils.isBlank(query.getUserSid())) {
+					return rb.setMsg("参数错误：userSid");
+				}
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				Map<String, Object> variables = new HashMap<>();
+				Map<String, Object> appMap = new HashMap<>();
+				appMap.put("sid", businessSid);
+				variables.put("app", appMap);
+				flowTaskVo.setValues(variables);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				UpdateFlowFieldVo ufVo = resultBean.getData();
+				Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+				//更新业务中的流程相关的参数
+				updateFlowFiled(map);
+				//查询家访考察信息
+				LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid());
+				//查询销售订单信息
+				BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+				//极光推送
+				try {
+					ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+							.setNameFormat("demo-pool-%d").build();
+					ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100,
+							0L, TimeUnit.MILLISECONDS,
+							new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+					BusSalesOrder finalBusSalesOrder = data;
+					Future future1 = pool.submit(() -> {
+						//极光推送
+						MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+						MessageFlowVo messageFlowVo = new MessageFlowVo();
+						BeanUtil.copyProperties(ufVo, messageFlowVo);
+						String procId = loanHomevisitAppeal.getProcInstSid();
+						ufVo.setProcInsId(procId);
+						ufVo.setProcDefId(loanHomevisitAppeal.getProcDefId());
+						messageFlowableQuery.setUfVo(messageFlowVo);
+						messageFlowableQuery.setAppMap(appMap);
+						messageFlowableQuery.setBusinessSid(businessSid);
+						messageFlowableQuery.setModuleName("信用审核申诉");
+						ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+						String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+						List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+						if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(data.getCreateBySid())) {
+							messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+						} else {
+							messageFlowableQuery.setMsgContent(data.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+						}
+						messageFlowableQuery.setMsgTitle("信用审核申诉");
+						messageFeign.pushMessage(messageFlowableQuery);
+					});
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				return rb.success();
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean revokeProcess(LoanHomeAppealTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(query.getBusinessSid());
+		String businessTaskId = loanHomevisitAppeal.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+				return rb.success().setData(resultBean.getData());
+			}
+		}
+		return rb.setMsg("操作失败，提交的数据不一致!");
+	}
+
+	public ResultBean breakProcess(LoanHomeAppealTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getInstanceId())) {
+			return rb.setMsg("参数错误：instanceId");
+		}
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		if (StringUtils.isBlank(query.getComment())) {
+			return rb.setMsg("请填写意见");
+		}
+		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(query.getBusinessSid());
+		//查询家访考察信息
+		LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(loanHomevisitAppeal.getHomeVisitSid());
+		//查询销售订单信息
+		BusSalesOrder data = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+		String businessTaskId = loanHomevisitAppeal.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (query.getUserSid().equals(data.getCreateBySid())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+				updateFlowFiled(map);
+				return rb.success().setData(resultBean.getData());
+			} else {
+				if (businessTaskId.equals(query.getTaskId())) {
+					FlowTaskVo flowTaskVo = new FlowTaskVo();
+					BeanUtil.copyProperties(query, flowTaskVo);
+					ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+					if (!resultBean.getSuccess()) {
+						return rb.setMsg(resultBean.getMsg());
+					}
+					Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+					updateFlowFiled(map);
+					return rb.success().setData(resultBean.getData());
+				}
+			}
+
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	private int updateFlowFiled(Map<String, Object> map) {
+		return baseMapper.updateFlowFiled(map);
+	}
+
+	private synchronized int submitBusinessData(SubmitHomeAppealDto dto, LoanHomevisitAppeal loanHomevisitAppeal) {
+		int r = 0;
+		if (StringUtils.isBlank(dto.getSid())) {
+			r = 1;
+		} else {
+			if (loanHomevisitAppeal != null) {
+				String businessTaskId = loanHomevisitAppeal.getTaskId();
+				if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+					//新提交
+					r = 1;
+				} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+					//二次提交//只有数据一致的时候才能进行下一步
+					r = 2;
+				}
+			} else {
+				r = 3;
+			}
+
+		}
+		return r;
+	}
+}
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java
@ -201,11 +201,4 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
 		return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto);
 	}
-
-	@Override
-	public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanHomevisitInvestigateVo> pv = loanHomevisitInvestigateService.jfjdListPage(pq);
-		return rb.success().setData(pv);
-	}
 }
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
@ -894,88 +894,4 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
        }
        return rb.success();
    }
-
-    public PagerVo<LoanHomevisitInvestigateVo> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
-        LoanHomevisitInvestigateQuery query = pq.getParams();
-        QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
-        qw.eq("li.state", 2);
-        qw.eq("bb.busNo", 302);
-        if (StringUtils.isNotBlank(query.getMenuSid())) {
-            //=======================
-            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            privilegeQuery.setOrgPath(query.getOrgSidPath());
-            privilegeQuery.setMenuUrl(query.getMenuSid());
-            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.getBankName())) {
-            qw.like("bb.bankName", query.getBankName());
-        }
-        if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
-            qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
-        }
-        if (StringUtils.isNotBlank(query.getInvestigateValue())) {
-            qw.like("li.investigateValue", query.getInvestigateValue());
-        }
-        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;
-    }
 }
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java
@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@ -65,4 +66,7 @@ public interface LoanHomevisitInvestigateFileMapper extends BaseMapper<LoanHomev
    List<LoanHomevisitInvestigateFileVo> selectListVo();

    List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
+
+    @Delete("delete from loan_homevisit_investigate_file where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
 }
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java
@ -304,4 +304,8 @@ public class LoanHomevisitInvestigateFileService extends MybatisBaseService<Loan
 	public List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(String sid, String attachType) {
 		return baseMapper.selByMainSidAndTypeKey(sid,attachType,fileUploadComponent.getUrlPrefix());
 	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
 }
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@ -941,6 +941,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
            loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
            loanSolutionsDetailService.insert(loanSolutionsDetail);
        } else {
+
+            if(StringUtils.isBlank(dto.getDiscountCar())){
+                return rb.setMsg("贴息抵车款不能为空");
+            }
            if (loanSolutions != null) {
                baseMapper.deleteByOrderSid(dto.getBusSid());
                loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java
@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;


 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
@ -55,6 +58,8 @@ public class LoanHomeVisitInvestigateService {

    @Autowired
    private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
+    @Autowired
+    private LoanHomevisitAppealFeign loanHomevisitAppealFeign;

    public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeVisitList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
        ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
@ -252,18 +257,18 @@ public class LoanHomeVisitInvestigateService {

    public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
        ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
-        PagerQuery<LoanHomevisitInvestigateQuery> pq = new PagerQuery<>();
+        PagerQuery<LoanHomevisitAppealQuery> pq = new PagerQuery<>();
        LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams();
-        LoanHomevisitInvestigateQuery params1 = new LoanHomevisitInvestigateQuery();
-        params1.setOrgSidPath(params.getOrgPath());
-        params1.setUserSid(params.getUserSid());
-        params1.setNames(params.getNames());
-        pq.setParams(params1);
-        ResultBean<PagerVo<LoanHomevisitInvestigateVo>> resultBean = loanHomevisitInvestigateFeign.jfjdListPage(pq);
+        LoanHomevisitAppealQuery loanHomevisitAppealQuery = new LoanHomevisitAppealQuery();
+        loanHomevisitAppealQuery.setOrgSidPath(params.getOrgPath());
+        loanHomevisitAppealQuery.setUserSid(params.getUserSid());
+        loanHomevisitAppealQuery.setNames(params.getNames());
+        pq.setParams(loanHomevisitAppealQuery);
+        ResultBean<PagerVo<LoanHomevisitAppealVo>> resultBean = loanHomevisitAppealFeign.listPage(pq);
        List<LoanHomeVisitInvestigatePageVo> loanHomeVisitInvestigatePageVos = new ArrayList<>();
        PagerVo<LoanHomeVisitInvestigatePageVo> v = new PagerVo<>();
-        List<LoanHomevisitInvestigateVo> records = resultBean.getData().getRecords();
-        for (LoanHomevisitInvestigateVo record : records) {
+        List<LoanHomevisitAppealVo> records = resultBean.getData().getRecords();
+        for (LoanHomevisitAppealVo record : records) {
            LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo();
            loanHomeVisitInvestigatePageVo.setSid(record.getSid());
            loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo());