Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into bgy

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<SysUser> 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<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
+                            if (sysUsers != null && sysUsers.size() > 0) {
+                                return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！");
+                            }
                         }
                     }
                 }

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;
+
+}

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<SysUser> sysUserList = sysUserMapper.selectRoleUserByDeptId(deptIdentify.getDeptId(), roleId);
                 return sysUserList;
             }

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<MsCaseApplication> list(MsCaseApplicationReq req);
+}

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<MsCaseApplication> list(MsCaseApplicationReq req) {
+        // 根据用户查询角色
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long roleId = loginUser.getUser().getRoleId();
+        if(roleId==null){
+            return new ArrayList<>();
+        }
+        // 根据角色查询关联的案件状态
+
+
+        // 查询案件列表
+        return null;
+    }
+}