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 913f002..5968671 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 @@ -12,6 +12,7 @@ import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.SealSignRecord; import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO; +import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount; import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -38,11 +39,23 @@ public class CaseApplicationController extends BaseController { @GetMapping("/list") public TableDataInfo list(CaseApplication caseApplication) { startPage(); -// List list = caseApplicationService.selectCaseApplicationListNew(caseApplication); - List list = caseApplicationService.selectCaseApplicationList(caseApplication); + List list = caseApplicationService.selectCaseApplicationListByRole(caseApplication); +// List list = caseApplicationService.selectCaseApplicationList(caseApplication); return getDataTable(list); } + /** + * 根据角色查询待办数量 + * @return + */ + + @GetMapping("/toDoCount") + public AjaxResult toDoCount() { + ToDoCount toDoCount = caseApplicationService.selectToDoCount(); +// List list = caseApplicationService.selectCaseApplicationList(caseApplication); + return success(toDoCount); + } + /** * 新增立案数据 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java new file mode 100644 index 0000000..9039675 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java @@ -0,0 +1,88 @@ +package com.ruoyi.wisdomarbitrate.domain.vo; + +import lombok.Data; + +/** + * @author wangqiong + * @description 待办数量 + * @date 2023-10-17 09:48 + */ +@Data +public class ToDoCount { + /** + * 立案申请 + */ + private int caseApply; + /** + * 待立案审查 + */ + private int caseApplyCheck; + /** + * 待缴费 + */ + private int caseApplyPay; + /** + * 待缴费确认 + */ + private int caseApplyPayCheck; + /** + * 待案件质证 + */ + private int caseApplyEvidence; + /** + * 待组庭审核 + */ + private int caseApplyGroupCheck; + /** + * 待组庭确定 + */ + private int caseApplyGroupConfirm; + /** + * 待组庭通知 + */ +// private int caseApplyGroupNotice; + /** + * 待审核仲裁方式 + */ + private int caseApplyArbitrateWay; + /** + * 待开庭审理 + */ + private int caseApplyGroupOnline; + /** + * 待书面审理 + */ + private int caseApplyGroupOffline; + /** + * 待生成仲裁文书 + */ + private int caseApplyAward; + /** + * 待核验仲裁文书 + */ + private int caseApplyAwardCheck; + /** + * 待审核仲裁文书 + */ + private int caseApplyAwardConfirm; + /** + * 待仲裁文书签名 + */ + private int caseApplyAwardSign; + /** + * 待仲裁文书用印 + */ + private int caseApplyAwardSeal; + /** + * 待仲裁文书送达 + */ + private int caseApplyAwardSend; + /** + * 待案件归档 + */ + private int caseApplyStored; + /** + * 已归档 + */ + private int caseApplyArchived; +} 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 a682163..3a3cf75 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 @@ -4,6 +4,7 @@ import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.dto.CaseConfirmPayDTO; +import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -60,4 +61,10 @@ public interface CaseApplicationMapper { * @return */ List selectDeptHeadCaseApplicationList(@Param("caseApplication") CaseApplication caseApplication, @Param("statusList")List caseStatusList); + + ToDoCount selectAdminCaseToDoCount(); + + ToDoCount selectDeptHeadCaseToDoCount( @Param("statusList")List caseStatusList); + + ToDoCount selectTodoCountByRole(CaseApplication caseApplication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index 46bfd0b..23ac00d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -6,12 +6,13 @@ import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.SealSignRecord; import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO; +import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount; import java.util.List; public interface ICaseApplicationService { List selectCaseApplicationList(CaseApplication caseApplication); - List selectCaseApplicationListNew(CaseApplication caseApplication); + List selectCaseApplicationListByRole(CaseApplication caseApplication); int insertcaseApplication(CaseApplication caseApplication); @@ -53,4 +54,10 @@ public interface ICaseApplicationService { AjaxResult creatTrialRecord(ArbitrateRecord arbitrateRecord); CaseApplication selectSignSealUrl(CaseApplication caseApplication) throws EsignDemoException; + + /** + * 查询待办数量 + * @return + */ + ToDoCount selectToDoCount(); } 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 a86b85f..000f1d8 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 @@ -29,6 +29,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.EsignDemoException; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount; import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.system.mapper.SysDeptMapper; @@ -99,7 +100,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { * @return */ // @Override - public List selectCaseApplicationListNew(CaseApplication caseApplication) { + public List selectCaseApplicationListByRole(CaseApplication caseApplication) { // 获取登录用户 LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); @@ -151,6 +152,59 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } @Override + public ToDoCount selectToDoCount() { + + // 获取登录用户 + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + Long userId = user.getUserId(); + + // 查询登录人身份证号 + SysUser sysUser = sysUserMapper.selectUserById(userId); + List roles = sysUser.getRoles(); + // 没有角色不能查看案件列表 + if(CollectionUtil.isEmpty(roles)){ + throw new ServiceException("该用户没有角色权限"); + } + CaseApplication caseApplication = new CaseApplication(); + for (SysRole role : roles) { + // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √ + if(role.getRoleName().equals("超级管理员") + ){ + return caseApplicationMapper.selectAdminCaseToDoCount(); + } + // 查看所有案件 + 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); + return caseApplicationMapper.selectDeptHeadCaseToDoCount(caseStatusList); + } + if(role.getRoleName().equals("仲裁员")){ + caseApplication.setUserId(String.valueOf(userId)); + } + 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.selectTodoCountByRole(caseApplication); + } + @Override public List selectCaseApplicationList(CaseApplication caseApplication) { return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); @@ -1272,6 +1326,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { return caseApplication; } + + @Override @Transactional public int pendTralSure(CaseApplication caseApplication) { 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 be822f6..30d8ec1 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 @@ -81,7 +81,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { */ public static void setCodeCache(String key, String code) { - SpringUtils.getBean(RedisCache.class).setCacheObject(getVerifyCodeCacheKey(key), code, 5,TimeUnit.MILLISECONDS); + SpringUtils.getBean(RedisCache.class).setCacheObject(getVerifyCodeCacheKey(key), code, 5,TimeUnit.MINUTES); } @@ -107,9 +107,12 @@ public class WeChatUserServiceImpl implements WeChatUserService { @Transactional @Override public AjaxResult registerUser(IdentityAuthentication ientityAuthentication) { + String codeCache = getCodeCache(ientityAuthentication.getPhone()); // 校验短信验证码 - if(StrUtil.isEmpty(getCodeCache(ientityAuthentication.getPhone()))){ - return AjaxResult.success("验证码校验失败"); + if(StrUtil.isEmpty(codeCache)){ + return AjaxResult.warn("验证码校验失败"); + }else if(!codeCache.equals(ientityAuthentication.getVerifyCode())){ + return AjaxResult.warn("验证码校验失败"); } SysUser sysUserName=sysUserMapper.selectUserByUserName(ientityAuthentication.getUserName()); if(sysUserName!=null){ @@ -140,7 +143,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { sysUser.setPassword(SecurityUtils.encryptPassword(ientityAuthentication.getPassWord())); int row = sysUserMapper.insertUser(sysUser); if(row<1) { - return AjaxResult.error("注册失败"); + return AjaxResult.warn("注册失败"); } } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index aa643f6..dbe00e4 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -39,7 +39,14 @@ + + + +