优化

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java

@@ -116,4 +116,9 @@ public interface LoanCreditAppealApplyFeign {
     @ApiOperation(value = "终止任务")
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody LoanCreditApplyTaskQuery query);
+
+    @ApiOperation("根据审核sid查询待提交状态申诉")
+    @PostMapping("/fetchDetailsByShSidAndState")
+    @ResponseBody
+    ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(@RequestParam("shSid") String shSid, @RequestParam("nodeState") String nodeState);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java

@@ -115,4 +115,9 @@ public class LoanCreditAppealApplyFeignFallback implements LoanCreditAppealApply
 	public ResultBean breakProcess(LoanCreditApplyTaskQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java

@@ -29,6 +29,7 @@ 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 com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -74,4 +75,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper<LoanCreditAppeal
     LoanCreditAppealApply selectByApplySid(String sid);
 
 	int selectByAppSid(String sid);
+
+    LoanCreditAppealApplyDetailsVo fetchDetailsByShSidAndState(@Param("shSid") String shSid,@Param("nodeState") String nodeState);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.xml

@@ -69,7 +69,10 @@
     </select>
 
     <select id="selectByApplySid" resultType="com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply">
-        select * from loan_credit_appeal_apply where creditApplySid = #{sid} order by id desc limit 1
+        select *
+        from loan_credit_appeal_apply
+        where creditApplySid = #{sid}
+        order by id desc limit 1
     </select>
 
     <select id="selectByAppSid" resultType="int">
@@ -78,4 +81,13 @@
         WHERE nodeState != '待提交'
 		  and sid = #{sid}
     </select>
+
+    <select id="fetchDetailsByShSidAndState"
+            resultType="com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo">
+        SELECT *
+        FROM loan_credit_appeal_apply
+        WHERE creditApplySid = #{shSid}
+          AND nodeState = #{nodeState}
+        ORDER BY createTime DESC LIMIT 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java

@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo;
@@ -144,4 +145,9 @@ public class LoanCreditAppealApplyRest implements LoanCreditAppealApplyFeign {
     public ResultBean breakProcess(LoanCreditApplyTaskQuery query) {
         return loanCreditAppealApplyService.breakProcess(query);
     }
+
+    @Override
+    public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
+        return loanCreditAppealApplyService.fetchDetailsByShSidAndState(shSid, nodeState);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java

@@ -655,4 +655,9 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
     }
 
 
+    public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = baseMapper.fetchDetailsByShSidAndState(shSid,nodeState);
+        return rb.success().setData(loanCreditAppealApplyDetailsVo);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -307,10 +307,34 @@ public class CreditReviewService {
         CreditReviewDetailsSsVo creditReviewDetailsSsVo = new CreditReviewDetailsSsVo();
         LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo;
         if (query.getAddNew()) {
+            LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsByShSidAndState(query.getSid(), "待提交").getData();
+            if (loanCreditAppealApplyDetailsVo != null){
+                loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData();
+                creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason());
+                List<LoanCreditAppealPeoDetailsVo> loanCreditAppealPeos = loanCreditAppealApplyDetailsVo.getLoanCreditAppealPeos();
+                List<ShareholderDetailsVo> shareholderDetailsVos = new ArrayList<>();
+                for (LoanCreditAppealPeoDetailsVo loanCreditAppealPeo : loanCreditAppealPeos) {
+                    ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo();
+                    shareholderDetailsVo.setShareholderName(loanCreditAppealPeo.getName());
+                    shareholderDetailsVo.setShareholderIdNumber(loanCreditAppealPeo.getIdCard());
+                    shareholderDetailsVo.setShareholderMobile(loanCreditAppealPeo.getPhone());
+                    shareholderDetailsVo.setShareholderRemarks(loanCreditAppealPeo.getRemarks());
+                    shareholderDetailsVos.add(shareholderDetailsVo);
+                }
+                creditReviewDetailsSsVo.setGuarantorList(shareholderDetailsVos);
+                creditReviewDetailsSsVo.setUploadFiles(loanCreditAppealApplyDetailsVo.getSsImages());
+                creditReviewDetailsSsVo.setOrgPath(loanCreditAppealApplyDetailsVo.getOrgSidPath());
+                creditReviewDetailsSsVo.setUserSid(loanCreditAppealApplyDetailsVo.getCreateBySid());
+                creditReviewDetailsSsVo.setSid2(loanCreditAppealApplyDetailsVo.getCreditApplySid());
+                creditReviewDetailsSsVo.setSid(loanCreditAppealApplyDetailsVo.getSid());
+                creditReviewDetailsSsVo.setTaskId(loanCreditAppealApplyDetailsVo.getTaskId());
+                creditReviewDetailsSsVo.setProcInsId(loanCreditAppealApplyDetailsVo.getInstanceId());
+            }else {
                 loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
                 creditReviewDetailsSsVo.setSid2(query.getSid());
                 creditReviewDetailsSsVo.setOrgPath(query.getOrgPath());
                 creditReviewDetailsSsVo.setUserSid(query.getUserSid());
+            }
         } else {
             LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(query.getSid()).getData();
             loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData();