优化

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

@@ -73,6 +73,11 @@ public interface LoanCreditAppealApplyFeign {
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("移动端删除一条")
+    @DeleteMapping("/delBySid")
+    @ResponseBody
+    public ResultBean delBySid(@RequestParam("sid") String sid);
       
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")

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

@@ -65,6 +65,11 @@ public class LoanCreditAppealApplyFeignFallback implements LoanCreditAppealApply
 		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loancreditappealapply/delBySids无法访问");
 	}
 
+	@Override
+	public ResultBean delBySid(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java

@@ -81,6 +81,11 @@ public interface LoanPreloanCreditApplyFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
+    @ApiOperation("移动端删除一条")
+    @DeleteMapping("/delBySid")
+    @ResponseBody
+    public ResultBean delBySid(@RequestParam("sid") String sid);
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java

@@ -76,6 +76,11 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp
 		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/delBySids无法访问");
 	}
 
+	@Override
+	public ResultBean delBySid(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<LoanPreloanCreditApplyDetailsVo> fetchDetailsBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java

@@ -76,7 +76,7 @@ public class LoanPreloanCreditApplyVo implements Vo {
     @ApiModelProperty("资方风控结果")
     private String zffkjg;
     @ApiModelProperty("申诉结果")
-    private String ssjg;
+    private String isSsjg;
     @ApiModelProperty("是否可以办理")
     private Boolean isEdit = false;
     @ApiModelProperty("是否可以删除")

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

@@ -72,4 +72,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper<LoanCreditAppeal
     String selectNum(String billNo);
 
     LoanCreditAppealApply selectByApplySid(String sid);
+
+	int selectByAppSid(String sid);
 }

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

@@ -71,4 +71,11 @@
     <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>
+
+    <select id="selectByAppSid" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_credit_appeal_apply
+        WHERE nodeState != '待提交'
+		  and sid = #{sid}
+    </select>
 </mapper>

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

@@ -90,6 +90,11 @@ public class LoanCreditAppealApplyRest implements LoanCreditAppealApplyFeign {
 		return loanCreditAppealApplyService.delAll(sids);
 	}
 
+	@Override
+	public ResultBean delBySid(String sid) {
+		return loanCreditAppealApplyService.delBySid(sid);
+	}
+
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")

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

@@ -211,6 +211,9 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         IPage<LoanCreditAppealApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         for (LoanCreditAppealApplyVo record : pagging.getRecords()) {
             record.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName());
+            if ("申诉中".equals(record.getSsjg())){
+                record.setSsjg("");
+            }
             if ("待提交".equals(record.getNodeState())) {
                 record.setShowDeleteBtn(true);
                 record.setShowUpdateBtn(true);
@@ -252,6 +255,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
                 commonAppendixDto.setFilePath(ssImage);
                 commonAppendixFeign.save(commonAppendixDto);
             }
+            loanPreloanCreditApplyService.updateSsjgBySid("申诉中", dto.getCreditApplySid());
             return rb.success().setData(sid);
         }
         this.updateByDto(dto);
@@ -328,11 +332,28 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         if (count > 0) {
             return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
         }
-        delBySids(sids);
         for (String sid : sids) {
             commonAppendixFeign.deleteFiles(sid);
             loanCreditAppealPeoService.delByMainSid(sid);
+            LoanCreditAppealApply loanCreditAppealApply = fetchBySid(sid);
+            loanPreloanCreditApplyService.updateSsjgBySid("", loanCreditAppealApply.getCreditApplySid());
         }
+        delBySids(sids);
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean delBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectByAppSid(sid);
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
+        commonAppendixFeign.deleteFiles(sid);
+        loanCreditAppealPeoService.delByMainSid(sid);
+        LoanCreditAppealApply loanCreditAppealApply = fetchBySid(sid);
+        loanPreloanCreditApplyService.updateSsjgBySid("", loanCreditAppealApply.getCreditApplySid());
+        deleteBySid(sid);
         return rb.success().setMsg("删除成功");
     }
 
@@ -631,4 +652,6 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
     public LoanCreditAppealApply selectByApplySid(String sid) {
         return baseMapper.selectByApplySid(sid);
     }
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo">
         SELECT
         *,
+        ssjg AS isSsjg,
         IF(custTypeValue = '个人',custName,qyName) AS khqyName
         FROM
         loan_preloan_credit_apply

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java

@@ -96,6 +96,11 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
 		return loanPreloanCreditApplyService.delAll(sids);
 	}
 
+	@Override
+	public ResultBean delBySid(String sid) {
+		return loanPreloanCreditApplyService.delBySid(sid);
+	}
+
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -158,6 +158,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("custName", query.getKhqyName()).or().like("qyName", query.getKhqyName()));
         }
+        qw.orderByDesc("createTime");
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         for (LoanPreloanCreditApplyVo record : pagging.getRecords()) {
@@ -168,7 +169,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 record.setIsDelete(true);
                 record.setShowDeleteBtn(true);
             }
-            if ("002".equals(record.getGsfkjgKey()) && !"通过".equals(record.getSsjg())) {
+            if ("002".equals(record.getGsfkjgKey()) && ("不通过".equals(record.getIsSsjg()) || StringUtils.isBlank(record.getIsSsjg()))) {
                 record.setIsHandle(true);
                 record.setShowHandleBtn(true);
             }
@@ -496,6 +497,14 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         return rb.success().setMsg("删除成功");
     }
 
+    public ResultBean delBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        deleteBySid(sid);
+        commonAppendixFeign.deleteFiles(sid);
+        loanPreloanCreditPeoService.delByMainSid(sid);
+        return rb.success().setMsg("删除成功");
+    }
+
     public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();