Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

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;
     }

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
      */

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;
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -2792,19 +2792,34 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Transactional
     public List<ReservedConference> reserveConferenceList(Long caseId) {
         List<ReservedConference> 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()<beforeMinutes ){
-                        reservedConference.setIsBeforeFiveMinutes(true);
-                    }else {
-                        reservedConference.setIsBeforeFiveMinutes(false);
-                    }
-                }
+        if (CollectionUtil.isEmpty(reservedConferences)) {
+            return reservedConferences;
+        }
+        Map<Long,String> userIdMap = null;
+        List<Long> userIds = reservedConferences.stream().map(ReservedConference::getUserId).collect(Collectors.toList());
+        if(CollectionUtil.isNotEmpty(userIds)){
+            // 根据userids查询用户名
+            List<SysUser> 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;
     }

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());
             //默认书面审理

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -1455,6 +1455,7 @@
             <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
             <if test="hearDate != null">hear_date = #{hearDate},</if>
             <if test="filearbitraUrl != null  and filearbitraUrl != ''">filearbitra_url = #{filearbitraUrl},</if>
+            <if test="adjudicaCounterReason != null  and adjudicaCounterReason != ''">adjudica_counter_reason = #{adjudicaCounterReason},</if>
         </set>
         where id = #{id}
     </update>