浏览代码

案件修改

18792927508 2 年前
父节点
当前提交
69fbcd4b4b

+ 2
- 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java 查看文件

@@ -122,14 +122,12 @@ public class CaseApplicationController extends BaseController {
122 122
     }
123 123
 
124 124
     /**
125
-     * 查询立案信息 todo 必须传version
125
+     * 查询立案信息
126 126
      */
127 127
 //     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
128 128
     @PostMapping("/selectCaseApplication")
129 129
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
130
-        if(caseApplication.getVersion()==null){
131
-            return error("参数校验失败");
132
-        }
130
+
133 131
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
134 132
         return success(caseApplicationselect);
135 133
     }

+ 11
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java 查看文件

@@ -107,6 +107,17 @@ public class VideoController extends BaseController {
107 107
 
108 108
         return  videoService.dissolveRoom(reservedConferenceVO.getRoomId());
109 109
     }
110
+    /**
111
+     * 根据userId查询该用户是否是秘书
112
+     * @param userId
113
+     * @return
114
+     */
115
+    @Anonymous
116
+    @GetMapping("secretaryRoleByUserId")
117
+    public AjaxResult secretaryRoleByUserId(   @RequestParam(value = "userId",required = true) Long userId) {
118
+
119
+        return  videoService.secretaryRoleByUserId(userId);
120
+    }
110 121
 
111 122
 
112 123
 }

+ 6
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java 查看文件

@@ -33,4 +33,10 @@ public interface VideoService {
33 33
      * @return
34 34
      */
35 35
     AjaxResult dissolveRoom( Long roomId);
36
+    /**
37
+     * 根据userId查询该用户是否是秘书
38
+     * @param userId
39
+     * @return
40
+     */
41
+    AjaxResult secretaryRoleByUserId(Long userId);
36 42
 }

+ 29
- 6
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java 查看文件

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
9 9
 import com.ruoyi.common.config.RuoYiConfig;
10 10
 import com.ruoyi.common.constant.CacheConstants;
11 11
 import com.ruoyi.common.core.domain.AjaxResult;
12
+import com.ruoyi.common.core.domain.entity.SysRole;
12 13
 import com.ruoyi.common.core.domain.entity.SysUser;
13 14
 import com.ruoyi.common.core.domain.model.LoginUser;
14 15
 import com.ruoyi.common.core.redis.RedisCache;
@@ -16,7 +17,9 @@ import com.ruoyi.common.utils.SecurityUtils;
16 17
 import com.ruoyi.common.utils.SmsUtils;
17 18
 import com.ruoyi.common.utils.StringUtils;
18 19
 import com.ruoyi.common.utils.spring.SpringUtils;
20
+import com.ruoyi.system.mapper.SysRoleMapper;
19 21
 import com.ruoyi.system.mapper.SysUserMapper;
22
+import com.ruoyi.system.mapper.SysUserRoleMapper;
20 23
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
21 24
 import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
22 25
 import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
@@ -56,6 +59,7 @@ import java.util.concurrent.ExecutorService;
56 59
 import java.util.concurrent.Executors;
57 60
 import java.util.concurrent.TimeUnit;
58 61
 
62
+import static com.ruoyi.common.core.domain.AjaxResult.success;
59 63
 import static com.ruoyi.common.utils.file.FileUploadUtils.getAbsoluteFile;
60 64
 import static com.ruoyi.common.utils.file.FileUploadUtils.getPathFileName;
61 65
 
