|
|
@@ -739,24 +739,24 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
739
|
739
|
caseLogRecord9.setContent("仲裁员将进行书面审理");
|
|
740
|
740
|
CaseLogRecord caseLogRecord12 = new CaseLogRecord();
|
|
741
|
741
|
caseLogRecord11.setCaseNode(12);
|
|
742
|
|
- caseLogRecord11.setCaseNodeName("核验仲裁文书");
|
|
743
|
|
- caseLogRecord11.setContent("法律顾问将进行核验仲裁文书");
|
|
|
742
|
+ caseLogRecord11.setCaseNodeName("核验裁决书");
|
|
|
743
|
+ caseLogRecord11.setContent("法律顾问将进行核验裁决书");
|
|
744
|
744
|
CaseLogRecord caseLogRecord13 = new CaseLogRecord();
|
|
745
|
745
|
caseLogRecord12.setCaseNode(13);
|
|
746
|
|
- caseLogRecord12.setCaseNodeName("确认仲裁文书");
|
|
747
|
|
- caseLogRecord12.setContent("仲裁员将进行确认仲裁文书");
|
|
|
746
|
+ caseLogRecord12.setCaseNodeName("确认裁决书");
|
|
|
747
|
+ caseLogRecord12.setContent("仲裁员将进行确认裁决书");
|
|
748
|
748
|
CaseLogRecord caseLogRecord14 = new CaseLogRecord();
|
|
749
|
749
|
caseLogRecord13.setCaseNode(14);
|
|
750
|
|
- caseLogRecord13.setCaseNodeName("仲裁文书签名");
|
|
751
|
|
- caseLogRecord13.setContent("仲裁员将进行仲裁文书签名");
|
|
|
750
|
+ caseLogRecord13.setCaseNodeName("裁决书签名");
|
|
|
751
|
+ caseLogRecord13.setContent("仲裁员将进行裁决书签名");
|
|
752
|
752
|
CaseLogRecord caseLogRecord15 = new CaseLogRecord();
|
|
753
|
753
|
caseLogRecord14.setCaseNode(15);
|
|
754
|
|
- caseLogRecord14.setCaseNodeName("仲裁文书用印");
|
|
755
|
|
- caseLogRecord14.setContent("部门长将进行仲裁文书用印");
|
|
|
754
|
+ caseLogRecord14.setCaseNodeName("裁决书用印");
|
|
|
755
|
+ caseLogRecord14.setContent("部门长将进行裁决书用印");
|
|
756
|
756
|
CaseLogRecord caseLogRecord16 = new CaseLogRecord();
|
|
757
|
757
|
caseLogRecord15.setCaseNode(16);
|
|
758
|
|
- caseLogRecord15.setCaseNodeName("仲裁文书送达");
|
|
759
|
|
- caseLogRecord15.setContent("法律顾问将进行仲裁文书送达");
|
|
|
758
|
+ caseLogRecord15.setCaseNodeName("裁决书送达");
|
|
|
759
|
+ caseLogRecord15.setContent("法律顾问将进行裁决书送达");
|
|
760
|
760
|
CaseLogRecord caseLogRecord17 = new CaseLogRecord();
|
|
761
|
761
|
caseLogRecord16.setCaseNode(17);
|
|
762
|
762
|
caseLogRecord16.setCaseNodeName("案件归档");
|
|
|
@@ -985,33 +985,33 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
985
|
985
|
caseLogRecord.setNextRoleName("下一节点角色:仲裁员");
|
|
986
|
986
|
break;
|
|
987
|
987
|
case "11":
|
|
988
|
|
- caseLogRecord.setCaseNodeName("核验仲裁文书");
|
|
|
988
|
+ caseLogRecord.setCaseNodeName("核验裁决书");
|
|
989
|
989
|
caseLogRecord.setCaseNode(11);
|
|
990
|
|
- caseLogRecord.setContent("法律顾问正在进行核验仲裁文书");
|
|
|
990
|
+ caseLogRecord.setContent("法律顾问正在进行核验裁决书");
|
|
991
|
991
|
caseLogRecord.setNextRoleName("下一节点角色:部门长");
|
|
992
|
992
|
break;
|
|
993
|
993
|
case "12":
|
|
994
|
|
- caseLogRecord.setCaseNodeName("确认仲裁文书");
|
|
|
994
|
+ caseLogRecord.setCaseNodeName("确认裁决书");
|
|
995
|
995
|
caseLogRecord.setCaseNode(12);
|
|
996
|
|
- caseLogRecord.setContent("仲裁员正在进行确认仲裁文书");
|
|
|
996
|
+ caseLogRecord.setContent("仲裁员正在进行确认裁决书");
|
|
997
|
997
|
caseLogRecord.setNextRoleName("下一节点角色:仲裁员");
|
|
998
|
998
|
break;
|
|
999
|
999
|
case "13":
|
|
1000
|
|
- caseLogRecord.setCaseNodeName("仲裁文书签名");
|
|
|
1000
|
+ caseLogRecord.setCaseNodeName("裁决书签名");
|
|
1001
|
1001
|
caseLogRecord.setCaseNode(13);
|
|
1002
|
|
- caseLogRecord.setContent("仲裁员正在进行仲裁文书签名");
|
|
|
1002
|
+ caseLogRecord.setContent("仲裁员正在进行裁决书签名");
|
|
1003
|
1003
|
caseLogRecord.setNextRoleName("下一节点角色:法律顾问");
|
|
1004
|
1004
|
break;
|
|
1005
|
1005
|
case "14":
|
|
1006
|
|
- caseLogRecord.setCaseNodeName("仲裁文书用印");
|
|
|
1006
|
+ caseLogRecord.setCaseNodeName("裁决书用印");
|
|
1007
|
1007
|
caseLogRecord.setCaseNode(14);
|
|
1008
|
|
- caseLogRecord.setContent("部门长正在进行仲裁文书用印");
|
|
|
1008
|
+ caseLogRecord.setContent("部门长正在进行裁决书用印");
|
|
1009
|
1009
|
caseLogRecord.setNextRoleName("下一节点角色:法律顾问");
|
|
1010
|
1010
|
break;
|
|
1011
|
1011
|
case "15":
|
|
1012
|
|
- caseLogRecord.setCaseNodeName("仲裁文书送达");
|
|
|
1012
|
+ caseLogRecord.setCaseNodeName("裁决书送达");
|
|
1013
|
1013
|
caseLogRecord.setCaseNode(15);
|
|
1014
|
|
- caseLogRecord.setContent("法律顾问正在进行仲裁文书送达");
|
|
|
1014
|
+ caseLogRecord.setContent("法律顾问正在进行裁决书送达");
|
|
1015
|
1015
|
caseLogRecord.setNextRoleName("下一节点角色:法律顾问");
|
|
1016
|
1016
|
break;
|
|
1017
|
1017
|
case "16":
|
|
|
@@ -1916,7 +1916,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
1916
|
1916
|
@Override
|
|
1917
|
1917
|
@Transactional
|
|
1918
|
1918
|
public int verificationArbitrateRecord(CaseApplication caseApplication) {
|
|
1919
|
|
- // 秘书核验裁决书,流转到待仲裁员审核仲裁文书
|
|
|
1919
|
+ // 秘书核验裁决书,流转到待仲裁员审核裁决书
|
|
1920
|
1920
|
caseApplication.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
|
|
1921
|
1921
|
int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
|
|
1922
|
1922
|
ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
|
|
|
@@ -2128,7 +2128,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
2128
|
2128
|
caseApplication.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
|
|
2129
|
2129
|
String notes="";
|
|
2130
|
2130
|
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getDeptorReject())){
|
|
2131
|
|
- notes="部门长驳回仲裁文书,驳回原因:"+caseApplication.getArbitrateRecord().getDeptorReject();
|
|
|
2131
|
+ notes="部门长驳回裁决书,驳回原因:"+caseApplication.getArbitrateRecord().getDeptorReject();
|
|
2132
|
2132
|
}
|
|
2133
|
2133
|
// 新增日志
|
|
2134
|
2134
|
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.HEAD_CHECK_ARBITRATION, notes);
|
|
|
@@ -2147,7 +2147,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
2147
|
2147
|
@Override
|
|
2148
|
2148
|
@Transactional
|
|
2149
|
2149
|
public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
|
|
2150
|
|
- // 同意后状态改为待部门长审核仲裁文书(CHECK_ARBITRATION = 12),拒绝改为待秘书核验仲裁文书(VERPRIF_ARBITRATION = 11)
|
|
|
2150
|
+ // 同意后状态改为待部门长审核裁决书(CHECK_ARBITRATION = 12),拒绝改为待秘书核验裁决书(VERPRIF_ARBITRATION = 11)
|
|
2151
|
2151
|
int rows = 0;
|
|
2152
|
2152
|
Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
|
|
2153
|
2153
|
if (agreeOrNotCheck.intValue() == 1) {
|
|
|
@@ -2168,7 +2168,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
2168
|
2168
|
rows = caseApplicationMapper.submitCaseApplication(caseApplication);
|
|
2169
|
2169
|
String notes="";
|
|
2170
|
2170
|
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getArbitrateReject())){
|
|
2171
|
|
- notes="仲裁员驳回仲裁文书,驳回原因:"+caseApplication.getArbitrateRecord().getArbitrateReject();
|
|
|
2171
|
+ notes="仲裁员驳回裁决书,驳回原因:"+caseApplication.getArbitrateRecord().getArbitrateReject();
|
|
2172
|
2172
|
}
|
|
2173
|
2173
|
// 新增日志
|
|
2174
|
2174
|
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, notes);
|
|
|
@@ -2769,6 +2769,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
2769
|
2769
|
List<CaseApplication> caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel);
|
|
2770
|
2770
|
if (caseApplications != null && caseApplications.size() > 0) {
|
|
2771
|
2771
|
List<Integer> caseStatuss = caseApplications.stream().map(CaseApplication::getCaseStatus).collect(Collectors.toList());
|
|
|
2772
|
+ System.out.println("ceshi:"+caseStatuss.toString());
|
|
2772
|
2773
|
List<String> caseStatusNames = caseApplications.stream().map(CaseApplication::getCaseStatusName).collect(Collectors.toList());
|
|
2773
|
2774
|
List<Integer> caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList());
|
|
2774
|
2775
|
List<String> caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList());
|
|
|
@@ -2836,6 +2837,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
2836
|
2837
|
List<CaseApplication> caseApplications = caseApplicationMapper.listCaseApplicationByBatchNumber(caseApplicationsel);
|
|
2837
|
2838
|
if (caseApplications != null && caseApplications.size() > 0) {
|
|
2838
|
2839
|
List<Integer> caseStatuss = caseApplications.stream().map(CaseApplication::getCaseStatus).collect(Collectors.toList());
|
|
|
2840
|
+ System.out.println("ceshi:"+caseStatuss.toString());
|
|
2839
|
2841
|
List<String> caseStatusNames = caseApplications.stream().map(CaseApplication::getCaseStatusName).collect(Collectors.toList());
|
|
2840
|
2842
|
List<Integer> caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList());
|
|
2841
|
2843
|
List<String> caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList());
|
|
|
@@ -3126,7 +3128,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
3126
|
3128
|
int rows = 0;
|
|
3127
|
3129
|
if (caseApplications != null && caseApplications.size() > 0) {
|
|
3128
|
3130
|
for(CaseApplication caseApplicationse:caseApplications){
|
|
3129
|
|
- // 秘书核验裁决书,流转到待仲裁员审核仲裁文书
|
|
|
3131
|
+ // 秘书核验裁决书,流转到待仲裁员审核裁决书
|
|
3130
|
3132
|
caseApplicationse.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
|
|
3131
|
3133
|
rows += caseApplicationMapper.submitCaseApplication(caseApplicationse);
|
|
3132
|
3134
|
// ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
|
|
|
@@ -3179,7 +3181,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
3179
|
3181
|
rows += caseApplicationMapper.submitCaseApplication(caseApplicationse);
|
|
3180
|
3182
|
String notes="";
|
|
3181
|
3183
|
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getArbitrateReject())){
|
|
3182
|
|
- notes="仲裁员驳回仲裁文书,驳回原因:"+caseApplication.getArbitrateRecord().getArbitrateReject();
|
|
|
3184
|
+ notes="仲裁员驳回裁决书,驳回原因:"+caseApplication.getArbitrateRecord().getArbitrateReject();
|
|
3183
|
3185
|
}
|
|
3184
|
3186
|
// 新增日志
|
|
3185
|
3187
|
insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, notes);
|
|
|
@@ -3392,7 +3394,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
3392
|
3394
|
caseApplicationse.setCaseStatus(CaseApplicationConstants.HEAD_CHECK_ARBITRATION);
|
|
3393
|
3395
|
String notes="";
|
|
3394
|
3396
|
if(caseApplication.getArbitrateRecord()!=null&&StrUtil.isNotEmpty(caseApplication.getArbitrateRecord().getDeptorReject())){
|
|
3395
|
|
- notes="部门长驳回仲裁文书,驳回原因:"+caseApplication.getArbitrateRecord().getDeptorReject();
|
|
|
3397
|
+ notes="部门长驳回裁决书,驳回原因:"+caseApplication.getArbitrateRecord().getDeptorReject();
|
|
3396
|
3398
|
}
|
|
3397
|
3399
|
// 新增日志
|
|
3398
|
3400
|
insertCaseLog(caseApplicationse.getId(), CaseApplicationConstants.HEAD_CHECK_ARBITRATION, notes);
|