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

优化查询案件列表

Browse Source
This commit is contained in:
qitz
2023-12-27 13:58:02 +08:00
parent 753039d5e9
commit f66af56144
14 changed files with 143 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+4
View File
@@ -56,6 +56,10 @@ public class CaseApplication extends BaseEntity {
/** 被申请人是否书面审理 */
private Integer respondentIsWrittenHear;
/** 开庭方式是否一致 */
private Integer arbitraMethodIssame;
/** 仲裁方式说明 */
private String arbitratMethodIllustrate;
/** 案件申请表ID */
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CasePayListVO.java
+3 -2
View File
@@ -4,14 +4,15 @@ import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
import com.ruoyi.wisdomarbitrate.domain.CaseApplicationPay;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class CasePayListVO {
/**
* 订单总金额 单位:分
* 订单总金额
*/
private int totalFee;
private BigDecimal totalFee;
/**
* 案件总条数
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java
+1 -1
View File
@@ -13,5 +13,5 @@ public interface ICaseArbitrateService {
AjaxResult writtenHear(CaseIds caseIds);
AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion);
AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion, Integer arbitratMethod);
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+78 -11
View File
@@ -174,7 +174,45 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 超级管理员和仲裁委（部门长）案件，可查看所有案件 √
if ("超级管理员".equals(role.getRoleName())
) {
return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
List<CaseApplication> caseApplicationlist = caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
if(caseApplicationlist!=null&&caseApplicationlist.size()>0){
for(CaseApplication caseApplicationsel : caseApplicationlist){
Integer caseStatus = caseApplicationsel.getCaseStatus();
if(caseStatus.intValue() == CaseApplicationConstants.CHECK_ARBITRATION_METHOD){
Integer applicantIsWrittenHear = caseApplicationsel.getApplicantIsWrittenHear();
Integer respondentIsWrittenHear = caseApplicationsel.getRespondentIsWrittenHear();
if(applicantIsWrittenHear!=null&&respondentIsWrittenHear!=null){
if(applicantIsWrittenHear.intValue()==respondentIsWrittenHear.intValue()){
caseApplicationsel.setArbitraMethodIssame(1);
if(applicantIsWrittenHear.intValue()==1&&respondentIsWrittenHear.intValue()==1){
caseApplicationsel.setArbitratMethod(2);
}else {
caseApplicationsel.setArbitratMethod(1);
}
}else {
caseApplicationsel.setArbitraMethodIssame(2);
String applicantarbitratMethod = "";
String respondentbitratMethod = "";
if(applicantIsWrittenHear.intValue()==1){
applicantarbitratMethod = "书面审理";
}else {
applicantarbitratMethod = "开庭审理";
}
if(respondentIsWrittenHear.intValue()==1){
respondentbitratMethod = "书面审理";
}else {
respondentbitratMethod = "开庭审理";
}
String arbitratMethodIllustrate = "当前案件开庭方式：申请人选择开庭方式为"+applicantarbitratMethod+
"被申请人选择开庭方式为"+respondentbitratMethod+"，请确定开庭方式。";
caseApplicationsel.setArbitratMethodIllustrate(arbitratMethodIllustrate);
}
}
}
}
}
return caseApplicationlist;
}
if ("仲裁委".equals(role.getRoleName())
|| "部门长".equals(role.getRoleName())) {
@@ -223,7 +261,45 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 根据条件查询申请人，被申请人，仲裁员，法律顾问案件
// return caseApplicationMapper.selectCaseApplicationList(caseApplication);
return caseApplicationMapper.selectCaseApplicationList1(caseApplication);
List<CaseApplication> caseApplications = caseApplicationMapper.selectCaseApplicationList1(caseApplication);
if(caseApplications!=null&&caseApplications.size()>0){
for(CaseApplication caseApplicationsel : caseApplications){
Integer caseStatus = caseApplicationsel.getCaseStatus();
if(caseStatus.intValue() == CaseApplicationConstants.CHECK_ARBITRATION_METHOD){
Integer applicantIsWrittenHear = caseApplicationsel.getApplicantIsWrittenHear();
Integer respondentIsWrittenHear = caseApplicationsel.getRespondentIsWrittenHear();
if(applicantIsWrittenHear!=null&&respondentIsWrittenHear!=null){
if(applicantIsWrittenHear.intValue()==respondentIsWrittenHear.intValue()){
caseApplicationsel.setArbitraMethodIssame(1);
if(applicantIsWrittenHear.intValue()==1&&respondentIsWrittenHear.intValue()==1){
caseApplicationsel.setArbitratMethod(2);
}else {
caseApplicationsel.setArbitratMethod(1);
}
}else {
caseApplicationsel.setArbitraMethodIssame(2);
String applicantarbitratMethod = "";
String respondentbitratMethod = "";
if(applicantIsWrittenHear.intValue()==1){
applicantarbitratMethod = "书面审理";
}else {
applicantarbitratMethod = "开庭审理";
}
if(respondentIsWrittenHear.intValue()==1){
respondentbitratMethod = "书面审理";
}else {
respondentbitratMethod = "开庭审理";
}
String arbitratMethodIllustrate = "当前案件开庭方式：申请人选择开庭方式为"+applicantarbitratMethod+
"被申请人选择开庭方式为"+respondentbitratMethod+"，请确定开庭方式。";
caseApplicationsel.setArbitratMethodIllustrate(arbitratMethodIllustrate);
}
}
}
}
}
return caseApplications;
}
@@ -1077,15 +1153,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
caseApplication.setFeePayable(feePayable);
caseApplication.setUpdateBy(getUsername());
Integer applicantIsWrittenHear = caseApplication.getApplicantIsWrittenHear();
if(applicantIsWrittenHear!=null&&applicantIsWrittenHear.intValue()==1){
//书面审理
caseApplication.setArbitratMethod(2);
}else {
//开庭审理
caseApplication.setArbitratMethod(1);
}
// 立案申请状态直接修改主表信息
if (caseApplication.getCaseStatus() != null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
// 修改内置字段
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+26 -8
View File
@@ -58,19 +58,17 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
@Override
@Transactional
public AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion) {
public AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion, Integer arbitratMethodNow) {
//查询案件详细信息
CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
if (caseApplication1 == null) {
return AjaxResult.success();
}
Integer arbitratMethod = caseApplication1.getArbitratMethod();
if (arbitratMethod == null) {
return AjaxResult.error("请先指定仲裁方式");
}
Integer arbitratMethodOriral = caseApplication.getArbitratMethod();
String caseNum = caseApplication1.getCaseNum();
if (opinion == 0) { //拒绝
if (arbitratMethod == 2) {
if (arbitratMethodOriral == 2) {
caseApplication1.setArbitratMethod(1); // 更改仲裁方式
//修改案件状态修改开庭时间
caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
@@ -87,15 +85,35 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
}
} else {
if (arbitratMethod == 2) {
} else if (opinion == 1 ) {
if (arbitratMethodOriral == 2) {
//修改案件状态为待书面审理
caseApplication1.setArbitratMethod(2);
caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
} else {
//修改案件状态为待修改开庭时间
caseApplication1.setArbitratMethod(1);
caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
//修改案件状态为待修改开庭时间
// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
}
}else if (opinion == 2) {
if (arbitratMethodNow == 2) {
//修改案件状态为待书面审理
caseApplication1.setArbitratMethod(2);
caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
} else {
//修改案件状态为待修改开庭时间
caseApplication1.setArbitratMethod(1);
caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
//修改案件状态为待修改开庭时间
// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java
+1 -8
View File
@@ -247,14 +247,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
//修改案件状态
caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
Integer respondentIsWrittenHear = caseEvidenceDTO.getRespondentIsWrittenHear();
if(respondentIsWrittenHear.intValue()==1){
//书面审理
caseApplication1.setArbitratMethod(2);
}else {
//开庭审理
caseApplication1.setArbitratMethod(1);
}
int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
if (i > 0) {
// 新增日志
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
CaseApplication caseApplication1 = caseApplicationService.selectCaseApplication(caseApplication);
BigDecimal feePayable = caseApplication1.getFeePayable();
sum = sum.add(feePayable);
listVO.setTotalFee(sum.intValue());
listVO.setTotalFee(sum);
caseApplicationPay.setCaseAppName(caseApplication1.getApplicantName());
caseApplicationPay.setCaseResName(caseApplication1.getRespondentName());
caseApplicationPay.setCaseNum(caseApplication1.getCaseNum());