SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #161.
This commit is contained in:
wangqiong123
2024-05-21 13:50:22 +08:00
committed by Gitea
parent b6d27fa7e1 0bf88192cf
commit 521f1e24b9
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsVideoConferenceController.java
+2 -1
View File
@@ -71,6 +71,7 @@ public class MsVideoConferenceController extends BaseController {
// 上传文件路径 // 上传文件路径
String filePath = RuoYiConfig.getUploadPath(); String filePath = RuoYiConfig.getUploadPath();
// 上传并返回新文件名称 // 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file); String fileName = FileUploadUtils.upload(filePath, file);
String suffix = getFileExtension(fileName); String suffix = getFileExtension(fileName);
if(StrUtil.isNotEmpty(suffix)&& suffix.contains("doc")){ if(StrUtil.isNotEmpty(suffix)&& suffix.contains("doc")){
@@ -110,7 +111,7 @@ public class MsVideoConferenceController extends BaseController {
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("annexId", caseAttach.getAnnexId()); ajax.put("annexId", caseAttach.getAnnexId());
ajax.put("annexType", annexType); ajax.put("annexType", annexType);
// ajax.put("url", url); ajax.put("onlyOfficeFileId", caseAttach.getOnlyOfficeFileId());
ajax.put("fileName", fileName); ajax.put("fileName", fileName);
ajax.put("newFileName", FileUtils.getName(fileName)); ajax.put("newFileName", FileUtils.getName(fileName));
ajax.put("originalFilename", file.getOriginalFilename()); ajax.put("originalFilename", file.getOriginalFilename());
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+2 -1
View File
@@ -311,7 +311,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if(StrUtil.isEmpty(loginUser.getUsername())){ if(StrUtil.isEmpty(loginUser.getUsername())){
vo.setAgentFlag(0); vo.setAgentFlag(0);
}else { }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); vo.setAgentFlag(1);
}else { }else {
vo.setAgentFlag(0); vo.setAgentFlag(0);
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml
+20 -17
View File
@@ -40,8 +40,9 @@
JOIN ms_case_affiliate a ON c.id = a.case_appli_id 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 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 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_user u2 ON u2.user_name = c.create_by
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_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 LEFT JOIN ms_sys_dept d ON d.dept_id = a.applicant_dept_id
<where> <where>
<!-- 调解员角色和申请人，被申，代理人--> <!-- 调解员角色和申请人，被申，代理人-->
@@ -87,13 +88,7 @@
<if test = 'req.caseNum != null and req.caseNum != "" '> <if test = 'req.caseNum != null and req.caseNum != "" '>
AND c.case_num like concat('%',#{req.caseNum},'%') AND c.case_num like concat('%',#{req.caseNum},'%')
</if> </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> </where>
</sql> </sql>
@@ -161,18 +156,26 @@
<if test = 'req.caseNum != null and req.caseNum != "" '> <if test = 'req.caseNum != null and req.caseNum != "" '>
AND c.case_num like concat('%',#{req.caseNum},'%') AND c.case_num like concat('%',#{req.caseNum},'%')
</if> </if>
<!-- 时间--> <!-- &lt;!&ndash; 时间&ndash;&gt;-->
<if test = 'req.startTime != null and req.startTime != "" '> <!-- <if test = 'req.startTime != null and req.startTime != "" '>-->
and c.create_time &gt;= #{req.startTime} <!-- and c.create_time &gt;= #{req.startTime}-->
</if> <!-- </if>-->
<if test = 'req.endTime != null and req.endTime != "" '> <!-- <if test = 'req.endTime != null and req.endTime != "" '>-->
and c.create_time &lt;= #{req.endTime} <!-- and c.create_time &lt;= #{req.endTime}-->
</if> <!-- </if>-->
</where> </where>
GROUP BY GROUP BY
c.id 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>
<select id="countCasePerson" resultType="java.lang.Long"> <select id="countCasePerson" resultType="java.lang.Long">