From 4be2f81508b2e9dfb858ba082a4e1ae6e2a872a2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 20 Aug 2021 17:08:07 +0800
Subject: [PATCH] 派遣单位新增字段，工作汇报接收人接口修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 45e3873..9bb8712 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -17,7 +17,6 @@
package org.springblade.modules.system.controller;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -26,6 +25,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.json.JSONArray;
+import org.json.JSONObject;
import org.springblade.common.utils.InvestigateUtil;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -131,13 +132,27 @@
/**
+ * 自定义用户列表,
+ */
+ @GetMapping("/pages")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query) {
+ IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
+
+ /**
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security")
- public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> pageSecurity(@ApiIgnore UserVO user, Query query) {
user.setAccount("admin");
- IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
- return R.data(UserWrapper.build().pageVO(pages));
+ IPage<UserVO> pages = userService.selectUserPageSecurity(Condition.getPage(query), user);
+ return R.data(pages);
}
/**
@@ -150,26 +165,17 @@
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
//资格审查
- String data = InvestigateUtil.httpGet(user.getCardid());
- JSONObject jsonObject = JSONObject.parseObject(data);
- Object data1 = jsonObject.get("data");
- JSONObject jsonObject1 = JSONObject.parseObject(data1.toString());
- List<Map<String,Object>> res = (List<Map<String,Object>>)jsonObject1.get("res");
- if(res.size()>0) {
- int count = (int) res.stream().filter(map -> map.get("zdxsfzqkry") != null).count();
- res.forEach(map -> {
- if (null != map.get("zdxsfzqkry")) {
- user.setExaminationMx(map.get("zdxsfzqkry").toString());
- }
- });
- if (count > 0) {
- user.setExaminationType("1");
- } else {
- user.setExaminationType("0");
- }
- }else {
+ String body = InvestigateUtil.httpGet(user.getCardid());
+ JSONObject jsonObject = new JSONObject(body);
+ String data = jsonObject.get("data").toString();
+ JSONObject jsonData = new JSONObject(data);
+ JSONArray res = jsonData.getJSONArray("res");
+ if (res.length()==0){
//没有数据正常
user.setExaminationType("0");
+ }else {
+ user.setExaminationType("1");
+ user.setExaminationMx(res.getJSONObject(0).get("zdxsfzqkry").toString());
}
return R.status(userService.submit(user));
}
--
Gitblit v1.9.3