diff --git 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 index e546936061..62b209a81f 100644 --- 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 @@ -7299,6 +7299,8 @@ public class BusSalesOrderService extends MybatisBaseService listPageByOrderSid(String orderSid); + + int updateByBorrowSid(String s); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml index 9ab5979a9a..24615f8a1d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml @@ -74,4 +74,7 @@ AND bso.isDelete = '0' + + update anrui_buscenter.bus_sales_order_borrower set state = 0 where salesOrderSid = #{s} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 37bd135774..608d2c61f9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -744,6 +744,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid); vinList.removeAll(Collections.singleton(null)); List stateList = new ArrayList<>(); + List stringList = new ArrayList<>(); if (!vinList.isEmpty()) { for (BusSalesOrderVehicle busSalesOrderVehicle : vinList) { String busSalesOrderVehicleSid = busSalesOrderVehicle.getSid(); @@ -751,11 +752,21 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService preservefile = new ArrayList<>(); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java deleted file mode 100644 index ac3b43b8f9..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/FirstReviewVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.anrui.riskcenter.api.loancaseprogress; - -import lombok.Data; - -/** - * @author Fan - * @description - * @date 2024/2/28 14:49 - */ -@Data -public class FirstReviewVo { - private String sid; - - -} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java index 411d1dd378..c6c0b0fc36 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; +import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -46,5 +47,35 @@ public interface LoanCaseProgressFeign { //-----------------一审---------------------------- + @ApiOperation("查询一审详情") + @GetMapping("/getFirstDetails") + public ResultBean getFirstDetails(@RequestParam("sid") String sid); + + @ApiOperation("保存修改法官信息") + @PostMapping("/saveFirstJudge") + public ResultBean saveFirstJudge(@RequestBody ReviewVo dto); + + @ApiOperation("保存待立案") + @PostMapping("/saveFirstDaiLiAn") + public ResultBean saveFirstDaiLiAn(@RequestBody ReviewVo dto); + + @ApiOperation("保存已立案") + @PostMapping("/saveFirstYiLiAn") + public ResultBean saveFirstYiLiAn(@RequestBody ReviewVo dto); + + + //-----------------一审---------------------------- + + @ApiOperation("查询二审详情") + @GetMapping("/getSecondDetails") + public ResultBean getSecondDetails(@RequestParam("sid") String sid); + + + //-----------------一审---------------------------- + + @ApiOperation("查询再审详情") + @GetMapping("/getMoreDetails") + public ResultBean getMoreDetails(@RequestParam("sid") String sid); + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java index 036df5140d..2cd6f144d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; +import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -32,4 +33,34 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { public ResultBean saveProgress(LoanCaseProgressDto dto) { return null; } + + @Override + public ResultBean getFirstDetails(String sid) { + return null; + } + + @Override + public ResultBean saveFirstJudge(ReviewVo dto) { + return null; + } + + @Override + public ResultBean saveFirstDaiLiAn(ReviewVo dto) { + return null; + } + + @Override + public ResultBean saveFirstYiLiAn(ReviewVo dto) { + return null; + } + + @Override + public ResultBean getSecondDetails(String sid) { + return null; + } + + @Override + public ResultBean getMoreDetails(String sid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java index f5a162a9ad..567c8bff4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressVo.java @@ -35,6 +35,8 @@ public class LoanCaseProgressVo implements Vo { private String loanContractNo; @ApiModelProperty("资方") private String bankName; + @ApiModelProperty("资方合同号") + private String bankContractNo; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("贷款人") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java new file mode 100644 index 0000000000..7a7b1900a0 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiKaiTingInfo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:11 + */ +@Data +public class DaiKaiTingInfo { + //待开庭 + @ApiModelProperty("待开庭-开庭所需天数") + private String trialNeedDays; + @ApiModelProperty("待开庭-开庭传票日期") + private String trialTime; + @ApiModelProperty("待开庭-预计开庭日期") + private String trialPreTime; + @ApiModelProperty("待开庭-备注") + private String trialRemarks; + @ApiModelProperty("待开庭-附件") + private List file = new ArrayList<>(); + @ApiModelProperty("待开庭-开庭时效要求天数") + private String trialDays; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java new file mode 100644 index 0000000000..d525f8e698 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DaiLiAnInfo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:08 + */ +@Data +public class DaiLiAnInfo { + //待立案 + @ApiModelProperty("待立案-材料提交法院日期") + private String submitTime; + @ApiModelProperty("待立案-立案所需天数") + private String caseNeedDays; + @ApiModelProperty("待立案-备注") + private String pendingRemarks; + @ApiModelProperty("待立案-立案时效要求天数") + private String pendingDays; + @ApiModelProperty("待立案-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java new file mode 100644 index 0000000000..1b3146f6b5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/DelegateInfo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:07 + */ +@Data +public class DelegateInfo { + + @ApiModelProperty("律师事务所") + private String lawFirms; + @ApiModelProperty("承办律师") + private String lawer; + @ApiModelProperty("律师联系电话") + private String lawerPhone; + + private List file = new ArrayList<>(); + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java new file mode 100644 index 0000000000..3674b1af9b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/JudgeInfo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:04 + */ +@Data +public class JudgeInfo { + + //法官信息 + @ApiModelProperty("管辖法院") + private String court; + @ApiModelProperty("法院地址") + private String courtAddress; + @ApiModelProperty("法官") + private String judge; + @ApiModelProperty("法官联系电话") + private String judgePhone; + @ApiModelProperty("案号") + private String caseNumber; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java new file mode 100644 index 0000000000..d4c22306c9 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/PanJueInfo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:14 + */ +@Data +public class PanJueInfo { + //已判决/调解 + @ApiModelProperty("已判决/调解-判决/调解日期") + private String verdictTime; + @ApiModelProperty("已判决/调解-结果") + private String verdictResult; + @ApiModelProperty("已判决/调解-金额") + private String verdictAmount; + @ApiModelProperty("已判决/调解-领取日期") + private String receiveTime; + @ApiModelProperty("已判决/调解-出判实际天数") + private String verdictDays; + @ApiModelProperty("已判决/调解-备注") + private String verdictRemarks; + @ApiModelProperty("已判决/调解-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java new file mode 100644 index 0000000000..9d62a7e04c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ReviewVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/2/28 14:49 + */ +@Data +public class ReviewVo { + + private String sid; + private JudgeInfo judgeInfo = new JudgeInfo();//法官信息 + private DelegateInfo delegateInfo = new DelegateInfo();//委派情况 + private DaiLiAnInfo daiLiAnInfo = new DaiLiAnInfo();//待立案 + private YiLiAnInfo yiLiAnInfo = new YiLiAnInfo();//已立案 + private DaiKaiTingInfo daiKaiTingInfo = new DaiKaiTingInfo();//待开庭 + private YiKaiTingInfo yiKaiTingInfo = new YiKaiTingInfo();//已开庭 + private PanJueInfo panJueInfo = new PanJueInfo();//已判决、调解 + private ShengXiaoInfo shengXiaoInfo = new ShengXiaoInfo();//已生效 + private ShangSuInfo shangSuInfo = new ShangSuInfo();//上诉 + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java new file mode 100644 index 0000000000..049277cc11 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShangSuInfo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 16:21 + */ +@Data +public class ShangSuInfo { + //上诉/应诉 + @ApiModelProperty("上诉/应诉-上诉日期") + private String appealTime; + @ApiModelProperty("上诉/应诉-材料递交日期") + private String infoTransferTime; + @ApiModelProperty("上诉/应诉-上诉实际天数") + private String appealNeedDays; + @ApiModelProperty("上诉/应诉-备注") + private String appealRemarks; + @ApiModelProperty("上诉/应诉-时效要求天数") + private String appealDays; + @ApiModelProperty("上诉/应诉-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java new file mode 100644 index 0000000000..f95e104760 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/ShengXiaoInfo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:15 + */ +@Data +public class ShengXiaoInfo { + //已生效 + @ApiModelProperty("已生效-生效日期") + private String effectTime; + @ApiModelProperty("已生效-备注") + private String effectRemarks; + @ApiModelProperty("已生效-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java new file mode 100644 index 0000000000..581521316c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiKaiTingInfo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:12 + */ +@Data +public class YiKaiTingInfo { + //已开庭 + @ApiModelProperty("已开庭-一次开庭日期") + private String alreadyTime; + @ApiModelProperty("已开庭-开庭实际天数") + private String actualDays; + @ApiModelProperty("已开庭-二次开庭日期") + private String secondTime; + @ApiModelProperty("已开庭-庭审总结") + private String summary; + @ApiModelProperty("已开庭-出判时效要求天数") + private String alreadyDays; + @ApiModelProperty("已开庭-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java new file mode 100644 index 0000000000..b3da98b59d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/tingshen/YiLiAnInfo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen; + +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/2/28 15:09 + */ +@Data +public class YiLiAnInfo { + //已立案 + @ApiModelProperty("已立案-立案日期") + private String filedTime; + @ApiModelProperty("已立案-立案实际天数") + private String filedDays; + @ApiModelProperty("已立案-备注") + private String filedRemarks; + @ApiModelProperty("已立案-附件") + private List file = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java index e37f23a31e..804fc5e36a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresstrial/LoanCaseProgressTrial.java @@ -25,6 +25,8 @@ public class LoanCaseProgressTrial extends BaseEntity { private String courtAddress; @ApiModelProperty("法官") private String judge; + @ApiModelProperty("法官联系电话") + private String judgePhone; @ApiModelProperty("案号") private String caseNumber; //委派情况 @@ -104,6 +106,19 @@ public class LoanCaseProgressTrial extends BaseEntity { private String effectRemarks; @ApiModelProperty("已生效-附件") private String effectFiles; + //上诉/应诉 + @ApiModelProperty("上诉/应诉-上诉日期") + private Date appealTime; + @ApiModelProperty("上诉/应诉-材料递交日期") + private Date infoTransferTime; + @ApiModelProperty("上诉/应诉-上诉实际天数") + private String appealNeedDays; + @ApiModelProperty("上诉/应诉-备注") + private String appealRemarks; + @ApiModelProperty("上诉/应诉-时效要求天数") + private String appealDays; + @ApiModelProperty("上诉/应诉-附件") + private String appealFiles; //---------------------------- @ApiModelProperty("案件当前环节") private String caseTache; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java index 5afb7567d8..05be2b4d2e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanlawsuitapply/app/AppLawsuitDetailsVo.java @@ -35,6 +35,8 @@ public class AppLawsuitDetailsVo { private String progress; @ApiModelProperty("欠款合计") private String amountAll; + @ApiModelProperty("诉讼主体") + private String lawsuitSubject; private List vehListVos = new ArrayList<>(); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java index ba901f6797..fa4616ebbc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java @@ -31,6 +31,8 @@ public interface LoanCaseProgressMapper extends BaseMapper { String selMaxDueDateByOrderSid(@Param("salesOrderSid") String salesOrderSid); + String selLawyerSidBySid(@Param("sid") String sid); + @Update("update loan_case_progress set full = #{isFullProceed},sueShows = #{partProceedRemarks},sueMoney = #{sueMoneyTotal},lawFirms = #{lawyerFirm},lawer = #{lawyerName},lawerPhone = #{lawyerPhone} where sid = #{busSid}") void updateLsxg(@Param("busSid") String busSid,@Param("isFullProceed") String isFullProceed,@Param("partProceedRemarks") String partProceedRemarks,@Param("sueMoneyTotal") String sueMoneyTotal,@Param("lawyerFirm") String lawyerFirm,@Param("lawyerName") String lawyerName,@Param("lawyerPhone") String lawyerPhone); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml index 080d61ae53..ceb94ec807 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml +++ b/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, - b.lawyerFirm as lawFirms, - b.lawyerName as lawer, + p.lawFirms, + p.lawer, p.caseNo, p.caseType, p.caseStage, @@ -48,9 +48,6 @@ p.`full` FROM loan_case_progress as p - LEFT JOIN - ( SELECT * FROM loan_case_entrust_lawyer_apply as a WHERE a.nodeState = '已办结') as b - ON p.sid = b.busSid ${ew.sqlSegment} @@ -59,5 +56,9 @@ SELECT p.dueDate FROM loan_repayment_plan_details as p WHERE p.salesOrderSid = #{salesOrderSid} ORDER BY p.dueDate DESC LIMIT 1 + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java index 98a24b1587..b2b601c058 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogress; import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApplyVo; import com.yxt.anrui.riskcenter.api.loanparameter.*; import com.yxt.common.core.query.PagerQuery; @@ -47,4 +48,38 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { public ResultBean saveProgress(LoanCaseProgressDto dto) { return loanCaseProgressService.saveProgress(dto); } + + @Override + public ResultBean getFirstDetails(String sid) { + return loanCaseProgressService.getFirstDetails(sid); + } + + @Override + public ResultBean saveFirstJudge(ReviewVo dto) { + return loanCaseProgressService.saveFirstJudge(dto); + } + + @Override + public ResultBean saveFirstDaiLiAn(ReviewVo dto) { + return loanCaseProgressService.saveFirstDaiLiAn(dto); + } + + @Override + public ResultBean saveFirstYiLiAn(ReviewVo dto) { + return loanCaseProgressService.saveFirstYiLiAn(dto); + } + + @Override + public ResultBean getSecondDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "二审"); + return rb.success().setData(vo); + } + + @Override + public ResultBean getMoreDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + ReviewVo vo = loanCaseProgressService.returnReviewVo(sid, "再审"); + return rb.success().setData(vo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java index 8aed7de8b2..5e032f740e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java @@ -18,17 +18,24 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loancaseentrustlawyerapply.LoanCaseEntrustLawyerFile; import com.yxt.anrui.riskcenter.api.loancaseprogress.*; +import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.*; import com.yxt.anrui.riskcenter.api.loancaseprogressfees.LoanCaseProgressFees; import com.yxt.anrui.riskcenter.api.loancaseprogressguarantor.LoanCaseProgressGuarantor; import com.yxt.anrui.riskcenter.api.loancaseprogresspreserve.LoanCaseProgressPreserve; +import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; import com.yxt.anrui.riskcenter.biz.loancaseprogressfees.LoanCaseProgressFeesService; import com.yxt.anrui.riskcenter.biz.loancaseprogressguarantor.LoanCaseProgressGuarantorService; import com.yxt.anrui.riskcenter.biz.loancaseprogresspreserve.LoanCaseProgressPreserveService; +import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -55,6 +62,8 @@ import java.util.stream.Collectors; @Service public class LoanCaseProgressService extends MybatisBaseService { + @Autowired + private LoanFileService loanFileService; @Autowired private SysUserFeign sysUserFeign; @Autowired @@ -77,6 +86,8 @@ public class LoanCaseProgressService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); -// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { -// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) -// String orgSidPath = pagerQuery.getOrgPath(); -// orgSidPath = orgSidPath + "/"; -// int i1 = orgSidPath.indexOf("/"); -// int i2 = orgSidPath.indexOf("/", i1 + 1); -// int i3 = orgSidPath.indexOf("/", i2 + 1); -// int i4 = orgSidPath.indexOf("/", i3 + 1); -// String orgLevelKey = defaultIdReltBean.getData(); -// if ("1".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i1); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("2".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i2); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("3".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i3); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("4".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i4); -// qw.like("p.orgSidPath", orgSidPath); -// } else if ("5".equals(orgLevelKey)) { -// qw.eq("p.createBySid", pagerQuery.getUserSid()); -// } else { -// PagerVo p = new PagerVo<>(); -// return p; -// } -// } else { -// PagerVo p = new PagerVo<>(); -// return p; -// } + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("p.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("p.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("p.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("p.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("p.createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } //======================= //分公司 if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { @@ -282,11 +293,11 @@ public class LoanCaseProgressService extends MybatisBaseService wtxy = loanFileService.selectByLinkSid(lawyerSid, LoanFileEnum.ENTRUSTLAWYER_WTXY.getAttachType()); + List file = new ArrayList<>(); + if (wtxy != null && wtxy.size() > 0) { + for (LoanFile loanFile : wtxy) { + UrlQuery loanCaseEntrustLawyerFile = new UrlQuery(); + String filePath = loanFile.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + loanCaseEntrustLawyerFile.setUrl(filePath); + file.add(loanCaseEntrustLawyerFile); + } + } + delegateInfo.setFile(file); + vo.setDelegateInfo(delegateInfo); + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, caseStage); + if (null != trial) { + //法官信息 + JudgeInfo judgeInfo = new JudgeInfo(); + BeanUtil.copyProperties(trial, judgeInfo); + vo.setJudgeInfo(judgeInfo); + //待立案 + DaiLiAnInfo daiLiAnInfo = new DaiLiAnInfo(); + BeanUtil.copyProperties(trial, daiLiAnInfo); + if (null != trial.getSubmitTime()) { + daiLiAnInfo.setSubmitTime(sdf.format(trial.getSubmitTime())); + } + String pendingFiles = trial.getPendingFiles(); + List pf = new ArrayList<>(); + if (StringUtils.isNotBlank(pendingFiles)) { + List fileList = Arrays.asList(pendingFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + pf.add(urlQuery); + } + daiLiAnInfo.setFile(pf); + } + vo.setDaiLiAnInfo(daiLiAnInfo); + //已立案 + YiLiAnInfo yiLiAnInfo = new YiLiAnInfo(); + BeanUtil.copyProperties(trial, yiLiAnInfo); + if (null != trial.getFiledTime()) { + yiLiAnInfo.setFiledTime(sdf.format(trial.getFiledTime())); + } + String filedFiles = trial.getFiledFiles(); + List ff = new ArrayList<>(); + if (StringUtils.isNotBlank(filedFiles)) { + List fileList = Arrays.asList(filedFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + ff.add(urlQuery); + } + yiLiAnInfo.setFile(ff); + } + vo.setYiLiAnInfo(yiLiAnInfo); + //待开庭 + DaiKaiTingInfo daiKaiTingInfo = new DaiKaiTingInfo(); + BeanUtil.copyProperties(trial, daiKaiTingInfo); + if (null != trial.getTrialTime()) { + daiKaiTingInfo.setTrialTime(sdf.format(trial.getTrialTime())); + } + if (null != trial.getTrialPreTime()) { + daiKaiTingInfo.setTrialPreTime(sdf.format(trial.getTrialPreTime())); + } + String trialFiles = trial.getTrialFiles(); + List tf = new ArrayList<>(); + if (StringUtils.isNotBlank(trialFiles)) { + List fileList = Arrays.asList(trialFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + tf.add(urlQuery); + } + daiKaiTingInfo.setFile(tf); + } + vo.setDaiKaiTingInfo(daiKaiTingInfo); + //已开庭 + YiKaiTingInfo yiKaiTingInfo = new YiKaiTingInfo(); + BeanUtil.copyProperties(trial, yiKaiTingInfo); + if (null != trial.getAlreadyTime()) { + yiKaiTingInfo.setAlreadyTime(sdf.format(trial.getAlreadyTime())); + } + if (null != trial.getSecondTime()) { + yiKaiTingInfo.setSecondTime(sdf.format(trial.getSecondTime())); + } + String alreadyFiles = trial.getAlreadyFiles(); + List af = new ArrayList<>(); + if (StringUtils.isNotBlank(alreadyFiles)) { + List fileList = Arrays.asList(alreadyFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + af.add(urlQuery); + } + yiKaiTingInfo.setFile(af); + } + vo.setYiKaiTingInfo(yiKaiTingInfo); + //已判决、调解 + PanJueInfo panJueInfo = new PanJueInfo(); + BeanUtil.copyProperties(trial, panJueInfo); + if (null != trial.getVerdictTime()) { + panJueInfo.setVerdictTime(sdf.format(trial.getVerdictTime())); + } + String verdictFiles = trial.getVerdictFiles(); + List vf = new ArrayList<>(); + if (StringUtils.isNotBlank(verdictFiles)) { + List fileList = Arrays.asList(verdictFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + vf.add(urlQuery); + } + panJueInfo.setFile(vf); + } + vo.setPanJueInfo(panJueInfo); + //已生效 + ShengXiaoInfo shengXiaoInfo = new ShengXiaoInfo(); + BeanUtil.copyProperties(trial, shengXiaoInfo); + if (null != trial.getEffectTime()) { + shengXiaoInfo.setEffectTime(sdf.format(trial.getEffectTime())); + } + String effectFiles = trial.getEffectFiles(); + List eff = new ArrayList<>(); + if (StringUtils.isNotBlank(effectFiles)) { + List fileList = Arrays.asList(effectFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + eff.add(urlQuery); + } + shengXiaoInfo.setFile(eff); + } + vo.setShengXiaoInfo(shengXiaoInfo); + //上诉 + ShangSuInfo shangSuInfo = new ShangSuInfo(); + BeanUtil.copyProperties(trial, shengXiaoInfo); + if (null != trial.getAppealTime()) { + shangSuInfo.setAppealTime(sdf.format(trial.getAppealTime())); + } + if (null != trial.getInfoTransferTime()) { + shangSuInfo.setInfoTransferTime(sdf.format(trial.getInfoTransferTime())); + } + String appealFiles = trial.getAppealFiles(); + List appealF = new ArrayList<>(); + if (StringUtils.isNotBlank(appealFiles)) { + List fileList = Arrays.asList(appealFiles.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + for (int i = 0; i < fileList.size(); i++) { + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(fileList.get(i)); + appealF.add(urlQuery); + } + shangSuInfo.setFile(appealF); + } + vo.setShangSuInfo(shangSuInfo); + } + return vo; + } + + public ResultBean getFirstDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + ReviewVo vo = returnReviewVo(sid, "一审"); + return rb.success().setData(vo); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstJudge(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + JudgeInfo judgeInfo = dto.getJudgeInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(judgeInfo, trial); + loanCaseProgressTrialService.updateById(trial); + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(judgeInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("一审"); + progressTrial.setCaseStageNo("1"); + loanCaseProgressTrialService.insert(progressTrial); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstDaiLiAn(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + DaiLiAnInfo daiLiAnInfo = dto.getDaiLiAnInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(daiLiAnInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("1"); + trial.setCaseTache("待立案"); + } + //保存附件 + List filss = daiLiAnInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + trial.setPendingFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("1"); + progress.setCaseTache("待立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(daiLiAnInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("一审"); + progressTrial.setCaseStageNo("1"); + progressTrial.setCaseTacheNo("1"); + progressTrial.setCaseTache("待立案"); + //保存附件 + List filss = daiLiAnInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + progressTrial.setPendingFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("1"); + progress.setCaseTache("待立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstYiLiAn(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiLiAnInfo yiLiAnInfo = dto.getYiLiAnInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(yiLiAnInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("已立案"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 2) { + trial.setCaseTacheNo("2"); + trial.setCaseTache("已立案"); + } + } + //保存附件 + List filss = yiLiAnInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + trial.setFiledFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("2"); + progress.setCaseTache("已立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 2) { + String enterDate = progress.getEnterDate(); + try { + Date star = sdf.parse(enterDate);//开始时间 + Date endDay = new Date();//结束时间 + Date nextDay = star; + int days = 0; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + days++; + } + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); + } + progress.setCaseTacheNo("2"); + progress.setCaseTache("已立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(yiLiAnInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("一审"); + progressTrial.setCaseStageNo("1"); + progressTrial.setCaseTacheNo("2"); + progressTrial.setCaseTache("已立案"); + //保存附件 + List filss = yiLiAnInfo.getFile(); + filss.removeAll(Collections.singleton(null)); + if (!filss.isEmpty()) { + List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); + filesList.removeAll(Collections.singleton(null)); + if (!filesList.isEmpty()) { + String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + progressTrial.setFiledFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + if (StringUtils.isBlank(progress.getCaseStageNo())) { + progress.setCaseStage("一审"); + progress.setCaseStageNo("1"); + progress.setCaseTacheNo("2"); + progress.setCaseTache("已立案"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + public void updateLsxg(String busSid, String isFullProceed, String partProceedRemarks, String sueMoneyTotal, String lawyerFirm, String lawyerName, String lawyerPhone) { baseMapper.updateLsxg(busSid,isFullProceed,partProceedRemarks,sueMoneyTotal,lawyerFirm,lawyerName,lawyerPhone); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml index 946f06bb17..badae17a96 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyMapper.xml @@ -152,7 +152,8 @@ a.bankName, a.progress, a.amountAll, - a.salesOrderSid + a.salesOrderSid, + a.lawsuitSubject FROM loan_lawsuit_apply AS a diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java index ba32d830c3..7f18f949ac 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/lawsuit/LawsuitDetailsVo.java @@ -38,6 +38,8 @@ public class LawsuitDetailsVo implements Vo { private String progress; @ApiModelProperty("欠款合计") private String amountAll; + @ApiModelProperty("诉讼主体") + private String lawsuitSubject; private List vehListVos = new ArrayList<>(); private CarModelVo jrfa;//金融方案 }