@@ -83,6 +87,8 @@ public class VideoServiceImpl implements VideoService {
83 87
     private CaseApplicationMapper caseApplicationMapper;
84 88
     @Autowired
85 89
     private CaseAttachMapper caseAttachMapper;
90
+    @Autowired
91
+    private SysRoleMapper roleMapper;
86 92
 
87 93
     /**
88 94
      *  功能:第三方回调sign校验
@@ -137,7 +143,7 @@ public class VideoServiceImpl implements VideoService {
137 143
     @Override
138 144
     public AjaxResult bindCaseId(Long caseId, String roomId) {
139 145
         caseApplicationMapper .bindCaseId(caseId,roomId);
140
-        return AjaxResult.success();
146
+        return success();
141 147
     }
142 148
 
143 149
     @Override
@@ -147,7 +153,7 @@ public class VideoServiceImpl implements VideoService {
147 153
         caseApplication.setAnnexType(9);
148 154
         List<CaseAttach> caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication);
149 155
         if(CollectionUtil.isEmpty(caseAttachList)){
150
-            return AjaxResult.success();
156
+            return success();
151 157
         }
152 158
         for (CaseAttach caseAttach : caseAttachList) {
153 159
             String annexName = caseAttach.getAnnexName();
@@ -162,7 +168,7 @@ public class VideoServiceImpl implements VideoService {
162 168
                 caseAttach.setAnnexName(annexNamenew);
163 169
             }
164 170
         }
165
-        return  AjaxResult.success(caseAttachList);
171
+        return  success(caseAttachList);
166 172
     }
167 173
 
168 174
     /**
@@ -227,7 +233,7 @@ public class VideoServiceImpl implements VideoService {
227 233
             // 返回的resp是一个CreateCloudRecordingResponse的实例,与请求对象对应
228 234
             CreateCloudRecordingResponse resp = client.CreateCloudRecording(req);
229 235
 
230
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
236
+            return success((JSONObject) JSON.toJSON(resp));
231 237
         } catch (TencentCloudSDKException e) {
232 238
             return AjaxResult.error(e.toString());
233 239
         }
@@ -259,7 +265,7 @@ public class VideoServiceImpl implements VideoService {
259 265
             // 返回的resp是一个DeleteCloudRecordingResponse的实例,与请求对象对应
260 266
             DeleteCloudRecordingResponse resp = client.DeleteCloudRecording(req);
261 267
             // 输出json格式的字符串回包
262
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
268
+            return success((JSONObject) JSON.toJSON(resp));
263 269
         } catch (TencentCloudSDKException e) {
264 270
             return AjaxResult.error(e.toString());
265 271
         }
@@ -282,13 +288,30 @@ public class VideoServiceImpl implements VideoService {
282 288
         req.setRoomId(roomId);
283 289
         try {
284 290
             DismissRoomResponse resp = client.DismissRoom(req);
285
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
291
+            return success((JSONObject) JSON.toJSON(resp));
286 292
         } catch (TencentCloudSDKException e) {
287 293
             return AjaxResult.error("解散房间失败");
288 294
         }
289 295
 
290 296
     }
291 297
 
298
+    @Override
299
+    public AjaxResult secretaryRoleByUserId(Long userId) {
300
+        List<SysRole> roles = roleMapper.selectRolePermissionByUserId(userId);
301
+        JSONObject jsonObject = new JSONObject();
302
+        boolean isSecretaryRole=false;
303
+        if(CollectionUtil.isNotEmpty(roles)){
304
+            for (SysRole role : roles) {
305
+                if("法律顾问".equals(role.getRoleName()) || "秘书".equals(role.getRoleName())){
306
+                    isSecretaryRole=true;
307
+                    break;
308
+                }
309
+            }
310
+        }
311
+        jsonObject.put("isSecretaryRole",isSecretaryRole);
312
+        return success(jsonObject);
313
+    }
314
+
292 315
 
293 316
     /**
294 317
      *  查询出音视频集合,并下载,在将云点播上面的音视频删除

+ 2
- 3
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml 查看文件

@@ -471,7 +471,7 @@
471 471
         c.hear_date ,c.arbitrat_claims ,
472 472
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
473 473
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
474
-        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
474
+        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,c.version
475 475
         from case_log_record r
476 476
         join case_application c on r.case_appli_id=c.id
477 477
          JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
@@ -1573,8 +1573,7 @@ order by c.create_time desc limit 1
1573 1573
                    END paymentStatusName,c.pay_type,
1574 1574
                CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
1575 1575
         from case_application c left join case_payment_record p on c.id  = p.case_id
1576
-        where c.case_status  = 3
1577
-          AND c.id = #{id} and p.payment_status=1 limit 1
1576
+        where  c.id = #{id} and p.payment_status=1 limit 1
1578 1577
 
1579 1578
     </select>
1580 1579
     <select id="selectCaseNumLike" resultType="java.lang.Integer">