diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java index 7020740..66e6c52 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java @@ -1,15 +1,16 @@ package com.ruoyi.web.controller.wisdomarbitrate.mscase; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; -import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService; -import org.springframework.beans.factory.annotation.Autowired; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq; +import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseApplicationService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; /** * 案件列表控制层 @@ -20,18 +21,19 @@ import java.util.List; @RestController @RequestMapping("/caseApplication") public class MsCaseApplicationController extends BaseController { - @Autowired - private MsCaseLogRecordService caseLogRecordService; + @Resource + private MsCaseApplicationService caseApplicationService; /** - * 查询案件日志列表 + * 分页查询案件列表 */ - @PreAuthorize("@ss.hasPermi('caseLog:list')") - @GetMapping("/list") - public AjaxResult list(MsCaseLogRecord caseLogRecord) + @PreAuthorize("@ss.hasPermi('caseApplication:list')") + @GetMapping("/page") + public TableDataInfo list(MsCaseApplicationReq req) { - List list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); - return AjaxResult.success(list); + startPage(); + List list = caseApplicationService.list(req); + return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 9542c7f..afd219d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,22 +1,9 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Validator; - -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.system.mapper.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.ServiceException; @@ -27,8 +14,21 @@ import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.validation.Validator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; /** * 用户 业务层处理 @@ -294,13 +294,15 @@ public class SysUserServiceImpl implements ISysUserService { Integer deptType = dept.getDeptType(); if (deptType != null && deptType.intValue() == 1) { SysPost sysPost = postMapper.selectPostByPostCode("jbr"); - Long postId = sysPost.getPostId(); - if (postIds.length > 0) { - boolean isContain = Arrays.asList(postIds).contains(postId); - if (isContain) { - List sysUsers = userMapper.selectUserByDeptId(deptId); - if (sysUsers != null && sysUsers.size() > 0) { - return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); + if(sysPost!=null) { + Long postId = sysPost.getPostId(); + if (postId!=null&&postIds.length > 0) { + boolean isContain = Arrays.asList(postIds).contains(postId); + if (isContain) { + List sysUsers = userMapper.selectUserByDeptId(deptId); + if (sysUsers != null && sysUsers.size() > 0) { + return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); + } } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java new file mode 100644 index 0000000..1705e8a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationReq.java @@ -0,0 +1,35 @@ +package com.ruoyi.wisdomarbitrate.domain.vo.mscase; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@NoArgsConstructor +@AllArgsConstructor +@Data +public class MsCaseApplicationReq { + /** + * 批次 + */ + private Integer batchNumber; + + /** + * 案件编号 + */ + private String caseNum; + /** + * 申请机构 + */ + private String applicationOrganId; + /** + * 案件状态,字典 + */ + private Integer caseStatus; + /** + * 创建时间 + */ + private Date createTime; + +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java index 5c659f0..6c7179b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java @@ -16,13 +16,10 @@ import com.ruoyi.common.exception.EsignDemoException; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SealUtil; import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; +import com.ruoyi.system.mapper.*; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; -import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage; import com.ruoyi.wisdomarbitrate.domain.vo.template.TemplateFatchRule; @@ -30,6 +27,7 @@ import com.ruoyi.wisdomarbitrate.mapper.dept.DeptIdentifyMapper; import com.ruoyi.wisdomarbitrate.mapper.dept.SealManageMapper; import com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseAttachMapper; import com.ruoyi.wisdomarbitrate.mapper.template.FatchRuleMapper; +import com.ruoyi.wisdomarbitrate.mapper.template.TemplateFatchRuleMapper; import com.ruoyi.wisdomarbitrate.mapper.template.TemplateManageMapper; import com.ruoyi.wisdomarbitrate.service.dept.IDeptIdentifyService; import com.ruoyi.wisdomarbitrate.utils.SignAward; @@ -37,7 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.wisdomarbitrate.mapper.template.TemplateFatchRuleMapper; import java.io.File; import java.io.IOException; @@ -46,7 +43,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.ruoyi.common.utils.PageUtils.startPage; import static com.ruoyi.common.utils.SecurityUtils.getUsername; @Service @@ -61,6 +57,8 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService { @Autowired private SysDeptMapper sysDeptMapper; @Autowired + private SysRoleMapper sysRoleMapper; + @Autowired private SysUserMapper sysUserMapper; @Autowired private TemplateManageMapper templateManageMapper; @@ -511,8 +509,8 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService { if (deptIdentifies != null && deptIdentifies.size() > 0) { deptIdentify = deptIdentifies.get(0); if (deptIdentify.getDeptId() != null) { - //默认查询经办人的 - Long roleId = 106L; + // 获取经办人角色id + Long roleId = sysRoleMapper.selectRoleIdByName("经办人"); List sysUserList = sysUserMapper.selectRoleUserByDeptId(deptIdentify.getDeptId(), roleId); return sysUserList; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java new file mode 100644 index 0000000..93f98f0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java @@ -0,0 +1,22 @@ +package com.ruoyi.wisdomarbitrate.service.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq; + +import java.util.List; + +/** + * @Classname MsCaseApplicationService + * @Description 案件表业务层 + * @Version 1.0.0 + * @Date 2024/1/8 17:16 + * @Created wangqiong + */ +public interface MsCaseApplicationService { + /** + * 根据条件查询案件列表 + * @param req + * @return + */ + List list(MsCaseApplicationReq req); +} 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 new file mode 100644 index 0000000..5125b5d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -0,0 +1,36 @@ +package com.ruoyi.wisdomarbitrate.service.mscase.impl; + +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq; +import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseApplicationService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Classname MsCaseApplicationServiceImpl + * @Description 案件表业务层实现类 + * @Version 1.0.0 + * @Date 2024/1/8 17:17 + * @Created wangqiong + */ +@Service +public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { + @Override + public List list(MsCaseApplicationReq req) { + // 根据用户查询角色 + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long roleId = loginUser.getUser().getRoleId(); + if(roleId==null){ + return new ArrayList<>(); + } + // 根据角色查询关联的案件状态 + + + // 查询案件列表 + return null; + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index f600eb8..635e6c9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -57,8 +57,8 @@ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from ms_sys_menu m - left join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id - left join ms_ms_sys_user_role ur on rm.role_id = ur.role_id + left join ms_sys_role_menu rm on m.menu_id = rm.menu_id + left join ms_sys_user_role ur on rm.role_id = ur.role_id left join ms_sys_role ro on ur.role_id = ro.role_id left join ms_sys_user u on ur.user_id = u.user_id where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0 @@ -87,10 +87,10 @@ @@ -98,15 +98,15 @@ @@ -114,7 +114,7 @@ diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 8359840..29f413b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/miniprogress/WeChatUserMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/miniprogress/WeChatUserMapper.xml index fe53211..a138974 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/miniprogress/WeChatUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/miniprogress/WeChatUserMapper.xml @@ -15,7 +15,7 @@ - insert into ms_ms_identi_authenti( + insert into ms_identi_authenti( name, identity_no, certification_time, @@ -39,7 +39,7 @@ ) - update ms_ms_identi_authenti + update ms_identi_authenti phone = #{phone}, email = #{email}, @@ -50,11 +50,11 @@