From b54af26e429db8291faebe6e379fffee5eacc512 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 17 Oct 2023 11:47:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 17 +- .../wisdomarbitrate/domain/vo/ToDoCount.java | 88 +++++++++ .../mapper/CaseApplicationMapper.java | 7 + .../service/ICaseApplicationService.java | 9 +- .../impl/CaseApplicationServiceImpl.java | 58 +++++- .../service/impl/WeChatUserServiceImpl.java | 11 +- .../wisdomarbitrate/CaseApplicationMapper.xml | 180 +++++++++++++++++- 7 files changed, 357 insertions(+), 13 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java 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 @@ + + + + select t1.* from( - select dinstinct(t.id),t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method, + select DISTINCT(t.id),t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method, t.arbitratMethodName,t.case_status,t.caseStatusName,t.hear_date ,t.arbitrat_claims , t.loan_start_date ,t.loan_end_date ,t.claim_princi_owed ,t.claim_interest_owed ,t.claim_liquid_damag,t.fee_payable , t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time , - t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.application_organ_name as - applicantName, + t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName, t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url from( select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method , @@ -105,14 +104,25 @@ #{item} ) - + - or( ( t.application_organ_id = #{nameId} AND t.identity_type=1 + or ( t.application_organ_id = #{nameId} AND t.identity_type=1 and t.case_status in (0,2)) - ) + - + + + or t.case_status in + + #{caseStatus} + + + + + or( t.case_status =#{financeStatus}) + + ) t1 @@ -356,10 +366,38 @@ from case_application c LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1 - c.case_status in + + + or c.case_status in #{caseStatus} + + + or (t.identity_num=#{idCard} AND t.identity_type=2 and t.case_status=4) + + + + or ( t.identity_type=1 and + t.case_status in (7,8,9,12,13,14) + and + instr (t.arbitrator_id,#{userId})>0) + + + + or (t.identity_type=1 and t.case_status in (1,5,11,15,16) + and t.application_organ_id in + + #{item} + ) + + + + or( ( t.application_organ_id = #{nameId} AND t.identity_type=1 + and t.case_status in (0,2)) + ) + + From 371284d360dadc73978fd0d430019cc94299c4de Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 17 Oct 2023 13:50:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/mapper/SysRoleMapper.java | 8 ++ .../impl/CaseApplicationServiceImpl.java | 85 ++++++++++++++++--- .../resources/mapper/system/SysRoleMapper.xml | 7 +- .../wisdomarbitrate/CaseApplicationMapper.xml | 14 ++- 4 files changed, 99 insertions(+), 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index cf2bd8c..aed7155 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -49,6 +49,14 @@ public interface SysRoleMapper */ public SysRole selectRoleById(Long roleId); + /** + * 根据角色名称查询角色id + * @param roleName + * @return + */ + public Long selectRoleIdByName(String roleName); + + /** * 根据用户ID查询角色 * 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 d942e03..c6e9bd3 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 @@ -28,7 +28,10 @@ import com.ruoyi.common.utils.file.SaaSAPIFileUtils; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.EsignDemoException; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount; import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils; import com.ruoyi.common.utils.bean.BeanUtils; @@ -81,6 +84,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Autowired private SysUserMapper sysUserMapper; @Autowired + private SysUserRoleMapper userRoleMapper; + @Autowired + private SysRoleMapper roleMapper; + @Autowired private SealSignRecordMapper sealSignRecordMapper; @Autowired private CaseLogRecordMapper caseLogRecordMapper; @@ -126,11 +133,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); - return caseApplicationMapper.selectDeptHeadCaseApplicationList(caseApplication,caseStatusList); + 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()); @@ -174,10 +184,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { ){ return caseApplicationMapper.selectAdminCaseToDoCount(); } - - // 查看所有案件 if(role.getRoleName().equals("仲裁委") ||role.getRoleName().equals("部门长")){ + caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); @@ -205,6 +214,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } + + // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件 return caseApplicationMapper.selectTodoCountByRole(caseApplication); } @@ -264,7 +275,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } // 组装申请代理人信息 - buildAgentInfo(caseAffiliate); + String agentInfoFlag = buildAgentInfo(caseAffiliate); + if(StrUtil.isNotEmpty(agentInfoFlag)){ + throw new ServiceException(agentInfoFlag); + } } } @@ -352,7 +366,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseAffiliate.setApplicationOrganId(String.valueOf(dept.getDeptId())); } - buildAgentInfo(caseAffiliate); + String agentInfoFlag = buildAgentInfo(caseAffiliate); + if(StrUtil.isNotEmpty(agentInfoFlag)){ + throw new ServiceException(agentInfoFlag); + } } @@ -376,12 +393,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { * 组装申请代理人信息 * @param caseAffiliate */ - private void buildAgentInfo(CaseAffiliate caseAffiliate) { - if(StrUtil.isNotEmpty(caseAffiliate.getNameAgent())){ + private String buildAgentInfo(CaseAffiliate caseAffiliate) { + if (caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getNameAgent())) { + // 查询申请人角色id + Long roleId = roleMapper.selectRoleIdByName("申请人"); // 组装申请机构代理人信息，用户表新增并且和部门关联 // 根据代理人身份证去用户表查询，有修改，么有新增 SysUser agentUser = sysUserMapper.selectUserByIdCard(caseAffiliate.getIdentityNumAgent()); - if(agentUser==null){ + if (agentUser == null) { agentUser = new SysUser(); agentUser.setIdCard(caseAffiliate.getIdentityNumAgent()); agentUser.setNickName(caseAffiliate.getNameAgent()); @@ -390,18 +409,46 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { agentUser.setPassword(SecurityUtils.encryptPassword(Constants.DEFAULT_PASSWORD)); agentUser.setDeptId(Long.valueOf(caseAffiliate.getApplicationOrganId())); int insertUserRow = sysUserMapper.insertUser(agentUser); - if(insertUserRow>0) { + // 新增角色为申请人 + ArrayList sysUserRoles = new ArrayList<>(); + SysUserRole sysUserRole = new SysUserRole(); + sysUserRole.setUserId(agentUser.getUserId()); + sysUserRole.setRoleId(roleId); + sysUserRoles.add(sysUserRole); + if(CollectionUtil.isNotEmpty(sysUserRoles)) { + userRoleMapper.batchUserRole(sysUserRoles); + } + if (insertUserRow > 0) { caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId())); // 发送短信 todo } - }else { + } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) { + return "申请机构与申请代理人不匹配"; + } else if (null != agentUser.getDeptId() && String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())){ // 同步用户表和案件关联人表的手机号和名称 caseAffiliate.setContactTelphoneAgent(agentUser.getPhonenumber()); caseAffiliate.setNameAgent(agentUser.getNickName()); caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId())); + // 新增角色为申请人 + if(agentUser.getRoleIds()!=null) { + List longList = Arrays.asList(agentUser.getRoleIds()); + if(!longList.contains(roleId)) { + ArrayList sysUserRoles = new ArrayList<>(); + SysUserRole sysUserRole = new SysUserRole(); + sysUserRole.setUserId(agentUser.getUserId()); + sysUserRole.setRoleId(roleId); + sysUserRoles.add(sysUserRole); + if (CollectionUtil.isNotEmpty(sysUserRoles)) { + userRoleMapper.batchUserRole(sysUserRoles); + } + } + } + } + } + return null; } @Override @@ -529,7 +576,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { // }else { // caseApplicationListinsert.add(caseApplication); // } - caseApplicationListinsert.add(caseApplication); + if(StrUtil.isEmpty(caseApplication.getErrorMsg())) { + caseApplicationListinsert.add(caseApplication); + }else { + // 拼接错误信息 + failureMsg.append("
").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString()); + + } }else { // 拼接错误信息 failureMsg.append("
").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString()); @@ -577,7 +630,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { if(caseAffiliates!=null&&caseAffiliates.size()>0){ for (CaseAffiliate caseAffiliate : caseAffiliates){ caseAffiliate.setCaseAppliId(caseApplicationItera.getId()); - buildAgentInfo(caseAffiliate); } caseAffiliateMapper.batchCaseAffiliate(caseAffiliates); @@ -1444,6 +1496,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { if(StrUtil.isNotEmpty(caseApplication.getName())){ setApplicantOrganization(caseAffiliate, caseApplication, deptMap); } + String s = buildAgentInfo(caseAffiliate); + if(StrUtil.isNotEmpty(s)){ + StringBuilder errorMsg = caseApplication.getErrorMsg(); + if(StrUtil.isEmpty(errorMsg)){ + errorMsg=new StringBuilder(); + } + errorMsg.append(s); + caseApplication.setErrorMsg(errorMsg); + } caseAffiliatesnew.add(caseAffiliate); // 组装被申请人信息 diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 52306c2..783f153 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -92,8 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - - + + + insert into sys_role( role_id, role_name, diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index e6c0e72..85721f9 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -118,7 +118,7 @@ #{caseStatus} - + or( t.case_status =#{financeStatus}) @@ -203,6 +203,18 @@ and t.case_status in (0,2)) ) + + + or t.case_status in + + #{caseStatus} + + + + + or( t.case_status =#{financeStatus}) + + ) t1 -- From bc1579ef95cabcf03dc9bf1251ca3f81ec2ddf38 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 17 Oct 2023 14:29:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/domain/vo/ToDoCount.java | 94 ++++--------------- .../service/impl/WeChatUserServiceImpl.java | 4 +- .../wisdomarbitrate/CaseApplicationMapper.xml | 16 ++-- 3 files changed, 29 insertions(+), 85 deletions(-) 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 index 9039675..4f01e8a 100644 --- 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 @@ -9,80 +9,24 @@ import lombok.Data; */ @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 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; + 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/service/impl/WeChatUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java index 30d8ec1..727c525 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 @@ -74,10 +74,10 @@ public class WeChatUserServiceImpl implements WeChatUserService { return "短信发送失败"; } /** - * 设置字典缓存 + * 设置验证码缓存 * * @param key 参数键 - * @param code 字典数据列表 + * @param code 验证码 */ public static void setCodeCache(String key, String code) { diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 85721f9..ee7b0db 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -199,9 +199,9 @@ - or( ( t.application_organ_id = #{nameId} AND t.identity_type=1 + or ( t.application_organ_id = #{nameId} AND t.identity_type=1 and t.case_status in (0,2)) - ) + @@ -217,18 +217,18 @@ ) t1 --- - + - --- +