From 0bf88192cfcbecbed540a93a1c6394651c144ee8 Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Tue, 21 May 2024 13:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=A7=A3bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mscase/MsVideoConferenceController.java   |  3 +-
 .../impl/MsCaseApplicationServiceImpl.java    |  3 +-
 .../mscase/MsCaseApplicationMapper.xml        | 37 ++++++++++---------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java
index fb42a37..18168db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java
@@ -71,6 +71,7 @@ public class MsVideoConferenceController extends BaseController {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
+
             String fileName = FileUploadUtils.upload(filePath, file);
             String suffix = getFileExtension(fileName);
             if(StrUtil.isNotEmpty(suffix)&& suffix.contains("doc")){
@@ -110,7 +111,7 @@ public class MsVideoConferenceController extends BaseController {
                     AjaxResult ajax = AjaxResult.success();
                     ajax.put("annexId", caseAttach.getAnnexId());
                     ajax.put("annexType", annexType);
-               //     ajax.put("url", url);
+                    ajax.put("onlyOfficeFileId", caseAttach.getOnlyOfficeFileId());
                     ajax.put("fileName", fileName);
                     ajax.put("newFileName", FileUtils.getName(fileName));
                     ajax.put("originalFilename", file.getOriginalFilename());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
index 51b2383..949b509 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
@@ -311,7 +311,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
                 if(StrUtil.isEmpty(loginUser.getUsername())){
                     vo.setAgentFlag(0);
                 }else {
-                    if(StrUtil.equals(loginUser.getUsername(),vo.getCreatBy()) && agentFlag){
+                    // todo 如果案件流程id变了需要改
+                    if(StrUtil.equals(loginUser.getUsername(),vo.getCreatBy()) && agentFlag && vo.getCaseFlowId()!=null && mediatorSort!=null && vo.getCaseFlowId()<mediatorSort){
                         vo.setAgentFlag(1);
                     }else {
                         vo.setAgentFlag(0);
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml
index e346a22..f4592dd 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml
@@ -40,8 +40,9 @@
     JOIN ms_case_affiliate a ON c.id = a.case_appli_id
     LEFT JOIN ms_sys_user u ON u.user_id = a.user_id
     LEFT JOIN ms_sys_user u1 ON u1.user_id = c.mediator_id
-    LEFT JOIN ms_sys_user_role ur ON  u.user_id = ur.user_id or u1.user_id = ur.user_id
-    LEFT JOIN ms_sys_role r ON r.role_id = ur.role_id or r.role_id = ur.role_id
+    LEFT JOIN ms_sys_user u2 ON u2.user_name = c.create_by
+    LEFT JOIN ms_sys_user_role ur ON u.user_id = ur.user_id OR u1.user_id = ur.user_id or u2.user_id = ur.user_id
+    LEFT JOIN ms_sys_role r ON r.role_id = ur.role_id
     LEFT JOIN ms_sys_dept d ON d.dept_id = a.applicant_dept_id
     <where>
 <!--      调解员角色和申请人，被申，代理人-->
@@ -87,13 +88,7 @@
       <if test = 'req.caseNum != null and req.caseNum != "" '>
         AND c.case_num like  concat('%',#{req.caseNum},'%')
       </if>
-      <!--  时间-->
-      <if test = 'req.startTime != null and req.startTime != "" '>
-        and c.create_time &gt;= #{req.startTime}
-      </if>
-      <if test = 'req.endTime != null and req.endTime != "" '>
-        and c.create_time &lt;= #{req.endTime}
-      </if>
+
     </where>
 
   </sql>
@@ -161,18 +156,26 @@
       <if test = 'req.caseNum != null and req.caseNum != "" '>
         AND c.case_num like  concat('%',#{req.caseNum},'%')
       </if>
-      <!--  时间-->
-      <if test = 'req.startTime != null and req.startTime != "" '>
-        and c.create_time &gt;= #{req.startTime}
-      </if>
-      <if test = 'req.endTime != null and req.endTime != "" '>
-        and c.create_time &lt;= #{req.endTime}
-      </if>
+<!--      &lt;!&ndash;  时间&ndash;&gt;-->
+<!--      <if test = 'req.startTime != null and req.startTime != "" '>-->
+<!--        and c.create_time &gt;= #{req.startTime}-->
+<!--      </if>-->
+<!--      <if test = 'req.endTime != null and req.endTime != "" '>-->
+<!--        and c.create_time &lt;= #{req.endTime}-->
+<!--      </if>-->
 
     </where>
     GROUP BY
     c.id
-    ) t ORDER BY t.createTime desc,t.caseNum desc
+    ) t <where>
+    <!--  时间-->
+    <if test = 'req.startTime != null and req.startTime != "" '>
+      and t.createTime &gt;= #{req.startTime}
+    </if>
+    <if test = 'req.endTime != null and req.endTime != "" '>
+      and t.createTime &lt;= #{req.endTime}
+    </if>
+  </where> ORDER BY t.createTime desc,t.caseNum desc
 
   </select>
   <select id="countCasePerson" resultType="java.lang.Long">