新增案件

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,19 +1,7 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.annotation.Anonymous;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -25,10 +13,23 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -51,6 +52,8 @@ public class SysUserController extends BaseController
 
     @Autowired
     private ISysPostService postService;
+    @Autowired
+    private SysDeptMapper deptMapper;
 
     /**
      * 获取用户列表
@@ -106,12 +109,18 @@ public class SysUserController extends BaseController
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
+
         if (StringUtils.isNotNull(userId))
         {
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+            List<SysDept> sysUserDepts = deptMapper.selectDeptByUserId(userId);
+            if(CollectionUtil.isNotEmpty(sysUserDepts)) {
+                    ajax.put("deptId", sysUserDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
+
+            }
         }
         return ajax;
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java

@@ -2,12 +2,14 @@ package com.ruoyi.web.controller.wisdomarbitrate.mscase;
 
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.utils.IdCardUtils;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAttach;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.*;
@@ -20,7 +22,11 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 /**
  * 案件列表控制层
  * @Author wangqiong
@@ -57,6 +63,36 @@ public class MsCaseApplicationController extends BaseController {
 
         return success(caseApplicationService.insert(caseApplication));
     }
+    /**
+     * 根据身份证号获取性别和出生日期
+     */
+    @GetMapping("/getInfoByIdCard")
+    public AjaxResult getInfoByIdCard(@RequestParam("idCard") String idCard)
+    {
+        if(StrUtil.isEmpty(idCard)){
+            error("参数校验失败");
+        }
+        if(!IdcardUtil.isValidCard(idCard)){
+            error("身份证不合法，请输入正确的身份证号");
+        }
+        AjaxResult ajax = AjaxResult.success();
+        Map<String, String> identityNumMap = IdCardUtils.getBirAgeSex(idCard);
+        String birthday = identityNumMap.get("birthday");
+        if (StrUtil.isNotEmpty(birthday)) {
+            SimpleDateFormat yyyymmddFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+            Date birthdayDate = null;
+            try {
+                birthdayDate = yyyymmddFormat.parse(birthday);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            ajax.put("respondentBirth",birthdayDate);
+        }
+        //从身份证抓取性别
+        ajax.put("respondentSex",identityNumMap.get("sexCode"));
+        return ajax;
+    }
 
     /**
      * 修改案件
@@ -67,7 +103,7 @@ public class MsCaseApplicationController extends BaseController {
         if(caseApplication.getId()==null){
             error("id不能为空");
         }
-        return caseApplicationService.update(caseApplication);
+        return success(caseApplicationService.update(caseApplication));
     }
     /**
      * 根据id查询案件
@@ -168,7 +204,7 @@ public class MsCaseApplicationController extends BaseController {
      */
     @PostMapping("/updateBooking")
     public AjaxResult updateBooking(@RequestBody BookingVO vo ) {
-        if(vo.getId()==null || CollectionUtil.isEmpty(vo.getUserList())){
+        if(vo.getId()==null || CollectionUtil.isEmpty(vo.getMediatorList())){
             return error("参数校验失败");
         }
         return caseApplicationService.updateBooking(vo);
@@ -218,7 +254,7 @@ public class MsCaseApplicationController extends BaseController {
      */
     @PostMapping("/mediation")
     public AjaxResult mediation(@RequestBody MsCaseApplicationReq req)   {
-        if (req.getCaseFlowId() == null || (req.getId() == null && StrUtil.isEmpty(req.getBatchNumber()))) {
+        if (req.getCaseFlowId() == null || req.getId() == null) {
             return error("参数校验失败");
         }