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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

Browse Source
This commit is contained in:
hejinbo
2023-11-01 09:19:10 +08:00
parent 106ccce871 32d15e0d48
commit 8e82f8eaa2
4 changed files with 62 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+48 -11
View File
@@ -147,7 +147,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
if (role.getRoleName().equals("法律顾问")) {
// 查询角色有关的用户部门
List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
// List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
List<Long> deptIds =new ArrayList<>();
deptIds.add(sysUser.getDeptId());
caseApplication.setDeptIds(deptIds);
}
if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
@@ -205,7 +207,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
if(role.getRoleName().equals("法律顾问")){
// 查询角色有关的用户部门
List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
// List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
List<Long> deptIds =new ArrayList<>();
deptIds.add(sysUser.getDeptId());
caseApplication.setDeptIds(deptIds);
}
if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
@@ -234,8 +238,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
List<CaseLogRecord> records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
Integer caseStatus = caseApplicationselect.getCaseStatus();
CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
records.add(caseLogRecordin);
if(caseStatus.intValue()!=0){
CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
records.add(caseLogRecordin);
}
List<CaseLogRecord> recordsnofinish = getNofinishCasenode(caseStatus);
records.addAll(recordsnofinish);
datas.put("allCasenode",records);
@@ -247,11 +254,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public int updateHeardate(CaseApplication caseApplication) {
caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
// caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
return rows;
}
@@ -538,6 +546,23 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
List<CaseLogRecord> caseLogRecords = new ArrayList<>();
switch (caseStatus.toString()) {
case "0":
caseLogRecords.add(caseLogRecord1);
caseLogRecords.add(caseLogRecord2);
caseLogRecords.add(caseLogRecord3);
caseLogRecords.add(caseLogRecord4);
caseLogRecords.add(caseLogRecord5);
caseLogRecords.add(caseLogRecord6);
caseLogRecords.add(caseLogRecord7);
caseLogRecords.add(caseLogRecord8);
caseLogRecords.add(caseLogRecord9);
caseLogRecords.add(caseLogRecord11);
caseLogRecords.add(caseLogRecord12);
caseLogRecords.add(caseLogRecord13);
caseLogRecords.add(caseLogRecord14);
caseLogRecords.add(caseLogRecord15);
caseLogRecords.add(caseLogRecord16);
break;
case "1":
caseLogRecords.add(caseLogRecord2);
caseLogRecords.add(caseLogRecord3);
@@ -1176,7 +1201,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplicationListinsert.add(caseApplication);
}else {
// 拼接错误信息
failureMsg.append("<br/>").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString());
failureMsg.append("<br/>").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString());
}
}else {
@@ -1222,6 +1247,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
caseApplicationItera.setCreateBy(getUsername());
int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplicationItera.getId(),CaseApplicationConstants.CASE_APPLICATION,"");
List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
if(caseAffiliates!=null&&caseAffiliates.size()>0){
for (CaseAffiliate caseAffiliate : caseAffiliates){
@@ -1241,6 +1269,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
}else {
throw new ServiceException("导入立案申请数据不能为空！");
}
@@ -1437,6 +1467,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if( caseApplication.getLoanEndDate()== null){
failureMsg.append("【借款结束日期】字段不合法；");
}
if( caseApplication.getLoanStartDate()!= null && caseApplication.getLoanEndDate()!= null && caseApplication.getLoanStartDate().after(caseApplication.getLoanEndDate()) ){
failureMsg.append("【借款结束日期】不能早于【借款开始日期】；");
}
if( StrUtil.isEmpty(caseApplication.getContractNumber())){
failureMsg.append("【合同编号】字段不能为空；");
}else if(caseApplication.getContractNumber().length()>50){
@@ -1476,9 +1509,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
}
if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){
failureMsg.append("【申请人仲裁诉求】字段不能为空；");
failureMsg.append("【申请人仲裁请求及事实和理由】字段不能为空；");
}else if(caseApplication.getArbitratClaims().length()>10000){
failureMsg.append("【申请人仲裁诉求】字段超出指定长度，最大长度为10000；");
failureMsg.append("【申请人仲裁请求及事实和理由】字段超出指定长度，最大长度为10000；");
}
if(StrUtil.isNotEmpty(caseApplication.getArbitratClaims())&&caseApplication.getArbitratClaims().length()>10000){
failureMsg.append("【申请人请求仲裁庭裁决】字段超出指定长度，最大长度为10000；");
}
}
@@ -2045,7 +2081,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public int pendTralSure(CaseApplication caseApplication) {
caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
// caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
//发送短信通知
@@ -2125,7 +2162,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
}
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
return rows;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+6 -6
View File
@@ -68,11 +68,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
if (arbitratMethod == 2) {
caseApplication1.setArbitratMethod(1); // 更改仲裁方式
//修改案件状态为待开庭审理
// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
//修改案件状态为待修改开庭时间
caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
} else {
caseApplication1.setArbitratMethod(2);
@@ -91,11 +91,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
} else {
//修改案件状态为待开庭审理
// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
//修改案件状态为待修改开庭时间
caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
}
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java
+7 -7
View File
@@ -246,13 +246,13 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
.build();
int count = caseAttachMapper.save(caseAttach);
if (count > 0 && annexType != null && annexType != 8) {
if (id != null) {
//修改案件状态
CaseApplication caseApplication = new CaseApplication();
caseApplication.setId(id);
caseApplication.setCaseStatus(4);
caseApplicationMapper.submitCaseApplication(caseApplication);
}
// if (id != null) {
// //修改案件状态
// CaseApplication caseApplication = new CaseApplication();
// caseApplication.setId(id);
// caseApplication.setCaseStatus(4);
// caseApplicationMapper.submitCaseApplication(caseApplication);
// }
CaseAttach caseAttachselect = new CaseAttach();
caseAttachselect.setAnnexId(caseAttach.getAnnexId());
caseAttachselect.setAnnexName(caseAttach.getAnnexName());
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1
View File
@@ -539,6 +539,7 @@
AND c.id = #{id}
</if>
</where>
order by c.create_time desc limit 1
</select>
<select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,