From b34aa2092eebe5a39a76e407ccb2084fc3434bf5 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Sat, 25 Nov 2023 11:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=B4=A8=E8=AF=81=E5=8A=A0?= =?UTF-8?q?=E5=8F=8D=E4=BB=B2=E8=A3=81=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CaseApplication.java | 12 ++++++ .../domain/ReservedConference.java | 4 ++ .../domain/dto/CaseEvidenceDTO.java | 4 ++ .../impl/CaseApplicationServiceImpl.java | 37 +++++++++++++------ .../service/impl/CaseEvidenceServiceImpl.java | 1 + .../wisdomarbitrate/CaseApplicationMapper.xml | 1 + 6 files changed, 48 insertions(+), 11 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 924418c..1b1f923 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -166,6 +166,10 @@ public class CaseApplication extends BaseEntity { /** 是否仲裁反请求 */ private Integer adjudicaCounter; + /** + * 仲裁反请求原因 + */ + private String adjudicaCounterReason; /** 被申请人是否缺席 */ private Integer isAbsence; @@ -178,6 +182,14 @@ public class CaseApplication extends BaseEntity { /** 申请人是否缺席 */ private Integer appliIsAbsen; + public String getAdjudicaCounterReason() { + return adjudicaCounterReason; + } + + public void setAdjudicaCounterReason(String adjudicaCounterReason) { + this.adjudicaCounterReason = adjudicaCounterReason; + } + public Integer getAppliIsAbsen() { return appliIsAbsen; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java index 2e43d86..fad99e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java @@ -21,6 +21,10 @@ public class ReservedConference { * 用户id */ private Long userId; + /** + * 用户名 + */ + private String userName; /** * 案件id */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java index bd65a9a..2a9caa3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java @@ -31,6 +31,10 @@ public class CaseEvidenceDTO { private Integer pendingAppointArbotrar; /** 是否仲裁反请求 */ private Integer adjudicaCounter; + /** + * 仲裁反请求原因 + */ + private String adjudicaCounterReason; /** 是否管辖异议申请 */ private Integer objectiJuris; 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 8512ffd..1964b54 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 @@ -2792,19 +2792,34 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Transactional public List reserveConferenceList(Long caseId) { List reservedConferences = reservedConferenceMapper.selectListByCaseId(caseId); - if(CollectionUtil.isNotEmpty(reservedConferences)){ - for (ReservedConference reservedConference : reservedConferences) { - Date startTime = reservedConference.getScheduleStartTime(); - if(null != startTime){ - long beforeMinutes = startTime.getTime() - 1000 * 60 * 5; - if(System.currentTimeMillis() userIdMap = null; + List userIds = reservedConferences.stream().map(ReservedConference::getUserId).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(userIds)){ + // 根据userids查询用户名 + List userList = sysUserMapper.selectUserListByIds(userIds); + if(CollectionUtil.isNotEmpty(userList)){ + userIdMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId,SysUser::getUserName)); } } + for (ReservedConference reservedConference : reservedConferences) { + if(null!=reservedConference.getUserId() && null!=userIdMap){ + reservedConference.setUserName(userIdMap.get(reservedConference.getUserId())); + } + Date startTime = reservedConference.getScheduleStartTime(); + if (null == startTime) { + continue; + } + long beforeMinutes = startTime.getTime() - 1000 * 60 * 5; + if (System.currentTimeMillis() < beforeMinutes) { + reservedConference.setIsBeforeFiveMinutes(true); + } else { + reservedConference.setIsBeforeFiveMinutes(false); + } + } + return reservedConferences; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index 70569cb..09ea6f9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java @@ -200,6 +200,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { caseApplication.setId(caseEvidenceDTO.getCaseId()); CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); if (caseApplication1 != null) { + caseApplication1.setAdjudicaCounterReason(caseEvidenceDTO.getAdjudicaCounterReason()); int caseStatus = caseApplication1.getCaseStatus(); caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden()); //默认书面审理 diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index e09a148..f55c4ec 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -1455,6 +1455,7 @@ open_court_hear = #{openCourtHear}, hear_date = #{hearDate}, filearbitra_url = #{filearbitraUrl}, + adjudica_counter_reason = #{adjudicaCounterReason}, where id = #{id}