查询用户/机构信息功能

src/main/java/com/abcsz/litigationcase/controller/LawFirmController.java

@@ -1,14 +1,17 @@
 package com.abcsz.litigationcase.controller;
 
 
+import com.abcsz.litigationcase.domain.ro.LawFirmQueryRo;
 import com.abcsz.litigationcase.domain.ro.LawFirmRo;
 import com.abcsz.litigationcase.domain.ro.UserQueryRo;
 import com.abcsz.litigationcase.domain.ro.UserRo;
+import com.abcsz.litigationcase.domain.vo.LawFirmQueryVo;
 import com.abcsz.litigationcase.domain.vo.PublicVo;
 import com.abcsz.litigationcase.domain.vo.UseQueryVo;
 import com.abcsz.litigationcase.service.LawFirmService;
 import com.abcsz.litigationcase.service.UserService;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,15 +34,15 @@ public class LawFirmController {
     @Autowired
     private LawFirmService lawFirmService;
 
-//    @ApiOperation("事务所信息查询")
-//    @PostMapping("/query")
-//    public UseQueryVo query(@RequestBody @Validated LawFirmRo ro) throws Exception {
-//
-//        UseQueryVo vo = lawFirmService.lawFirmUpdate(ro);
-//        return vo;
-//    }
+    @ApiOperation("查询事务所信息")
+    @PostMapping("/query")
+    public LawFirmQueryVo query(@RequestBody @Validated LawFirmQueryRo ro) {
 
-    @ApiOperation("事务所信息新增")
+        LawFirmQueryVo vo = lawFirmService.lawFirmQuery(ro);
+        return vo;
+    }
+
+    @ApiOperation("新增事务所信息")
     @PostMapping("/insert")
     public PublicVo insert(@RequestBody @Validated LawFirmRo ro)  {
 
@@ -48,7 +51,7 @@ public class LawFirmController {
     }
 
 
-    @ApiOperation("事务所信息修改")
+    @ApiOperation("修改事务所信息")
     @PostMapping("/modify")
     public PublicVo modify(@RequestBody @Validated LawFirmRo ro)  {
 

src/main/java/com/abcsz/litigationcase/domain/ro/LawFirmQueryRo.java

@@ -0,0 +1,16 @@
+package com.abcsz.litigationcase.domain.ro;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author shengqianlei
+ */
+@Data
+@ApiModel(value = "查询事务所输入对象",description = "查询律师事务所的相关信息")
+public class LawFirmQueryRo {
+    @ApiModelProperty(value = "事务所编码")
+    private String lawFirmCode;
+
+}

src/main/java/com/abcsz/litigationcase/domain/ro/LawFirmRo.java

@@ -1,12 +1,13 @@
 package com.abcsz.litigationcase.domain.ro;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
-
 @Data
+@ApiModel(value = "新增/修改律师事务所输入对象",description = "输入关于律师事务所的信息，用来新增或者修改")
 public class LawFirmRo {
 
     @ApiModelProperty(value = "事务所名称")

src/main/java/com/abcsz/litigationcase/domain/ro/UserQueryRo.java

@@ -1,14 +1,20 @@
 package com.abcsz.litigationcase.domain.ro;
 
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel(value = "查询用户输入对象",description = "查询用户的相关信息")
 public class UserQueryRo {
 
+    @ApiModelProperty(value = "用户身份证信息")
     private String userIdentity;
 
+    @ApiModelProperty(value = "银行信息")
     private Integer bankId;
 
+    @ApiModelProperty(value = "律师事务所id")
     private String lawFirmId;
 }

src/main/java/com/abcsz/litigationcase/domain/ro/UserRo.java

@@ -1,11 +1,13 @@
 package com.abcsz.litigationcase.domain.ro;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
 @Data
+@ApiModel(value = "新增/修改用户输入对象",description = "输入用户的相关信息，用来新增或者修改当前用户")
 public class UserRo {
     @ApiModelProperty(value = "用户账号")
     @NotNull(message = "用户账号不能为空")

src/main/java/com/abcsz/litigationcase/domain/vo/LawFirmQueryVo.java

@@ -0,0 +1,16 @@
+package com.abcsz.litigationcase.domain.vo;
+
+import com.abcsz.litigationcase.dao.entity.LawFirmEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author shengqianlei
+ */
+@Data
+@ApiModel(value = "查询事务所输出对象",description = "返回所查询事务所的信息")
+public class LawFirmQueryVo extends PublicVo{
+    private List<LawFirmEntity> data;
+}

src/main/java/com/abcsz/litigationcase/domain/vo/UseQueryVo.java

@@ -1,11 +1,13 @@
 package com.abcsz.litigationcase.domain.vo;
 
 import com.abcsz.litigationcase.dao.entity.UserEntity;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@ApiModel(value = "查询用户输出对象",description = "返回的所查询用户的信息")
 public class UseQueryVo  extends PublicVo{
     private List<UserEntity> data;
 }

src/main/java/com/abcsz/litigationcase/service/LawFirmService.java

@@ -1,7 +1,9 @@
 package com.abcsz.litigationcase.service;
 
 import com.abcsz.litigationcase.dao.entity.LawFirmEntity;
+import com.abcsz.litigationcase.domain.ro.LawFirmQueryRo;
 import com.abcsz.litigationcase.domain.ro.LawFirmRo;
+import com.abcsz.litigationcase.domain.vo.LawFirmQueryVo;
 import com.abcsz.litigationcase.domain.vo.PublicVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,6 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface LawFirmService extends IService<LawFirmEntity> {
 
+    LawFirmQueryVo lawFirmQuery(LawFirmQueryRo ro);
+
     PublicVo lawFirmInsert(LawFirmRo ro);
 
     PublicVo lawFirmModify(LawFirmRo ro);

src/main/java/com/abcsz/litigationcase/service/impl/LawFirmServiceIml.java

@@ -3,7 +3,9 @@ package com.abcsz.litigationcase.service.impl;
 import com.abcsz.litigationcase.dao.entity.LawFirmEntity;
 import com.abcsz.litigationcase.dao.entity.UserEntity;
 import com.abcsz.litigationcase.dao.mapper.LawFirmMapper;
+import com.abcsz.litigationcase.domain.ro.LawFirmQueryRo;
 import com.abcsz.litigationcase.domain.ro.LawFirmRo;
+import com.abcsz.litigationcase.domain.vo.LawFirmQueryVo;
 import com.abcsz.litigationcase.domain.vo.PublicVo;
 import com.abcsz.litigationcase.service.LawFirmService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -30,6 +33,50 @@ public class LawFirmServiceIml extends ServiceImpl<LawFirmMapper, LawFirmEntity>
     private LawFirmMapper lawFirmMapper;
 
 
+    @Override
+    public LawFirmQueryVo lawFirmQuery(LawFirmQueryRo ro) {
+        log.info("查询用户信息...");
+        LawFirmQueryVo lawFirmQueryVo = new LawFirmQueryVo();
+        List<LawFirmEntity> lawFirmEntities = null;
+        try {
+            if (ro.getLawFirmCode() == null) {
+                QueryWrapper<LawFirmEntity> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("del_flag", 0);
+                lawFirmEntities = lawFirmMapper.selectList(queryWrapper);
+            }
+            if(ro.getLawFirmCode()!=null){
+                QueryWrapper<LawFirmEntity> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("law_firm_code",ro.getLawFirmCode());
+                queryWrapper1.eq("del_flag", 0);
+                lawFirmEntities = lawFirmMapper.selectList(queryWrapper1);
+            }
+
+            if (lawFirmEntities == null) {
+                lawFirmQueryVo.setRetCode("S001");
+                lawFirmQueryVo.setRetMsg("查询异常，请重新操作");
+                log.info(lawFirmQueryVo.getRetCode() + "****" + lawFirmQueryVo.getRetMsg());
+                return lawFirmQueryVo;
+            }
+            if (lawFirmEntities.size() == 0) {
+                lawFirmQueryVo.setRetCode("0000");
+                lawFirmQueryVo.setRetMsg("查询成功，无相关信息");
+                log.info(lawFirmQueryVo.getRetCode() + "****" + lawFirmQueryVo.getRetMsg());
+                return lawFirmQueryVo;
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage() + "****" + e.getStackTrace());
+            lawFirmQueryVo.setRetCode("X001");
+            lawFirmQueryVo.setRetMsg("系统异常");
+            log.error(lawFirmQueryVo.getRetCode() + "****" + lawFirmQueryVo.getRetMsg());
+            return lawFirmQueryVo;
+        }
+        lawFirmQueryVo.setRetCode("0000");
+        lawFirmQueryVo.setRetMsg("查询成功");
+        lawFirmQueryVo.setData(lawFirmEntities);
+        log.info(lawFirmQueryVo.getRetCode() + "****" + lawFirmQueryVo.getRetMsg());
+        return lawFirmQueryVo;
+    }
+
     @Override
     public PublicVo lawFirmInsert(LawFirmRo ro) {
         log.info("新增机构信息...");

src/main/java/com/abcsz/litigationcase/service/impl/UserServiceIml.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -28,12 +29,75 @@ import java.util.Date;
 public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implements UserService {
 
     @Autowired
-    private  UserMapper userMapper;
+    private UserMapper userMapper;
 
 
     @Override
     public UseQueryVo userQuery(UserQueryRo ro) {
-        return null;
+        log.info("查询用户信息...");
+        UseQueryVo useQueryVo = new UseQueryVo();
+        List<UserEntity> userEntities = null;
+        try {
+            if (ro.getBankId() != null && ro.getLawFirmId() != null) {
+                useQueryVo.setRetCode("Y001");
+                useQueryVo.setRetMsg("银行信息和事务所信息不可同时输入");
+                log.info(useQueryVo.getRetCode() + "****" + useQueryVo.getRetMsg());
+                return useQueryVo;
+            }
+
+            /* 无输入 */
+            if (ro.getUserIdentity() == null && ro.getBankId() == null && ro.getLawFirmId() == null) {
+                log.info("查询所有的用户信息...");
+                QueryWrapper<UserEntity> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("del_flag", 0);
+                userEntities = userMapper.selectList(queryWrapper);
+            }
+            /* 输入身份证信息*/
+            if (ro.getUserIdentity() != null) {
+                QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("user_identity", ro.getUserIdentity());
+                queryWrapper1.eq("del_flag", 0);
+                userEntities = userMapper.selectList(queryWrapper1);
+            }
+            /* 只输入银行信息 */
+            if (ro.getBankId() != null && ro.getUserIdentity() == null && ro.getLawFirmId() == null) {
+                QueryWrapper<UserEntity> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("bank_id", ro.getBankId());
+                queryWrapper2.eq("del_flag", 0);
+                userEntities = userMapper.selectList(queryWrapper2);
+            }
+            /* 只输入律师事务所信息 */
+            if (ro.getLawFirmId() != null && ro.getUserIdentity() == null && ro.getBankId() == null) {
+                QueryWrapper<UserEntity> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("law_firm_id", ro.getLawFirmId());
+                queryWrapper2.eq("del_flag", 0);
+                userEntities = userMapper.selectList(queryWrapper2);
+            }
+
+            if (userEntities == null) {
+                useQueryVo.setRetCode("S001");
+                useQueryVo.setRetMsg("查询异常，请重新操作");
+                log.info(useQueryVo.getRetCode() + "****" + useQueryVo.getRetMsg());
+                return useQueryVo;
+            }
+            if (userEntities.size() == 0) {
+                useQueryVo.setRetCode("0000");
+                useQueryVo.setRetMsg("查询成功，无相关信息");
+                log.info(useQueryVo.getRetCode() + "****" + useQueryVo.getRetMsg());
+                return useQueryVo;
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage() + "****" + e.getStackTrace());
+            useQueryVo.setRetCode("X001");
+            useQueryVo.setRetMsg("系统异常");
+            log.error(useQueryVo.getRetCode() + "****" + useQueryVo.getRetMsg());
+            return useQueryVo;
+        }
+        useQueryVo.setRetCode("0000");
+        useQueryVo.setRetMsg("查询成功");
+        useQueryVo.setData(userEntities);
+        log.info(useQueryVo.getRetCode() + "****" + useQueryVo.getRetMsg());
+        return useQueryVo;
     }
 
     @Override
@@ -41,28 +105,27 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
         log.info("新增用户信息....");
         PublicVo publicVo = new PublicVo();
 
-        try
-        {
+        try {
             /* 查询该用户是否已经存在 */
             QueryWrapper<UserEntity> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_identity",ro.getUserIdentity());
+            queryWrapper.eq("user_identity", ro.getUserIdentity());
             queryWrapper.eq("del_flag", 0);
             UserEntity userEntity = userMapper.selectOne(queryWrapper);
-            if(userEntity !=null){
+            if (userEntity != null) {
                 publicVo.setRetCode("Y001");
                 publicVo.setRetMsg("该用户已存在，请勿重复操作");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
 
-            if(ro.getIsAbc()==0 && ro.getBankId() == null){
+            if (ro.getIsAbc() == 0 && ro.getBankId() == null) {
                 publicVo.setRetCode("Y002");
                 publicVo.setRetMsg("行内人员请输入所属银行信息");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
 
-            if(ro.getIsAbc()==1 && ro.getLawFirmId() ==null){
+            if (ro.getIsAbc() == 1 && ro.getLawFirmId() == null) {
                 publicVo.setRetCode("Y003");
                 publicVo.setRetMsg("行外人员请输入所属事务所信息");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
@@ -86,7 +149,7 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
             userEntity1.setTxtHold2(ro.getTxtHold2());
             userEntity1.setDelFlag(ro.getDelFlag());
             int count1 = userMapper.insert(userEntity1);
-            if(count1 != 1){
+            if (count1 != 1) {
                 publicVo.setRetCode("S001");
                 publicVo.setRetMsg("新增用户信息失败，请重新操作");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
@@ -94,7 +157,7 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
             }
 
         } catch (Exception e) {
-            log.error(e.getMessage() + "****" +e.getStackTrace());
+            log.error(e.getMessage() + "****" + e.getStackTrace());
             publicVo.setRetCode("X001");
             publicVo.setRetMsg("系统异常");
             log.error(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
@@ -124,14 +187,14 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
                 return publicVo;
             }
 
-            if(ro.getIsAbc()==0 && ro.getBankId() == null){
+            if (ro.getIsAbc() == 0 && ro.getBankId() == null) {
                 publicVo.setRetCode("Y002");
                 publicVo.setRetMsg("行内人员请输入所属银行信息");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
 
-            if(ro.getIsAbc()==1 && ro.getLawFirmId() ==null){
+            if (ro.getIsAbc() == 1 && ro.getLawFirmId() == null) {
                 publicVo.setRetCode("Y003");
                 publicVo.setRetMsg("行外人员请输入所属事务所信息");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
@@ -157,17 +220,16 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
             QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("user_identity", ro.getUserIdentity());
             queryWrapper1.eq("del_flag", 0);
-            int count1 = userMapper.update(userEntity1,queryWrapper1);
-            if(count1 != 1){
+            int count1 = userMapper.update(userEntity1, queryWrapper1);
+            if (count1 != 1) {
                 publicVo.setRetCode("S001");
                 publicVo.setRetMsg("修改用户信息失败，请重新操作");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
 
-        }
-        catch (Exception e){
-            log.error(e.getMessage() + "****" +e.getStackTrace());
+        } catch (Exception e) {
+            log.error(e.getMessage() + "****" + e.getStackTrace());
             publicVo.setRetCode("X001");
             publicVo.setRetMsg("系统异常");
             log.error(publicVo.getRetCode() + "****" + publicVo.getRetMsg());