From 1110f5edcd60ad24cb55e5637faad088a22148c8 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 30 Oct 2023 15:56:34 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 5 ++ .../wisdomarbitrate/WeChatUserController.java | 1 + .../domain/CaseApplication.java | 24 ++++++ .../mapper/CaseApplicationMapper.java | 7 ++ .../impl/CaseApplicationServiceImpl.java | 86 ++++++++++--------- .../service/impl/VideoServiceImpl.java | 3 - .../service/impl/WeChatUserServiceImpl.java | 3 +- .../wisdomarbitrate/CaseApplicationMapper.xml | 47 +++++++++- 8 files changed, 130 insertions(+), 46 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index cd363e3..371fdb0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.wisdomarbitrate; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -8,6 +9,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.EsignDemoException; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.WxAppletNotifyUtils; import com.ruoyi.wisdomarbitrate.domain.*; import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO; @@ -37,6 +39,9 @@ public class CaseApplicationController extends BaseController { // @PreAuthorize("@ss.hasPermi('caseManagement:list')") @GetMapping("/list") public TableDataInfo list(CaseApplication caseApplication) { + if(StrUtil.isEmpty(caseApplication.getSelectCaseStatus())){ + caseApplication.setSelectCaseStatus("0"); + } startPage(); List list = caseApplicationService.selectCaseApplicationListByRole(caseApplication); // List list = caseApplicationService.selectCaseApplicationList(caseApplication); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java index 8f63de6..9f5f6f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java @@ -55,6 +55,7 @@ public class WeChatUserController extends BaseController { ){ return warn("参数校验失败"); } + logger.info("调用小程序注册==="+ientityAuthentication.toString()); return weChatUserService.registerUser(ientityAuthentication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 5498c70..9a0d4ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -9,6 +9,10 @@ import java.util.List; public class CaseApplication extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 查询案件时区分是否待办案件，0待办案件，1已办案件 + */ + private String selectCaseStatus; /** ID */ private Long id; @@ -26,6 +30,14 @@ public class CaseApplication extends BaseEntity { /** 仲裁方式 */ private Integer arbitratMethod; + public String getSelectCaseStatus() { + return selectCaseStatus; + } + + public void setSelectCaseStatus(String selectCaseStatus) { + this.selectCaseStatus = selectCaseStatus; + } + public Integer getArbitratMethod() { return arbitratMethod; } @@ -355,6 +367,10 @@ public class CaseApplication extends BaseEntity { * 用户id */ private String userId; + /** + * 登录用户用户名 + */ + private String loginUserName; private List deptIds; /** * 部门长状态 @@ -365,6 +381,14 @@ public class CaseApplication extends BaseEntity { */ private Integer financeStatus; + public String getLoginUserName() { + return loginUserName; + } + + public void setLoginUserName(String loginUserName) { + this.loginUserName = loginUserName; + } + public Integer getFinanceStatus() { return financeStatus; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java index c775ae9..1bbe1d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java @@ -97,4 +97,11 @@ public interface CaseApplicationMapper { * @return */ Long selectCaseIdByRoomId(@Param("roomId")String roomId); + + /** + * 查询已办案件 + * @param caseApplication + * @return + */ + List selectHandledCase(CaseApplication caseApplication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index c9862c8..1754f52 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -112,50 +112,56 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { Long userId = user.getUserId(); // 查询登录人身份证号 SysUser sysUser = sysUserMapper.selectUserById(userId); - List roles = sysUser.getRoles(); - // 没有角色不能查看案件列表 - if(CollectionUtil.isEmpty(roles)){ - throw new ServiceException("该用户没有角色权限"); - } - startPage(); - for (SysRole role : roles) { - // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √ - if(role.getRoleName().equals("超级管理员") - ){ - return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); + // 已办案件 + if(caseApplication.getSelectCaseStatus().equals("1")){ + caseApplication.setLoginUserName(sysUser.getUserName()); + return caseApplicationMapper.selectHandledCase(caseApplication); + }else { // 待办案件 + List roles = sysUser.getRoles(); + // 没有角色不能查看案件列表 + if (CollectionUtil.isEmpty(roles)) { + throw new ServiceException("该用户没有角色权限"); } - if(role.getRoleName().equals("仲裁委") - ||role.getRoleName().equals("部门长")){ - List caseStatusList=new ArrayList<>(); - caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); - caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); - caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); - caseApplication.setDeptHeadStatus(caseStatusList); + startPage(); + for (SysRole role : roles) { + // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √ + if (role.getRoleName().equals("超级管理员") + ) { + return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); + } + if (role.getRoleName().equals("仲裁委") + || role.getRoleName().equals("部门长")) { + List caseStatusList = new ArrayList<>(); + caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); + caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); + caseApplication.setDeptHeadStatus(caseStatusList); + } + if (role.getRoleName().equals("仲裁员")) { + caseApplication.setUserId(String.valueOf(userId)); + } + if (role.getRoleName().equals("财务")) { + caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); + } + if (role.getRoleName().equals("法律顾问")) { + // 查询角色有关的用户部门 + List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); + caseApplication.setDeptIds(deptIds); + } + if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) { + // 查询角色有关的用户部门 + caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); + } + if (role.getRoleName().equals("被申请人")) { + // + caseApplication.setIdCard(String.valueOf(sysUser.getIdCard())); + } } - if(role.getRoleName().equals("仲裁员")){ - caseApplication.setUserId(String.valueOf(userId)); - } - if(role.getRoleName().equals("财务")){ - caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); - } - if(role.getRoleName().equals("法律顾问")){ - // 查询角色有关的用户部门 - List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); - caseApplication.setDeptIds(deptIds); - } - if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){ - // 查询角色有关的用户部门 - caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); - } - if(role.getRoleName().equals("被申请人")){ - // - caseApplication.setIdCard(String.valueOf(sysUser.getIdCard())); - } - } - // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件 - return caseApplicationMapper.selectCaseApplicationList(caseApplication); + // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件 + return caseApplicationMapper.selectCaseApplicationList(caseApplication); + } } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java index 95077e3..77c4979 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java @@ -215,7 +215,6 @@ public class VideoServiceImpl implements VideoService { @Transactional public String downloadImage(String fileId,String fileUrl,String roomId) throws IOException { String staticAndMksDir = null; - log.info("fileUrl========"); if (fileUrl != null) { //下载时文件名称 String fileName = fileUrl.substring(fileUrl.lastIndexOf("/")); @@ -224,7 +223,6 @@ public class VideoServiceImpl implements VideoService { String absPath = getAbsoluteFile(RuoYiConfig.getVideoUploadPath(), fileName).getAbsolutePath(); staticAndMksDir = Paths.get(absPath).toFile().toString(); HttpUtil.downloadFile(fileUrl, staticAndMksDir ); - log.info("selectCaseIdByRoomId========"); Long caseId= caseApplicationMapper.selectCaseIdByRoomId(roomId); String annexName = getPathFileName(RuoYiConfig.getVideoUploadPath(), fileName); // 存入数据库 @@ -233,7 +231,6 @@ public class VideoServiceImpl implements VideoService { .annexPath(RuoYiConfig.getVideoUploadPath()) .annexType(9) .build(); - log.info("视频保存========"); caseAttachMapper.save(caseAttach); return annexName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java index 5acd5e1..63b6e5a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java @@ -130,7 +130,6 @@ public class WeChatUserServiceImpl implements WeChatUserService { // 根据身份证查询系统用户表中是否存在该用户，存在则同步已认证的信息，不存在则新增 SysUser sysUser=sysUserMapper.selectUserByIdCard(ientityAuthentication.getIdentityNo()); - if(sysUser!=null){ sysUser.setIdCard(ientityAuthentication.getIdentityNo()); sysUser.setNickName(ientityAuthentication.getName()); @@ -147,7 +146,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { sysUser.setUserName(ientityAuthentication.getUserName()); sysUser.setPhonenumber(ientityAuthentication.getPhone()); sysUser.setEmail(ientityAuthentication.getEmail()); - sysUser.setCreateBy(ientityAuthentication.getPhone()); + sysUser.setCreateBy(ientityAuthentication.getUserName()); sysUser.setPassword(SecurityUtils.encryptPassword(ientityAuthentication.getPassWord())); int row = sysUserMapper.insertUser(sysUser); if(row<1) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 14550ef..76ec46a 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -46,7 +46,51 @@ - + +