Bladeren bron

案件质证加反仲裁原因

18792927508 2 jaren geleden
bovenliggende
commit
b34aa2092e

+ 12
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Bestand weergeven

166
 
166
 
167
     /** 是否仲裁反请求 */
167
     /** 是否仲裁反请求 */
168
     private Integer adjudicaCounter;
168
     private Integer adjudicaCounter;
169
+    /**
170
+     * 仲裁反请求原因
171
+     */
172
+    private String adjudicaCounterReason;
169
 
173
 
170
     /** 被申请人是否缺席 */
174
     /** 被申请人是否缺席 */
171
     private Integer isAbsence;
175
     private Integer isAbsence;
178
     /** 申请人是否缺席 */
182
     /** 申请人是否缺席 */
179
     private Integer appliIsAbsen;
183
     private Integer appliIsAbsen;
180
 
184
 
185
+    public String getAdjudicaCounterReason() {
186
+        return adjudicaCounterReason;
187
+    }
188
+
189
+    public void setAdjudicaCounterReason(String adjudicaCounterReason) {
190
+        this.adjudicaCounterReason = adjudicaCounterReason;
191
+    }
192
+
181
     public Integer getAppliIsAbsen() {
193
     public Integer getAppliIsAbsen() {
182
         return appliIsAbsen;
194
         return appliIsAbsen;
183
     }
195
     }

+ 4
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java Bestand weergeven

21
      * 用户id
21
      * 用户id
22
      */
22
      */
23
     private Long userId;
23
     private Long userId;
24
+    /**
25
+     * 用户名
26
+     */
27
+    private String userName;
24
     /**
28
     /**
25
      * 案件id
29
      * 案件id
26
      */
30
      */

+ 4
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java Bestand weergeven

31
     private Integer pendingAppointArbotrar;
31
     private Integer pendingAppointArbotrar;
32
     /** 是否仲裁反请求 */
32
     /** 是否仲裁反请求 */
33
     private Integer adjudicaCounter;
33
     private Integer adjudicaCounter;
34
+    /**
35
+     * 仲裁反请求原因
36
+     */
37
+    private String adjudicaCounterReason;
34
     /** 是否管辖异议申请 */
38
     /** 是否管辖异议申请 */
35
     private Integer objectiJuris;
39
     private Integer objectiJuris;
36
 
40
 

+ 26
- 11
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Bestand weergeven

2792
     @Transactional
2792
     @Transactional
2793
     public List<ReservedConference> reserveConferenceList(Long caseId) {
2793
     public List<ReservedConference> reserveConferenceList(Long caseId) {
2794
         List<ReservedConference> reservedConferences = reservedConferenceMapper.selectListByCaseId(caseId);
2794
         List<ReservedConference> reservedConferences = reservedConferenceMapper.selectListByCaseId(caseId);
2795
-        if(CollectionUtil.isNotEmpty(reservedConferences)){
2796
-            for (ReservedConference reservedConference : reservedConferences) {
2797
-                Date startTime = reservedConference.getScheduleStartTime();
2798
-                if(null != startTime){
2799
-                    long beforeMinutes = startTime.getTime() - 1000 * 60 * 5;
2800
-                    if(System.currentTimeMillis()<beforeMinutes ){
2801
-                        reservedConference.setIsBeforeFiveMinutes(true);
2802
-                    }else {
2803
-                        reservedConference.setIsBeforeFiveMinutes(false);
2804
-                    }
2805
-                }
2795
+        if (CollectionUtil.isEmpty(reservedConferences)) {
2796
+            return reservedConferences;
2797
+        }
2798
+        Map<Long,String> userIdMap = null;
2799
+        List<Long> userIds = reservedConferences.stream().map(ReservedConference::getUserId).collect(Collectors.toList());
2800
+        if(CollectionUtil.isNotEmpty(userIds)){
2801
+            // 根据userids查询用户名
2802
+            List<SysUser> userList = sysUserMapper.selectUserListByIds(userIds);
2803
+            if(CollectionUtil.isNotEmpty(userList)){
2804
+                userIdMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId,SysUser::getUserName));
2806
             }
2805
             }
2807
         }
2806
         }
2807
+        for (ReservedConference reservedConference : reservedConferences) {
2808
+            if(null!=reservedConference.getUserId() && null!=userIdMap){
2809
+                reservedConference.setUserName(userIdMap.get(reservedConference.getUserId()));
2810
+            }
2811
+            Date startTime = reservedConference.getScheduleStartTime();
2812
+            if (null == startTime) {
2813
+                continue;
2814
+            }
2815
+            long beforeMinutes = startTime.getTime() - 1000 * 60 * 5;
2816
+            if (System.currentTimeMillis() < beforeMinutes) {
2817
+                reservedConference.setIsBeforeFiveMinutes(true);
2818
+            } else {
2819
+                reservedConference.setIsBeforeFiveMinutes(false);
2820
+            }
2821
+        }
2822
+
2808
 
2823
 
2809
         return reservedConferences;
2824
         return reservedConferences;
2810
     }
2825
     }

+ 1
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Bestand weergeven

200
         caseApplication.setId(caseEvidenceDTO.getCaseId());
200
         caseApplication.setId(caseEvidenceDTO.getCaseId());
201
         CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
201
         CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
202
         if (caseApplication1 != null) {
202
         if (caseApplication1 != null) {
203
+            caseApplication1.setAdjudicaCounterReason(caseEvidenceDTO.getAdjudicaCounterReason());
203
             int caseStatus = caseApplication1.getCaseStatus();
204
             int caseStatus = caseApplication1.getCaseStatus();
204
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
205
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
205
             //默认书面审理
206
             //默认书面审理

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Bestand weergeven

1455
             <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
1455
             <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
1456
             <if test="hearDate != null">hear_date = #{hearDate},</if>
1456
             <if test="hearDate != null">hear_date = #{hearDate},</if>
1457
             <if test="filearbitraUrl != null  and filearbitraUrl != ''">filearbitra_url = #{filearbitraUrl},</if>
1457
             <if test="filearbitraUrl != null  and filearbitraUrl != ''">filearbitra_url = #{filearbitraUrl},</if>
1458
+            <if test="adjudicaCounterReason != null  and adjudicaCounterReason != ''">adjudica_counter_reason = #{adjudicaCounterReason},</if>
1458
         </set>
1459
         </set>
1459
         where id = #{id}
1460
         where id = #{id}
1460
     </update>
1461
     </update>