From 04ea795d19b5c52373a28b33b4989ee479a94c0b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 29 Feb 2024 18:02:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E5=AE=A1=E3=80=81=E5=86=8D=E5=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loancaseprogress/DetailsFees.java | 4 +- .../loancaseprogress/LoanCaseProgress.java | 7 +- .../LoanCaseProgressFeign.java | 63 +- .../LoanCaseProgressFeignFallback.java | 70 + .../tingshen/DelegateInfo.java | 2 +- .../LoanCaseProgressMapper.java | 3 + .../LoanCaseProgressMapper.xml | 30 +- .../LoanCaseProgressRest.java | 70 + .../LoanCaseProgressService.java | 1514 ++++++++++++++++- .../LoanLawsuitApplyMapper.xml | 33 +- .../LoanLawsuitApplyService.java | 33 +- 11 files changed, 1686 insertions(+), 143 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java index b1acde847a..cc8dbdaf8c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java +++ b/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") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java index a15564f6a0..213cbef677 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgress.java +++ b/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; + } 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 c6c0b0fc36..5e171e5add 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 @@ -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 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 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); + + + //---------------------------执行------------------------- + + } 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 2cd6f144d6..6fd45e74a4 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 @@ -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 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 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; + } } 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 index 1b3146f6b5..f69ab649d2 100644 --- 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 @@ -24,5 +24,5 @@ public class DelegateInfo { private List file = new ArrayList<>(); - + private String lawyerSid; } 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 61ea3f66c9..ed0c905e1b 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 @@ -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 { @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); } 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 ceb94ec807..edfbadf7a6 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, - 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 ${ew.sqlSegment} + \ 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 b2b601c058..c677746d96 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 @@ -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 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 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); + } } 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 dddc54bc42..5ddc33dd5b 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 @@ -149,7 +149,19 @@ public class LoanCaseProgressService extends MybatisBaseService vehList = dto.getVehList(); String affiliatedCompany = ""; @@ -293,11 +305,11 @@ public class LoanCaseProgressService extends MybatisBaseService pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; @@ -518,19 +529,10 @@ public class LoanCaseProgressService extends MybatisBaseService wtxy = loanFileService.selectByLinkSid(lawyerSid, LoanFileEnum.ENTRUSTLAWYER_WTXY.getAttachType()); List file = new ArrayList<>(); if (wtxy != null && wtxy.size() > 0) { @@ -704,6 +706,372 @@ public class LoanCaseProgressService extends MybatisBaseService 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); + } + 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); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 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) { + 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); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstDaiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + DaiKaiTingInfo daiKaiTingInfo = dto.getDaiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(daiKaiTingInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 3) { + trial.setCaseTacheNo("3"); + trial.setCaseTache("待开庭"); + } + //保存附件 + List filss = daiKaiTingInfo.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.setTrialFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 3) { + 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("3"); + progress.setCaseTache("待开庭"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstYiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiKaiTingInfo yiKaiTingInfo = dto.getYiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(yiKaiTingInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 4) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已开庭"); + } + //保存附件 + List filss = yiKaiTingInfo.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.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 4) { + 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("4"); + progress.setCaseTache("已开庭"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstPanJue(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + PanJueInfo panJueInfo = dto.getPanJueInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(panJueInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 5) { + trial.setCaseTacheNo("5"); + trial.setCaseTache("已判决/调解"); + } + //保存附件 + List filss = panJueInfo.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.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 5) { + 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("5"); + progress.setCaseTache("已判决/调解"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveFirstShengXiao(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + ShengXiaoInfo shengXiaoInfo = dto.getShengXiaoInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "一审"); + if (null != trial) { + BeanUtil.copyProperties(shengXiaoInfo, trial); + String caseTacheNonow = trial.getCaseTacheNo(); + int inow = Integer.parseInt(caseTacheNonow); + if (inow < 6) { + trial.setCaseTacheNo("6"); + trial.setCaseTache("已生效"); + } + //保存附件 + List filss = shengXiaoInfo.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.setEffectFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStageNo = progress.getCaseStageNo(); + int i = Integer.parseInt(caseStageNo); + if (i == 1) { + String caseTacheNo = progress.getCaseTacheNo(); + int t = Integer.parseInt(caseTacheNo); + if (t < 6) { + 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("6"); + 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) { + baseMapper.updateLsxg(busSid, isFullProceed, partProceedRemarks, sueMoneyTotal); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveSecondJudge(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); @@ -711,75 +1079,118 @@ public class LoanCaseProgressService extends MybatisBaseService filss = daiLiAnInfo.getFile(); + List filss = shangSuInfo.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); + trial.setAppealFiles(files); } } loanCaseProgressTrialService.updateById(trial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("1"); - progress.setCaseTache("待立案"); + progress.setCaseTache("上诉/应诉"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); } } } else { LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); - BeanUtil.copyProperties(daiLiAnInfo, progressTrial); + BeanUtil.copyProperties(shangSuInfo, progressTrial); progressTrial.setMainSid(sid); - progressTrial.setCaseStage("一审"); - progressTrial.setCaseStageNo("1"); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); progressTrial.setCaseTacheNo("1"); - progressTrial.setCaseTache("待立案"); + progressTrial.setCaseTache("上诉/应诉"); //保存附件 - List filss = daiLiAnInfo.getFile(); + List filss = shangSuInfo.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); + progressTrial.setAppealFiles(files); } } loanCaseProgressTrialService.insert(progressTrial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("1"); - progress.setCaseTache("待立案"); + progress.setCaseTache("上诉/应诉"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); } @@ -789,107 +1200,147 @@ public class LoanCaseProgressService extends MybatisBaseService filss = yiLiAnInfo.getFile(); + List filss = daiKaiTingInfo.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); + trial.setTrialFiles(files); } } loanCaseProgressTrialService.updateById(trial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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.setCaseTache("待开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); 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(); + } else if (i == 2) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 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.setCaseTacheNo("2"); - progress.setCaseTache("已立案"); - progress.setEnterDate(DateUtil.formatDate(new Date())); - baseMapper.updateById(progress); + progress.setUseDays(String.valueOf(days)); + } catch (ParseException e) { + e.printStackTrace(); } + progress.setCaseTacheNo("2"); + progress.setCaseTache("待开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); } } } } else { LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); - BeanUtil.copyProperties(yiLiAnInfo, progressTrial); + BeanUtil.copyProperties(daiKaiTingInfo, progressTrial); progressTrial.setMainSid(sid); - progressTrial.setCaseStage("一审"); - progressTrial.setCaseStageNo("1"); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); progressTrial.setCaseTacheNo("2"); - progressTrial.setCaseTache("已立案"); + progressTrial.setCaseTache("待开庭"); //保存附件 - List filss = yiLiAnInfo.getFile(); + List filss = daiKaiTingInfo.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); + progressTrial.setTrialFiles(files); } } loanCaseProgressTrialService.insert(progressTrial); LoanCaseProgress progress = fetchBySid(sid); if (null != progress) { - if (StringUtils.isBlank(progress.getCaseStageNo())) { - progress.setCaseStage("一审"); - progress.setCaseStageNo("1"); + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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.setCaseTache("待开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); progress.setEnterDate(DateUtil.formatDate(new Date())); baseMapper.updateById(progress); } @@ -898,7 +1349,886 @@ public class LoanCaseProgressService extends MybatisBaseService filss = yiKaiTingInfo.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.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 2) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(yiKaiTingInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); + progressTrial.setCaseTacheNo("3"); + progressTrial.setCaseTache("已开庭"); + //保存附件 + List filss = yiKaiTingInfo.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.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveSecondPanJue(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + PanJueInfo panJueInfo = dto.getPanJueInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "二审"); + if (null != trial) { + BeanUtil.copyProperties(panJueInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 4) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } + } + //保存附件 + List filss = panJueInfo.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.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 2) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 4) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(panJueInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("二审"); + progressTrial.setCaseStageNo("2"); + progressTrial.setCaseTacheNo("4"); + progressTrial.setCaseTache("已判决/调解"); + //保存附件 + List filss = panJueInfo.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.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i == 1) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("二审"); + progress.setCaseStageNo("2"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreJudge(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("3"); + loanCaseProgressTrialService.insert(progressTrial); + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreShangSu(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + ShangSuInfo shangSuInfo = dto.getShangSuInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(shangSuInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("1"); + trial.setCaseTache("上诉/应诉"); + } + //保存附件 + List filss = shangSuInfo.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.setAppealFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("1"); + progress.setCaseTache("上诉/应诉"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(shangSuInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("1"); + progressTrial.setCaseTache("上诉/应诉"); + //保存附件 + List filss = shangSuInfo.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.setAppealFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("1"); + progress.setCaseTache("上诉/应诉"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreDaiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + DaiKaiTingInfo daiKaiTingInfo = dto.getDaiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(daiKaiTingInfo, 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 = daiKaiTingInfo.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.setTrialFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 3) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 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.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(daiKaiTingInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("2"); + progressTrial.setCaseTache("待开庭"); + //保存附件 + List filss = daiKaiTingInfo.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.setTrialFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMoreYiKaiTing(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + YiKaiTingInfo yiKaiTingInfo = dto.getYiKaiTingInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(yiKaiTingInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("3"); + trial.setCaseTache("已开庭"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 3) { + trial.setCaseTacheNo("3"); + trial.setCaseTache("已开庭"); + } + } + //保存附件 + List filss = yiKaiTingInfo.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.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 3) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(yiKaiTingInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("3"); + progressTrial.setCaseTache("已开庭"); + //保存附件 + List filss = yiKaiTingInfo.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.setAlreadyFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("3"); + progress.setCaseTache("已开庭"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveMorePanJue(ReviewVo dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + PanJueInfo panJueInfo = dto.getPanJueInfo(); + LoanCaseProgressTrial trial = loanCaseProgressTrialService.selByJdAndSid(sid, "再审"); + if (null != trial) { + BeanUtil.copyProperties(panJueInfo, trial); + if (StringUtils.isBlank(trial.getCaseTache())) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } else { + String caseTacheNo = trial.getCaseTacheNo(); + int i = Integer.parseInt(caseTacheNo); + if (i < 4) { + trial.setCaseTacheNo("4"); + trial.setCaseTache("已判决/调解"); + } + } + //保存附件 + List filss = panJueInfo.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.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.updateById(trial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } else if (i == 3) { + String caseTacheNo = progress.getCaseTacheNo(); + int i1 = Integer.parseInt(caseTacheNo); + if (i1 < 4) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + } else { + LoanCaseProgressTrial progressTrial = new LoanCaseProgressTrial(); + BeanUtil.copyProperties(panJueInfo, progressTrial); + progressTrial.setMainSid(sid); + progressTrial.setCaseStage("再审"); + progressTrial.setCaseStageNo("3"); + progressTrial.setCaseTacheNo("4"); + progressTrial.setCaseTache("已判决/调解"); + //保存附件 + List filss = panJueInfo.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.setVerdictFiles(files); + } + } + loanCaseProgressTrialService.insert(progressTrial); + LoanCaseProgress progress = fetchBySid(sid); + if (null != progress) { + String caseStage = progress.getCaseStage(); + int i = Integer.parseInt(caseStage); + if (i < 3) { + 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("4"); + progress.setCaseTache("已判决/调解"); + progress.setCaseStage("再审"); + progress.setCaseStageNo("3"); + progress.setEnterDate(DateUtil.formatDate(new Date())); + baseMapper.updateById(progress); + } + } + } + return rb.success(); } } 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 badae17a96..346e5b9e25 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 @@ -139,23 +139,22 @@ \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java index 743fce31f1..389dcc732b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java +++ b/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,21 +860,20 @@ public class LoanLawsuitApplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - //终止任务后操作 - return rb.success().setData(resultBean.getData()); - } else { + LoanLawsuitApply lawsuitApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = lawsuitApply.getTaskId(); + if (query.getUserSid().equals(lawsuitApply.getCreateBySid())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map 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 map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - //终止任务后操作 return rb.success().setData(resultBean.getData()); } } - } + return rb.setMsg("操作失败!提交的数据不一致!"); } From 403b5e3e39e7bc5c19fa4f21ba784c233a56a070 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 1 Mar 2024 10:37:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E5=A7=94=E6=89=98=E5=BE=8B=E5=B8=88=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/casedelegation/casedelegation.js | 112 ++++ .../views/casedelegation/casedelegation.vue | 353 +++++++++++ .../casedelegation/casedelegationAdd.vue | 373 ++++++++++++ .../casedelegation/casedelegationInfo.vue | 316 ++++++++++ .../weituoFlow/casedelegationDaiBan.vue | 555 ++++++++++++++++++ .../weituoFlow/casedelegationEdit.vue | 341 +++++++++++ .../weituoFlow/casedelegationYiBan.vue | 341 +++++++++++ .../weituoFlow/relation/shangsuInfo.vue | 336 +++++++++++ .../weituoFlow/relation/susongInfo.vue | 215 +++++++ 9 files changed, 2942 insertions(+) create mode 100644 anrui-riskcenter-ui/src/api/casedelegation/casedelegation.js create mode 100644 anrui-riskcenter-ui/src/views/casedelegation/casedelegation.vue create mode 100644 anrui-riskcenter-ui/src/views/casedelegation/casedelegationAdd.vue create mode 100644 anrui-riskcenter-ui/src/views/casedelegation/casedelegationInfo.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationDaiBan.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationEdit.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationYiBan.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/shangsuInfo.vue create mode 100644 anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/susongInfo.vue diff --git a/anrui-riskcenter-ui/src/api/casedelegation/casedelegation.js b/anrui-riskcenter-ui/src/api/casedelegation/casedelegation.js new file mode 100644 index 0000000000..e81997f1df --- /dev/null +++ b/anrui-riskcenter-ui/src/api/casedelegation/casedelegation.js @@ -0,0 +1,112 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + init: function(data) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/details', + method: 'post', + params: data + }) + }, + fetchBySid: function(data) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + deleteBySids: function(data) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submit: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/submit', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/riskcenter/v1/loancaseentrustlawyerapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/anrui-riskcenter-ui/src/views/casedelegation/casedelegation.vue b/anrui-riskcenter-ui/src/views/casedelegation/casedelegation.vue new file mode 100644 index 0000000000..a6ab86f184 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/casedelegation/casedelegation.vue @@ -0,0 +1,353 @@ + + + + diff --git a/anrui-riskcenter-ui/src/views/casedelegation/casedelegationAdd.vue b/anrui-riskcenter-ui/src/views/casedelegation/casedelegationAdd.vue new file mode 100644 index 0000000000..c88f556f59 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/casedelegation/casedelegationAdd.vue @@ -0,0 +1,373 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/casedelegation/casedelegationInfo.vue b/anrui-riskcenter-ui/src/views/casedelegation/casedelegationInfo.vue new file mode 100644 index 0000000000..ba15f508c6 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/casedelegation/casedelegationInfo.vue @@ -0,0 +1,316 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationDaiBan.vue new file mode 100644 index 0000000000..66f4bf5af9 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationDaiBan.vue @@ -0,0 +1,555 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationEdit.vue new file mode 100644 index 0000000000..16bde0621e --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationEdit.vue @@ -0,0 +1,341 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationYiBan.vue new file mode 100644 index 0000000000..f3750ed517 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/casedelegationYiBan.vue @@ -0,0 +1,341 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/shangsuInfo.vue b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/shangsuInfo.vue new file mode 100644 index 0000000000..3d761fd807 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/shangsuInfo.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/susongInfo.vue b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/susongInfo.vue new file mode 100644 index 0000000000..91b911dc6d --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/weituoFlow/relation/susongInfo.vue @@ -0,0 +1,215 @@ + + + + +