SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化案件状态名称命名

Browse Source
This commit is contained in:
wangqiong
2024-04-29 11:19:34 +08:00
parent 4a807869aa
commit c19c61affd
12 changed files with 103 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+1 -1
View File
@@ -228,7 +228,7 @@ public class CaseApplication extends BaseEntity {
private List<Integer> annexTypeList;
/**
* 立案申请书(1)、申请人证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)
* 立案申请书(1)、申请人证据材料(2)、裁决书(3)、案件视频(4)、身份证件(5)
* 被申请人证据材料 (6)、庭审笔录(7)、缴费凭证(8)、视频录制(9)、公章图片(10)、语音转录文件(11)
*/
private Integer annexType;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class CaseAttach {
*/
private String annexPath;
/**
* 附件类型,立案申请书(1)、申请人证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)、被申请人证据材料 (6)、庭审笔录(7)、缴费凭证(8)'
* 附件类型,立案申请书(1)、申请人证据材料(2)、裁决书(3)、案件视频(4)、身份证件(5)、被申请人证据材料 (6)、庭审笔录(7)、缴费凭证(8)'
*/
private Integer annexType;
/**
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java
+7 -7
View File
@@ -21,14 +21,14 @@ public class ToDoCount {
private int caseApplyArbitrateWay=0; // 待审核仲裁方式
private int caseApplyGroupOnline=0; // 待开庭审理
private int caseApplyGroupOffline=0; // 待书面审理
private int caseApplyAward=0; // 待生成仲裁文书
private int caseApplyAwardCheck=0; // 待核验仲裁文书
private int caseApplyAwardConfirm=0; // 待审核仲裁文书
private int caseApplyAwardSign=0; // 待仲裁文书签名
private int caseApplyAwardSeal=0; // 待仲裁文书用印
private int caseApplyAwardSend=0; // 待仲裁文书送达
private int caseApplyAward=0; // 待生成裁决书
private int caseApplyAwardCheck=0; // 待核验裁决书
private int caseApplyAwardConfirm=0; // 待审核裁决书
private int caseApplyAwardSign=0; // 待裁决书签名
private int caseApplyAwardSeal=0; // 待裁决书用印
private int caseApplyAwardSend=0; // 待裁决书送达
private int caseApplyStored=0; // 待案件归档
private int caseApplyArchived=0; // 已归档
private int updateOnlineHearDate=0; // 待修改开庭时间
private int arbitratorApplyAwardConfirm=0; // 待仲裁员审核仲裁文书
private int arbitratorApplyAwardConfirm=0; // 待仲裁员审核裁决书
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+5 -5
View File
@@ -658,7 +658,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
}
}
return AjaxResult.success("仲裁文书送达成功");
return AjaxResult.success("裁决书送达成功");
} catch (MailSendException e) {
return AjaxResult.error("发送失败,请检查文件路径");
}
@@ -728,7 +728,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATED_SEAL, "");
return AjaxResult.success("签名成功,案件状态已改为待仲裁文书用印");
return AjaxResult.success("签名成功,案件状态已改为待裁决书用印");
}
@Override
@@ -947,7 +947,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_FILING, "");
return AjaxResult.success("仲裁文书送达成功");
return AjaxResult.success("裁决书送达成功");
}
/**
@@ -1008,7 +1008,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.ARBITRATION_DELIVERY, "");
return AjaxResult.success("用印成功,案件状态已改为待仲裁文书送达");
return AjaxResult.success("用印成功,案件状态已改为待裁决书送达");
}
@Override
@@ -1768,7 +1768,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
} else {
throw new ServiceException("这个批号没有批量送达裁决书的案件");
}
return AjaxResult.success("仲裁文书送达成功");
return AjaxResult.success("裁决书送达成功");
}
/**
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+29 -27
View File
@@ -739,24 +739,24 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseLogRecord9.setContent("仲裁员将进行书面审理");
CaseLogRecord caseLogRecord12 = new CaseLogRecord();
caseLogRecord11.setCaseNode(12);
caseLogRecord11.setCaseNodeName("核验仲裁文书");
caseLogRecord11.setContent("法律顾问将进行核验仲裁文书");
caseLogRecord11.setCaseNodeName("核验裁决书");
caseLogRecord11.setContent("法律顾问将进行核验裁决书");
CaseLogRecord caseLogRecord13 = new CaseLogRecord();
caseLogRecord12.setCaseNode(13);
caseLogRecord12.setCaseNodeName("确认仲裁文书");
caseLogRecord12.setContent("仲裁员将进行确认仲裁文书");
caseLogRecord12.setCaseNodeName("确认裁决书");
caseLogRecord12.setContent("仲裁员将进行确认裁决书");
CaseLogRecord caseLogRecord14 = new CaseLogRecord();
caseLogRecord13.setCaseNode(14);
caseLogRecord13.setCaseNodeName("仲裁文书签名");
caseLogRecord13.setContent("仲裁员将进行仲裁文书签名");
caseLogRecord13.setCaseNodeName("裁决书签名");
caseLogRecord13.setContent("仲裁员将进行裁决书签名");
CaseLogRecord caseLogRecord15 = new CaseLogRecord();
caseLogRecord14.setCaseNode(15);
caseLogRecord14.setCaseNodeName("仲裁文书用印");
caseLogRecord14.setContent("部门长将进行仲裁文书用印");
caseLogRecord14.setCaseNodeName("裁决书用印");
caseLogRecord14.setContent("部门长将进行裁决书用印");
CaseLogRecord caseLogRecord16 = new CaseLogRecord();
caseLogRecord15.setCaseNode(16);
caseLogRecord15.setCaseNodeName("仲裁文书送达");
caseLogRecord15.setContent("法律顾问将进行仲裁文书送达");
caseLogRecord15.setCaseNodeName("裁决书送达");
caseLogRecord15.setContent("法律顾问将进行裁决书送达");
CaseLogRecord caseLogRecord17 = new CaseLogRecord();
caseLogRecord16.setCaseNode(17);
caseLogRecord16.setCaseNodeName("案件归档");
@@ -985,33 +985,33 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseLogRecord.setNextRoleName("下一节点角色：仲裁员");
break;
case "11":
caseLogRecord.setCaseNodeName("核验仲裁文书");
caseLogRecord.setCaseNodeName("核验裁决书");
caseLogRecord.setCaseNode(11);
caseLogRecord.setContent("法律顾问正在进行核验仲裁文书");
caseLogRecord.setContent("法律顾问正在进行核验裁决书");
caseLogRecord.setNextRoleName("下一节点角色：部门长");
break;
case "12":
caseLogRecord.setCaseNodeName("确认仲裁文书");
caseLogRecord.setCaseNodeName("确认裁决书");
caseLogRecord.setCaseNode(12);
caseLogRecord.setContent("仲裁员正在进行确认仲裁文书");
caseLogRecord.setContent("仲裁员正在进行确认裁决书");
caseLogRecord.setNextRoleName("下一节点角色：仲裁员");
break;
case "13":
caseLogRecord.setCaseNodeName("仲裁文书签名");
caseLogRecord.setCaseNodeName("裁决书签名");
caseLogRecord.setCaseNode(13);
caseLogRecord.setContent("仲裁员正在进行仲裁文书签名");
caseLogRecord.setContent("仲裁员正在进行裁决书签名");
caseLogRecord.setNextRoleName("下一节点角色：法律顾问");
break;
case "14":
caseLogRecord.setCaseNodeName("仲裁文书用印");
caseLogRecord.setCaseNodeName("裁决书用印");
caseLogRecord.setCaseNode(14);
caseLogRecord.setContent("部门长正在进行仲裁文书用印");
caseLogRecord.setContent("部门长正在进行裁决书用印");
caseLogRecord.setNextRoleName("下一节点角色：法律顾问");
break;
case "15":
caseLogRecord.setCaseNodeName("仲裁文书送达");
caseLogRecord.setCaseNodeName("裁决书送达");
caseLogRecord.setCaseNode(15);
caseLogRecord.setContent("法律顾问正在进行仲裁文书送达");
caseLogRecord.setContent("法律顾问正在进行裁决书送达");
caseLogRecord.setNextRoleName("下一节点角色：法律顾问");
break;
case "16":
@@ -1916,7 +1916,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public int verificationArbitrateRecord(CaseApplication caseApplication) {
// 秘书核验裁决书，流转到待仲裁员审核仲裁文书
// 秘书核验裁决书，流转到待仲裁员审核裁决书
caseApplication.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
@@ -2128,7 +2128,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplication.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
String notes="";
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getDeptorReject())){
notes="部门长驳回仲裁文书，驳回原因："+caseApplication.getArbitrateRecord().getDeptorReject();
notes="部门长驳回裁决书，驳回原因："+caseApplication.getArbitrateRecord().getDeptorReject();
}
// 新增日志
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.HEAD_CHECK_ARBITRATION, notes);
@@ -2147,7 +2147,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
// 同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11）
// 同意后状态改为待部门长审核裁决书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验裁决书（VERPRIF_ARBITRATION = 11）
int rows = 0;
Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
if (agreeOrNotCheck.intValue() == 1) {
@@ -2168,7 +2168,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
rows = caseApplicationMapper.submitCaseApplication(caseApplication);
String notes="";
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getArbitrateReject())){
notes="仲裁员驳回仲裁文书，驳回原因："+caseApplication.getArbitrateRecord().getArbitrateReject();
notes="仲裁员驳回裁决书，驳回原因："+caseApplication.getArbitrateRecord().getArbitrateReject();
}
// 新增日志
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, notes);
@@ -2769,6 +2769,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
List<CaseApplication> caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel);
if (caseApplications != null && caseApplications.size() > 0) {
List<Integer> caseStatuss = caseApplications.stream().map(CaseApplication::getCaseStatus).collect(Collectors.toList());
System.out.println("ceshi:"+caseStatuss.toString());
List<String> caseStatusNames = caseApplications.stream().map(CaseApplication::getCaseStatusName).collect(Collectors.toList());
List<Integer> caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList());
List<String> caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList());
@@ -2836,6 +2837,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
List<CaseApplication> caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel);
if (caseApplications != null && caseApplications.size() > 0) {
List<Integer> caseStatuss = caseApplications.stream().map(CaseApplication::getCaseStatus).collect(Collectors.toList());
System.out.println("ceshi:"+caseStatuss.toString());
List<String> caseStatusNames = caseApplications.stream().map(CaseApplication::getCaseStatusName).collect(Collectors.toList());
List<Integer> caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList());
List<String> caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList());
@@ -3126,7 +3128,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
int rows = 0;
if (caseApplications != null && caseApplications.size() > 0) {
for(CaseApplication caseApplicationse:caseApplications){
// 秘书核验裁决书，流转到待仲裁员审核仲裁文书
// 秘书核验裁决书，流转到待仲裁员审核裁决书
caseApplicationse.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
rows += caseApplicationMapper.submitCaseApplication(caseApplicationse);
// ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
@@ -3179,7 +3181,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
rows += caseApplicationMapper.submitCaseApplication(caseApplicationse);
String notes="";
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getArbitrateReject())){
notes="仲裁员驳回仲裁文书，驳回原因："+caseApplication.getArbitrateRecord().getArbitrateReject();
notes="仲裁员驳回裁决书，驳回原因："+caseApplication.getArbitrateRecord().getArbitrateReject();
}
// 新增日志
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, notes);
@@ -3392,7 +3394,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplicationse.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
String notes="";
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getDeptorReject())){
notes="部门长驳回仲裁文书，驳回原因："+caseApplication.getArbitrateRecord().getDeptorReject();
notes="部门长驳回裁决书，驳回原因："+caseApplication.getArbitrateRecord().getDeptorReject();
}
// 新增日志
insertCaseLog(caseApplicationse.getId(), CaseApplicationConstants.HEAD_CHECK_ARBITRATION, notes);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+1 -1
View File
@@ -335,7 +335,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
return AjaxResult.error("请检查参数");
}
//生成仲裁文书
//生成裁决书
private Boolean generateAward(Long id) {
try {
Map<String, Object> datas = new HashMap<>();
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DownFileService.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class DownFileService {
String fileDownloadUrlnew = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1);
boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath);
if (downLoadFile) {
//立案申请书(1)、申请人证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)、
//立案申请书(1)、申请人证据材料(2)、裁决书(3)、案件视频(4)、身份证件(5)、
// 被申请人证据材料 (6)、庭审笔录(7)、缴费凭证(8)、视频录制(9)、公章图片(10)、语音转录文件(11)
caseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAppliId, 3);
CaseAttach caseAttach = new CaseAttach();