From b0b77110b22827d453e9a1580906b3f53add19f9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 25 八月 2023 17:50:48 +0800
Subject: [PATCH] 开发8-25人员管理剩余编辑功能
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java | 10 +--
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java | 2
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java | 4 -
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Organizational.java | 3
standard-server/src/main/resources/mapper/OrganizationalMapper.xml | 11 +++
standard-server/src/main/resources/mapper/ProductMapper.xml | 1
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 8 --
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 7 ++
standard-server/src/main/resources/mapper/MaterialMapper.xml | 11 ++-
sys/src/main/resources/application-dev.yml | 9 ++-
user-server/src/main/resources/mapper/UserMapper.xml | 23 +++++--
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java | 7 +
standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java | 2
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java | 4 +
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 30 +++++-----
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 15 ++--
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 8 +-
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java | 11 +--
18 files changed, 95 insertions(+), 71 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java
index 83ea0de..db89721 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java
@@ -45,7 +45,6 @@
})
@GetMapping("/table")
public Result<?> getDepartmentListTable(Integer departmentId) {
- MyUtil.PrintLog(departmentId.toString());
List<Map<String, Object>> departmentListTable = organizationalService.getDepartmentListTable(departmentId);
return Result.success(departmentListTable);
}
@@ -72,11 +71,8 @@
@ApiOperation(value = "鍒犻櫎閮ㄩ棬")
@DeleteMapping("/delete")
- public Result<?> deleteDepartment(Integer id) {
- Integer deleteDepartment = organizationalService.deleteDepartment(id);
- if (deleteDepartment >= 1){
- return Result.success("鍒犻櫎鎴愬姛锛�");
- }
- return Result.fail("鍒犻櫎澶辫触锛�");
+ public Result<?> deleteDepartment(String ids) {
+ organizationalService.deleteDepartment(ids);
+ return Result.success("鍒犻櫎鎴愬姛锛�");
}
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java
index 58a8be5..5198b03 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java
@@ -19,4 +19,6 @@
List<Map<String, Object>> OrganizationalTree(Integer father_id);
List<Map<String, Object>> getDepartmentListTable(Integer departmentId);
+
+ void deleteDepartment(String ids);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Organizational.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Organizational.java
index f55104c..0c3425b 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Organizational.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Organizational.java
@@ -16,6 +16,7 @@
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
* <p>
@@ -41,7 +42,7 @@
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О", example = "寮�鍙戦儴", required = true)
private String department;
- @NotBlank(message = "璇烽�夋嫨涓婄骇閮ㄩ棬锛�")
+ @NotNull(message = "璇烽�夋嫨涓婄骇閮ㄩ棬锛�")
@ApiModelProperty(value = "涓婄骇閮ㄩ棬ID", example = "1", required = true)
private Integer fatherId;
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java
index 2e7ec39..8854972 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java
@@ -22,7 +22,7 @@
Integer updateDepartment(Integer id, Organizational organizational);
- Integer deleteDepartment(Integer id);
+ void deleteDepartment(String ids);
List<Map<String, Object>> getDepartmentListTable(Integer departmentId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
index 3b5fffe..b694c53 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
@@ -40,8 +40,8 @@
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> mapData = new ArrayList<>();
map.put("children", mapList);
- map.put("id", 0);
- map.put("department", firstEnterpriseName);
+ map.put("value", 0);
+ map.put("label", firstEnterpriseName);
mapData.add(map);
return mapData;
}
@@ -59,11 +59,8 @@
}
@Override
- public Integer deleteDepartment(Integer id) {
- LambdaUpdateWrapper<Organizational> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(Organizational::getId, id);
- updateWrapper.set(Organizational::getState, 0);
- return organizationalMapper.update(new Organizational(), updateWrapper);
+ public void deleteDepartment(String ids) {
+ organizationalMapper.deleteDepartment(ids);
}
@Override
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index e879a4e..1d1cfe7 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -54,13 +54,14 @@
<select id="FourTree" resultMap="OneLevelTreeMap">
SELECT m.`type`, m.`id` materialId, m.`name` materialName, s.id standardId, s.name standardName,
- f.id specificationsId, f.name specificationsName
+ f.id specificationsId, f.name specificationsName
FROM material m
- LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s
- ON s.material_id = m.`id`
- LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1) f
- ON f.standard_id = s.id
+ LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s
+ ON s.material_id = m.`id`
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id`, f.`create_time` FROM specifications f WHERE f.`state` = 1) f
+ ON f.standard_id = s.id
WHERE m.`state` = 1
+ ORDER BY f.create_time DESC
</select>
</mapper>
diff --git a/standard-server/src/main/resources/mapper/OrganizationalMapper.xml b/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
index e0ab681..5fee3e9 100644
--- a/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
+++ b/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
@@ -9,7 +9,10 @@
</resultMap>
<select id="OrganizationalTree" resultMap="OrganizationalMap">
- SELECT o.id, o.`department` FROM organizational o where o.`father_id` = #{father_id}
+ SELECT o.id, o.`department`
+ FROM organizational o
+ where o.`father_id` = #{father_id}
+ and o.state = 1
</select>
<select id="getDepartmentListTable" resultType="map">
@@ -18,4 +21,10 @@
WHERE o.`father_id` = #{departmentId}
AND o.`state` = 1
</select>
+
+ <select id="deleteDepartment">
+ update lims_laboratory.organizational
+ set state=0
+ where id in (${ids})
+ </select>
</mapper>
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 1014cc6..05c4e11 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -35,6 +35,7 @@
from lims_laboratory.product
where state = 1
and specifications_id = #{specificationsId}
+ ORDER BY product.`create_time` DESC
</select>
<select id="deleteList">
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 46a07a9..9e919d2 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -40,8 +40,10 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: user
+# url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# username: user
+ url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ username: root
password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
@@ -65,7 +67,8 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.110.209
+# host: 192.168.110.209
+ host: localhost
# redis绔彛锛堥粯璁や负6379锛�
port: 6380
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index 9efad92..591a8d9 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -4,18 +4,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.clients.UserLoginUtils;
-import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.utils.SpringUtil;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.Result;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import io.swagger.annotations.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -135,10 +133,11 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "name", value = "浜哄憳鍚嶇О", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "name", value = "浜哄憳鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "status", value = "鍦ㄨ亴鐘舵��", dataTypeClass = Integer.class)
})
- public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name) {
- IPage<PagePersonnelVo> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize));
+ public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name, Integer status) {
+ IPage<PagePersonnelVo> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
Map<String, Object> map = new HashMap<>();
map.put("row", PageList.getRecords());
map.put("total", PageList.getTotal());
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index add3f16..357dc53 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -4,14 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
+import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
-import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -24,7 +20,7 @@
public interface UserMapper extends BaseMapper<User> {
Map<String, String> selectUserByUserId(int userId);
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+ IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status);
List<Map<String,Object>> selectUser();
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index 4a972a5..f434599 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -78,6 +78,13 @@
@ApiModelProperty(value = "鍏宠仈 浼佷笟id")
private Integer enterpriseId;
+ @ApiModelProperty(value = "缁勭粐鏋舵瀯Id", example = "2")
+ private Integer organizationId;
+
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
+ private Integer state;
+
public User(String account, String name, String phone, String email, String info) {
this.account = account;
this.name = name;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
similarity index 85%
rename from user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
index 095138e..eef9229 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/NewPersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
@@ -1,4 +1,4 @@
-package com.yuanchu.limslaboratory.vo;
+package com.yuanchu.limslaboratory.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
@@ -18,7 +18,7 @@
private String account;
@ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺", example = "1", required = true)
- private Integer role_id;
+ private Integer roleId;
@ApiModelProperty(value = "骞撮緞", example = "23")
private Integer age;
@@ -31,4 +31,7 @@
@ApiModelProperty(value = "閭", example = "12345678@qq.com")
private String email;
+
+ @ApiModelProperty(value = "缁勭粐鏋舵瀯Id", example = "2")
+ private Integer organizationId;
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/PagePersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java
similarity index 93%
rename from user-server/src/main/java/com/yuanchu/limslaboratory/vo/PagePersonnelVo.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java
index ec6866e..5e92b47 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/PagePersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java
@@ -1,4 +1,4 @@
-package com.yuanchu.limslaboratory.vo;
+package com.yuanchu.limslaboratory.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -36,4 +36,6 @@
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0", example = "0")
private Integer jobState;
+
+ private String department;
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdatePersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
similarity index 96%
rename from user-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdatePersonnelVo.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
index 2c6c05a..954d9f4 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdatePersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
@@ -1,4 +1,4 @@
-package com.yuanchu.limslaboratory.vo;
+package com.yuanchu.limslaboratory.pojo.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +36,4 @@
@ApiModelProperty(value = "璐﹀彿瀵嗙爜", example = "654321")
private String password;
-
-
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index 29107b5..6eb8904 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import java.util.List;
import java.util.Map;
@@ -50,7 +50,7 @@
* @param page
* @return
*/
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+ IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status);
/**
* 鐧诲綍鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅涓庣郴缁熻秴鏃舵椂闂存彁閱�
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index b3013e4..794b6ab 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -8,10 +8,12 @@
import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -101,16 +103,13 @@
@Override
public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
- User user = new User()
- .setName(newPersonnelVo.getName())
- .setAccount(newPersonnelVo.getAccount())
- .setAge(String.valueOf(newPersonnelVo.getAge()))
- .setPhone(newPersonnelVo.getPhone())
- .setEmail(newPersonnelVo.getEmail())
- .setRoleId(newPersonnelVo.getRole_id())
- .setPassword(newPersonnelVo.getPassword())
- .setEnterpriseId(Integer.valueOf(enterpriseId));
- return userMapper.insert(user);
+ try {
+ User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(newPersonnelVo), User.class);
+ unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
+ return userMapper.insert(unmarshal);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
@Override
@@ -130,7 +129,8 @@
}
@Override
- public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page) {
- return userMapper.getNewPersonnelPage(name, page);
+ public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status) {
+ MyUtil.PrintLog(name + status + "=============");
+ return userMapper.getNewPersonnelPage(name, page, status);
}
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 8220b5a..98d4d25 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -17,7 +17,7 @@
AND u.id = #{userId}
</select>
- <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.vo.PagePersonnelVo">
+ <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo">
<result property="id" column="id"/>
<result property="username" column="username"/>
<result property="roleName" column="roleName"/>
@@ -26,15 +26,24 @@
<result property="phone" column="phone"/>
<result property="email" column="email"/>
<result property="jobState" column="job_state"/>
+ <result property="department" column="department"/>
</resultMap>
<select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
- SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, IFNULL(u.`age`, '---') age,
- IFNULL(u.`phone`, '---') phone, IFNULL(u.`email`, '---') email, u.`job_state`
- FROM `user` u, role r
- WHERE u.`role_id` = r.`id`
- <if test="name != null and name!=''">
- AND u.name = #{name}
+ SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, u.`age`,
+ u.`phone`, u.`email`, u.`job_state`, o.`department`
+ FROM `user` u
+ LEFT JOIN role r
+ ON u.`role_id` = r.`id` AND r.`state` = 1
+ LEFT JOIN organizational o
+ ON u.`organization_id` = o.`id` AND o.`state` = 1
+ WHERE u.`state` = 1
+ <if test="name != null and name != ''">
+ AND u.`name` LIKE CONCAT('%',#{name}, '%')
</if>
+ <if test="status != null">
+ AND u.`job_state` in (#{status})
+ </if>
+ ORDER BY u.`create_time` DESC
</select>
<select id="selectUser" resultType="Map">
--
Gitblit v1.9.3