diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java index 6cc330d..e67a1b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.wisdomarbitrate; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; @@ -24,11 +25,10 @@ public class CaseLogRecordController extends BaseController { */ // @PreAuthorize("@ss.hasPermi('caseLog:list')") @GetMapping("/list") - public TableDataInfo list(CaseLogRecord caseLogRecord) + public AjaxResult list(CaseLogRecord caseLogRecord) { - startPage(); List list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); - return getDataTable(list); + return AjaxResult.success(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index b45733f..e2fd1f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -185,6 +185,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { // caseApplication.setIdCard(String.valueOf(sysUser.getIdCard())); } + if (role.getRoleName().equals("申请人")) { + // + caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); + } } @@ -531,44 +535,51 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseLogRecord5.setCaseNode(5); caseLogRecord5.setCaseNodeName("组庭审核"); caseLogRecord5.setContent("法律顾问将进行组庭审核"); + CaseLogRecord caseLogRecord6 = new CaseLogRecord(); caseLogRecord6.setCaseNode(6); + caseLogRecord6.setCaseNodeName("修改开庭时间"); + caseLogRecord6.setContent("部门长将修改开庭时间"); + + CaseLogRecord caseLogRecord7 = new CaseLogRecord(); + caseLogRecord6.setCaseNode(7); caseLogRecord6.setCaseNodeName("组庭确定"); caseLogRecord6.setContent("部门长将进行组庭确定"); - CaseLogRecord caseLogRecord7 = new CaseLogRecord(); - caseLogRecord7.setCaseNode(7); + + CaseLogRecord caseLogRecord8 = new CaseLogRecord(); + caseLogRecord7.setCaseNode(8); caseLogRecord7.setCaseNodeName("审核仲裁方式"); caseLogRecord7.setContent("仲裁员将进行审核仲裁方式"); - CaseLogRecord caseLogRecord8 = new CaseLogRecord(); - caseLogRecord8.setCaseNode(8); + CaseLogRecord caseLogRecord9 = new CaseLogRecord(); + caseLogRecord8.setCaseNode(9); caseLogRecord8.setCaseNodeName("开庭审理"); caseLogRecord8.setContent("仲裁员将进行开庭审理"); - CaseLogRecord caseLogRecord9 = new CaseLogRecord(); - caseLogRecord9.setCaseNode(9); + CaseLogRecord caseLogRecord11 = new CaseLogRecord(); + caseLogRecord9.setCaseNode(11); caseLogRecord9.setCaseNodeName("书面审理"); caseLogRecord9.setContent("仲裁员将进行书面审理"); - CaseLogRecord caseLogRecord11 = new CaseLogRecord(); - caseLogRecord11.setCaseNode(11); + CaseLogRecord caseLogRecord12 = new CaseLogRecord(); + caseLogRecord11.setCaseNode(12); caseLogRecord11.setCaseNodeName("核验仲裁文书"); caseLogRecord11.setContent("法律顾问将进行核验仲裁文书"); - CaseLogRecord caseLogRecord12 = new CaseLogRecord(); - caseLogRecord12.setCaseNode(12); + CaseLogRecord caseLogRecord13 = new CaseLogRecord(); + caseLogRecord12.setCaseNode(13); caseLogRecord12.setCaseNodeName("确认仲裁文书"); caseLogRecord12.setContent("仲裁员将进行确认仲裁文书"); - CaseLogRecord caseLogRecord13 = new CaseLogRecord(); - caseLogRecord13.setCaseNode(13); + CaseLogRecord caseLogRecord14 = new CaseLogRecord(); + caseLogRecord13.setCaseNode(14); caseLogRecord13.setCaseNodeName("仲裁文书签名"); caseLogRecord13.setContent("仲裁员将进行仲裁文书签名"); - CaseLogRecord caseLogRecord14 = new CaseLogRecord(); - caseLogRecord14.setCaseNode(14); + CaseLogRecord caseLogRecord15 = new CaseLogRecord(); + caseLogRecord14.setCaseNode(15); caseLogRecord14.setCaseNodeName("仲裁文书用印"); caseLogRecord14.setContent("部门长将进行仲裁文书用印"); - CaseLogRecord caseLogRecord15 = new CaseLogRecord(); - caseLogRecord15.setCaseNode(15); + CaseLogRecord caseLogRecord16 = new CaseLogRecord(); + caseLogRecord15.setCaseNode(16); caseLogRecord15.setCaseNodeName("仲裁文书送达"); caseLogRecord15.setContent("法律顾问将进行仲裁文书送达"); - CaseLogRecord caseLogRecord16 = new CaseLogRecord(); - caseLogRecord16.setCaseNode(16); + CaseLogRecord caseLogRecord17 = new CaseLogRecord(); + caseLogRecord16.setCaseNode(17); caseLogRecord16.setCaseNodeName("案件归档"); caseLogRecord16.setContent("法律顾问将进行案件归档"); @@ -2215,7 +2226,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { public int pendTralSure(CaseApplication caseApplication) { // caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); - caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); + caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); Integer isAgreePendTral = caseApplication.getIsAgreePendTral(); int rows = 0; //同意组庭 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 3a9f0d8..6ad6e0b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -72,12 +72,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { if (opinion == 0) { //拒绝 if (arbitratMethod == 2) { caseApplication1.setArbitratMethod(1); // 更改仲裁方式 - //修改案件状态为待开庭审理 - caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + //修改案件状态修改开庭时间 + caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); //修改案件状态为待修改开庭时间 // caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, ""); } else { caseApplication1.setArbitratMethod(2); @@ -95,12 +95,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, ""); } else { - //修改案件状态为待开庭审理 - caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + //修改案件状态为待修改开庭时间 + caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); //修改案件状态为待修改开庭时间 // caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, ""); } }