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

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.common.core.page.TableDataInfo;
-import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord;
+import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
-import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService;
+import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq;
-import org.springframework.beans.factory.annotation.Autowired;
+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
+    @Resource
-    private MsCaseLogRecordService caseLogRecordService;
+    private MsCaseApplicationService caseApplicationService;
 
     /**
-     * 查询案件日志列表
+     * 分页查询案件列表
      */
-    @PreAuthorize("@ss.hasPermi('caseLog:list')")
+    @PreAuthorize("@ss.hasPermi('caseApplication:list')")
-    @GetMapping("/list")
+    @GetMapping("/page")
-    public AjaxResult list(MsCaseLogRecord caseLogRecord)
+    public TableDataInfo list(MsCaseApplicationReq req)
     {
-        List<MsCaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
+        startPage();
-        return AjaxResult.success(list);
+        List<MsCaseApplication> list = caseApplicationService.list(req);
+        return getDataTable(list);
     }
 
 

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(sysPost!=null) {
-                if (postIds.length > 0) {
+                    Long postId = sysPost.getPostId();
-                    boolean isContain = Arrays.asList(postIds).contains(postId);
+                    if (postId!=null&&postIds.length > 0) {
-                    if (isContain) {
+                        boolean isContain = Arrays.asList(postIds).contains(postId);
-                        List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
+                        if (isContain) {
-                        if (sysUsers != null && sysUsers.size() > 0) {
+                            List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
-                            return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！");
+                            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.*;
-import com.ruoyi.system.mapper.SysDictDataMapper;
+import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
 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) {
-                //默认查询经办人的
+                // 获取经办人角色id
-                Long roleId = 106L;
+                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;
+    }
+}

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -57,8 +57,8 @@
 	<select id="selectMenuListByUserId" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
 		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_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_user_role ur on rm.role_id = ur.role_id
 		left join ms_sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
@@ -76,8 +76,8 @@
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
 		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_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_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 @@
 	<select id="selectMenuListByRoleId" resultType="Long">
 		select m.menu_id
 		from ms_sys_menu m
-            left join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id
+            left join ms_sys_role_menu rm on m.menu_id = rm.menu_id
         where rm.role_id = #{roleId}
             <if test="menuCheckStrictly">
-              and m.menu_id not in (select m.parent_id from ms_sys_menu m inner join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+              and m.menu_id not in (select m.parent_id from ms_sys_menu m inner join ms_sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
             </if>
 		order by m.parent_id, m.order_num
 	</select>
@@ -98,15 +98,15 @@
 	<select id="selectMenuPerms" resultType="String">
 		select distinct m.perms
 		from ms_sys_menu m
-			 left join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join 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_user_role ur on rm.role_id = ur.role_id
 	</select>
 
 	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from ms_sys_menu m
-			 left join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join 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_user_role ur on rm.role_id = ur.role_id
 			 left join ms_sys_role r on r.role_id = ur.role_id
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
@@ -114,7 +114,7 @@
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from ms_sys_menu m
-			 left join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join ms_sys_role_menu rm on m.menu_id = rm.menu_id
 		where m.status = '0' and rm.role_id = #{roleId}
 	</select>
 	

ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
 		select p.post_id
         from ms_sys_post p
-	        left join ms_ms_sys_user_post up on up.post_id = p.post_id
+	        left join ms_sys_user_post up on up.post_id = p.post_id
 	        left join ms_sys_user u on u.user_id = up.user_id
 	    where u.user_id = #{userId}
 	</select>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
 		select p.post_id, p.post_name, p.post_code
 		from ms_sys_post p
-			 left join ms_ms_sys_user_post up on up.post_id = p.post_id
+			 left join ms_sys_user_post up on up.post_id = p.post_id
 			 left join ms_sys_user u on u.user_id = up.user_id
 		where u.user_name = #{userName}
 	</select>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/miniprogress/WeChatUserMapper.xml

@@ -15,7 +15,7 @@
 
     </resultMap>
     <insert id="insertUser">
-        insert into ms_ms_identi_authenti(
+        insert into ms_identi_authenti(
         <if test="name != null and name != ''">name,</if>
         <if test="identityNo != null and identityNo != ''">identity_no,</if>
         certification_time,
@@ -39,7 +39,7 @@
         )
     </insert>
     <update id="updateUser">
-        update ms_ms_identi_authenti
+        update ms_identi_authenti
         <set>
             <if test="phone != null and phone != ''">phone = #{phone},</if>
             <if test="email != null and email != ''">email = #{email},</if>
@@ -50,11 +50,11 @@
     </update>
     <select id="selectIdentityAuthentication"  resultMap="BaseResult">
         SELECT  i.id ,i.name ,i.identity_no ,i.certification_time ,i.certification_status ,i.user_id ,i.user_name,open_id,phone,email
-        from ms_ms_identi_authenti i
+        from ms_identi_authenti i
     </select>
     <select id="selectUserByOppenId" resultMap="BaseResult">
         SELECT  i.id ,i.name ,i.identity_no ,i.certification_time ,i.certification_status ,i.user_id ,i.user_name,open_id,phone,email
-        from ms_ms_identi_authenti i where open_id=#{oppenId}
+        from ms_identi_authenti i where open_id=#{oppenId}
     </select>