案件进程管理二审、再审接口开发

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java

@@ -24,8 +24,8 @@ public class DetailsFees {
     private String paymentMoney;
     @ApiModelProperty("操作时间")
     private String operatingTime;
-//    @ApiModelProperty("附件")
-//    private String filePath;
+    @ApiModelProperty("备注")
+    private String remarks;
     @ApiModelProperty("操作人")
     private String operator;
     @ApiModelProperty("操作人Sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java

@@ -91,10 +91,5 @@ public class LoanCaseProgress extends BaseEntity {
     private String salesOrderSid;
     @ApiModelProperty("诉讼主体")
     private String lawsuitSubject;
-    @ApiModelProperty("律师事务所")
-    private String lawFirms;
-    @ApiModelProperty("承办律师")
-    private String lawer;
-    @ApiModelProperty("律师联系电话")
-    private String lawerPhone;
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java

@@ -63,19 +63,78 @@ public interface LoanCaseProgressFeign {
     @PostMapping("/saveFirstYiLiAn")
     public ResultBean saveFirstYiLiAn(@RequestBody ReviewVo dto);
 
+    @ApiOperation("保存待开庭")
+    @PostMapping("/saveFirstDaiKaiTing")
+    public ResultBean saveFirstDaiKaiTing(@RequestBody ReviewVo dto);
 
-    //-----------------一审----------------------------
+    @ApiOperation("保存已开庭")
+    @PostMapping("/saveFirstYiKaiTing")
+    public ResultBean saveFirstYiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已判决/调解")
+    @PostMapping("/saveFirstPanJue")
+    public ResultBean saveFirstPanJue(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已生效")
+    @PostMapping("/saveFirstShengXiao")
+    public ResultBean saveFirstShengXiao(@RequestBody ReviewVo dto);
+
+    //-----------------二审----------------------------
 
     @ApiOperation("查询二审详情")
     @GetMapping("/getSecondDetails")
     public ResultBean<ReviewVo> getSecondDetails(@RequestParam("sid") String sid);
 
+    @ApiOperation("保存修改法官信息")
+    @PostMapping("/saveSecondJudge")
+    public ResultBean saveSecondJudge(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存上诉/应诉")
+    @PostMapping("/saveSecondShangSu")
+    public ResultBean saveSecondShangSu(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存待开庭")
+    @PostMapping("/saveSecondDaiKaiTing")
+    public ResultBean saveSecondDaiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已开庭")
+    @PostMapping("/saveSecondYiKaiTing")
+    public ResultBean saveSecondYiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已判决/调解")
+    @PostMapping("/saveSecondPanJue")
+    public ResultBean saveSecondPanJue(@RequestBody ReviewVo dto);
 
-    //-----------------一审----------------------------
+
+    //-----------------再审----------------------------
 
     @ApiOperation("查询再审详情")
     @GetMapping("/getMoreDetails")
     public ResultBean<ReviewVo> getMoreDetails(@RequestParam("sid") String sid);
 
+    @ApiOperation("保存修改法官信息")
+    @PostMapping("/saveMoreJudge")
+    public ResultBean saveMoreJudge(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存上诉/应诉")
+    @PostMapping("/saveMoreShangSu")
+    public ResultBean saveMoreShangSu(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存待开庭")
+    @PostMapping("/saveMoreDaiKaiTing")
+    public ResultBean saveMoreDaiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已开庭")
+    @PostMapping("/saveMoreYiKaiTing")
+    public ResultBean saveMoreYiKaiTing(@RequestBody ReviewVo dto);
+
+    @ApiOperation("保存已判决/调解")
+    @PostMapping("/saveMorePanJue")
+    public ResultBean saveMorePanJue(@RequestBody ReviewVo dto);
+
+
+    //---------------------------执行-------------------------
+
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java

@@ -54,13 +54,83 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign {
         return null;
     }
 
+    @Override
+    public ResultBean saveFirstDaiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstYiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstPanJue(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveFirstShengXiao(ReviewVo dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<ReviewVo> getSecondDetails(String sid) {
         return null;
     }
 
+    @Override
+    public ResultBean saveSecondJudge(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondShangSu(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondDaiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondYiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveSecondPanJue(ReviewVo dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<ReviewVo> getMoreDetails(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean saveMoreJudge(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreShangSu(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreDaiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMoreYiKaiTing(ReviewVo dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveMorePanJue(ReviewVo dto) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java

@@ -24,5 +24,5 @@ public class DelegateInfo {
 
     private List<UrlQuery> file = new ArrayList<>();
 
-
+    private String lawyerSid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress;
 import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo;
+import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.DelegateInfo;
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -35,4 +36,6 @@ public interface LoanCaseProgressMapper extends BaseMapper<LoanCaseProgress> {
 
     @Update("update loan_case_progress set full = #{isFullProceed},sueShows = #{partProceedRemarks},sueMoney = #{sueMoneyTotal} where sid = #{busSid}")
     void updateLsxg(@Param("busSid") String busSid,@Param("isFullProceed") String isFullProceed,@Param("partProceedRemarks") String partProceedRemarks,@Param("sueMoneyTotal") String sueMoneyTotal);
+
+    DelegateInfo selLawyerSidBySidAndCaseStage(@Param("sid") String sid,@Param("caseStage") String caseStage);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml

@@ -38,8 +38,8 @@
         p.bankContractNo,
         p.loanName,
         p.customerName,
-        p.lawFirms,
-        p.lawer,
+        a.lawyerFirm as lawFirms,
+        a.lawyerName as lawer,
         p.caseNo,
         p.caseType,
         p.caseStage,
@@ -47,18 +47,36 @@
         p.useDays,
         p.`full`
         FROM
-        loan_case_progress as p
+        loan_case_progress AS p
+        LEFT JOIN ( SELECT * FROM loan_case_entrust_lawyer_apply AS b WHERE b.nodeState = '已办结' ) AS a ON p.sid =
+        a.busSid
+        AND p.caseStage = a.caseStage
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
     <select id="selMaxDueDateByOrderSid" resultType="java.lang.String">
-        SELECT p.dueDate FROM loan_repayment_plan_details as p WHERE p.salesOrderSid = #{salesOrderSid}
+        SELECT p.dueDate
+        FROM loan_repayment_plan_details as p
+        WHERE p.salesOrderSid = #{salesOrderSid}
         ORDER BY p.dueDate DESC LIMIT 1
     </select>
     <select id="selLawyerSidBySid" resultType="java.lang.String">
-        SELECT a.sid FROM loan_case_entrust_lawyer_apply as a
-        WHERE a.busSid = #{sid} and a.nodeState = '已办结'
+        SELECT a.sid
+        FROM loan_case_entrust_lawyer_apply as a
+        WHERE a.busSid = #{sid}
+          and a.nodeState = '已办结'
+    </select>
+    <select id="selLawyerSidBySidAndCaseStage"
+            resultType="com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.DelegateInfo">
+        SELECT a.sid         as lawyerSid,
+               a.lawyerFirm  as lawFirms,
+               a.lawyerName  as lawer,
+               a.lawyerPhone as lawerPhone
+        FROM loan_case_entrust_lawyer_apply as a
+        WHERE a.busSid = #{sid}
+          and a.nodeState = '已办结'
+          and a.caseStage = #{caseStage}
     </select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java

@@ -69,6 +69,26 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign {
         return loanCaseProgressService.saveFirstYiLiAn(dto);
     }
 
+    @Override
+    public ResultBean saveFirstDaiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstDaiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstYiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstYiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstPanJue(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstPanJue(dto);
+    }
+
+    @Override
+    public ResultBean saveFirstShengXiao(ReviewVo dto) {
+        return loanCaseProgressService.saveFirstShengXiao(dto);
+    }
+
     @Override
     public ResultBean<ReviewVo> getSecondDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
@@ -76,10 +96,60 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean saveSecondJudge(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondJudge(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondShangSu(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondShangSu(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondDaiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondDaiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondYiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondYiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveSecondPanJue(ReviewVo dto) {
+        return loanCaseProgressService.saveSecondPanJue(dto);
+    }
+
     @Override
     public ResultBean<ReviewVo> getMoreDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "再审");
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean saveMoreJudge(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreJudge(dto);
+    }
+
+    @Override
+    public ResultBean saveMoreShangSu(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreShangSu(dto);
+    }
+
+    @Override
+    public ResultBean saveMoreDaiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreDaiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveMoreYiKaiTing(ReviewVo dto) {
+        return loanCaseProgressService.saveMoreYiKaiTing(dto);
+    }
+
+    @Override
+    public ResultBean saveMorePanJue(ReviewVo dto) {
+        return loanCaseProgressService.saveMorePanJue(dto);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml

@@ -139,10 +139,9 @@
         </foreach>
     </select>
     <select id="appDetail" resultType="com.yxt.anrui.riskcenter.api.loanlawsuitapply.app.AppLawsuitDetailsVo">
-        SELECT
-            a.sid,
-            date_format( a.applyDate, '%Y-%m-%d' ) AS `time`,
-            CONCAT( a.createDept, '-', a.createByName ) AS publishInfo,
+        SELECT a.sid,
+               date_format(a.applyDate, '%Y-%m-%d')      AS `time`,
+               CONCAT(a.createDept, '-', a.createByName) AS publishInfo,
                a.taskId,
                a.procInstId                              as procInsId,
                a.customerName                            AS custName,
@@ -154,8 +153,8 @@
                a.amountAll,
                a.salesOrderSid,
                a.lawsuitSubject
-        FROM
-            loan_lawsuit_apply AS a
+        FROM loan_lawsuit_apply AS a
+        where a.sid = #{sid}
     </select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@@ -43,6 +43,7 @@ import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@@ -859,10 +860,9 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
         if (StringUtils.isBlank(query.getComment())) {
             return rb.setMsg("请填写意见");
         }
-        LoanLawsuitApply loanLawsuitApply = fetchBySid(query.getBusinessSid());
-        String businessTaskId = loanLawsuitApply.getTaskId();
-        if (StringUtils.isNotBlank(businessTaskId)) {
-            if (query.getUserSid().equals(loanLawsuitApply.getCreateBySid())) {
+        LoanLawsuitApply lawsuitApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = lawsuitApply.getTaskId();
+        if (query.getUserSid().equals(lawsuitApply.getCreateBySid())) {
             FlowTaskVo flowTaskVo = new FlowTaskVo();
             BeanUtil.copyProperties(query, flowTaskVo);
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -871,9 +871,9 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
             }
             Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
             updateFlowFiled(map);
-                //终止任务后操作
             return rb.success().setData(resultBean.getData());
         } else {
+            if (StringUtils.isNotBlank(businessTaskId)) {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -883,12 +883,11 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
-                    //终止任务后操作
                     return rb.success().setData(resultBean.getData());
                 }
             }
-
         }
+
         return rb.setMsg("操作失败!提交的数据不一致!");
     }