Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
d8384bbe 由 张雷
选项

修改厂站人员接口

1 个父辈 131938af
内嵌 并排
正在显示 6 个修改的文件 包含 106 行增加 和 17 行删除
sk-module-system/src/main/java/com/skua/modules/system/controller/SysFactoryUserInfoController.java
...@@ -11,6 +11,8 @@ import java.util.Map; ...@@ -11,6 +11,8 @@ import java.util.Map;
11 import javax.servlet.http.HttpServletRequest; 11 import javax.servlet.http.HttpServletRequest;
12 import javax.servlet.http.HttpServletResponse; 12 import javax.servlet.http.HttpServletResponse;
13 13
14 import com.skua.modules.system.entity.SysUser;
15 import com.skua.modules.system.service.ISysUserService;
14 import org.apache.commons.lang.StringUtils; 16 import org.apache.commons.lang.StringUtils;
15 import org.jeecgframework.poi.excel.ExcelImportUtil; 17 import org.jeecgframework.poi.excel.ExcelImportUtil;
16 import org.jeecgframework.poi.excel.def.NormalExcelConstants; 18 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
...@@ -63,6 +65,8 @@ public class SysFactoryUserInfoController { ...@@ -63,6 +65,8 @@ public class SysFactoryUserInfoController {
63 @Autowired 65 @Autowired
64 private ISysFactoryUserInfoService sysFactoryUserInfoService; 66 private ISysFactoryUserInfoService sysFactoryUserInfoService;
65 @Autowired 67 @Autowired
68 private ISysUserService sysUserService;
69 @Autowired
66 private ISequenceService sequenceService; 70 private ISequenceService sequenceService;
67 /** 71 /**
68 * 分页列表查询 72 * 分页列表查询
...@@ -80,15 +84,16 @@ public class SysFactoryUserInfoController { ...@@ -80,15 +84,16 @@ public class SysFactoryUserInfoController {
80 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 84 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
81 HttpServletRequest req) { 85 HttpServletRequest req) {
82 Result<IPage<SysFactoryUserInfo>> result = new Result<IPage<SysFactoryUserInfo>>(); 86 Result<IPage<SysFactoryUserInfo>> result = new Result<IPage<SysFactoryUserInfo>>();
83 QueryWrapper<SysFactoryUserInfo> queryWrapper = QueryGenerator.initQueryWrapper(sysFactoryUserInfo, req.getParameterMap());
84 String departIds = BaseContextHandler.getDeparts();
85 String[] departIdArray = departIds.split(",");
86 if(StringUtils.isEmpty(sysFactoryUserInfo.getDepartId())&&StringUtils.isNotBlank(departIds)) {
87 queryWrapper.in("depart_id", departIdArray);
88 }
89 queryWrapper.eq(StringUtils.isNotEmpty(sysFactoryUserInfo.getDepartId()),"depart_id",sysFactoryUserInfo.getDepartId());
90 Page<SysFactoryUserInfo> page = new Page<SysFactoryUserInfo>(pageNo, pageSize); 87 Page<SysFactoryUserInfo> page = new Page<SysFactoryUserInfo>(pageNo, pageSize);
91 IPage<SysFactoryUserInfo> pageList = sysFactoryUserInfoService.page(page, queryWrapper); 88 // QueryWrapper<SysFactoryUserInfo> queryWrapper = QueryGenerator.initQueryWrapper(sysFactoryUserInfo, req.getParameterMap());
89 // String departIds = BaseContextHandler.getDeparts();
90 // String[] departIdArray = departIds.split(",");
91 // if(StringUtils.isEmpty(sysFactoryUserInfo.getDepartId())&&StringUtils.isNotBlank(departIds)) {
92 // queryWrapper.in("depart_id", departIdArray);
93 // }
94 // queryWrapper.eq(StringUtils.isNotEmpty(sysFactoryUserInfo.getDepartId()),"depart_id",sysFactoryUserInfo.getDepartId());
95 // IPage<SysFactoryUserInfo> pageList = sysFactoryUserInfoService.page(page, queryWrapper);
96 IPage<SysFactoryUserInfo> pageList = sysFactoryUserInfoService.getPage(page, sysFactoryUserInfo);
92 result.setSuccess(true); 97 result.setSuccess(true);
93 result.setResult(pageList); 98 result.setResult(pageList);
94 return result; 99 return result;
...@@ -101,14 +106,14 @@ public class SysFactoryUserInfoController { ...@@ -101,14 +106,14 @@ public class SysFactoryUserInfoController {
101 Result<Map<String,Object>> result = new Result<Map<String,Object>>(); 106 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
102 Map<String,Object> map = new HashMap<>(); 107 Map<String,Object> map = new HashMap<>();
103 int female = 0;int male = 0; 108 int female = 0;int male = 0;
104 QueryWrapper<SysFactoryUserInfo> queryWrapper = new QueryWrapper<>(); 109 // QueryWrapper<SysFactoryUserInfo> queryWrapper = new QueryWrapper<>();
105 String departIds = BaseContextHandler.getDeparts(); 110 // String departIds = BaseContextHandler.getDeparts();
106 String[] departIdArray = departIds.split(","); 111 // String[] departIdArray = departIds.split(",");
107 if(StringUtils.isEmpty(sysFactoryUserInfo.getDepartId())&&StringUtils.isNotBlank(departIds)) { 112 // if(StringUtils.isEmpty(sysFactoryUserInfo.getDepartId())&&StringUtils.isNotBlank(departIds)) {
108 queryWrapper.in("depart_id", departIdArray); 113 // queryWrapper.in("depart_id", departIdArray);
109 } 114 // }
110 queryWrapper.eq(StringUtils.isNotEmpty(sysFactoryUserInfo.getDepartId()),"depart_id",sysFactoryUserInfo.getDepartId()); 115 // queryWrapper.eq(StringUtils.isNotEmpty(sysFactoryUserInfo.getDepartId()),"depart_id",sysFactoryUserInfo.getDepartId());
111 List<SysFactoryUserInfo> list = sysFactoryUserInfoService.list(queryWrapper); 116 List<SysFactoryUserInfo> list = sysFactoryUserInfoService.getList(sysFactoryUserInfo);
112 if(list.size()>0){ 117 if(list.size()>0){
113 map.put("total", list.size()); 118 map.put("total", list.size());
114 for (SysFactoryUserInfo factoryUserInfo : list) { 119 for (SysFactoryUserInfo factoryUserInfo : list) {
...@@ -141,6 +146,15 @@ public class SysFactoryUserInfoController { ...@@ -141,6 +146,15 @@ public class SysFactoryUserInfoController {
141 public Result<SysFactoryUserInfo> add(@RequestBody SysFactoryUserInfo sysFactoryUserInfo) { 146 public Result<SysFactoryUserInfo> add(@RequestBody SysFactoryUserInfo sysFactoryUserInfo) {
142 Result<SysFactoryUserInfo> result = new Result<SysFactoryUserInfo>(); 147 Result<SysFactoryUserInfo> result = new Result<SysFactoryUserInfo>();
143 try { 148 try {
149 if(StringUtils.isNotEmpty(sysFactoryUserInfo.getUserId())){
150 SysUser user = sysUserService.getById(sysFactoryUserInfo.getUserId());
151 if(ConvertUtils.isNotEmpty(user)){
152 sysFactoryUserInfo.setUserName(user.getRealname());
153 sysFactoryUserInfo.setEmail(user.getEmail());
154 sysFactoryUserInfo.setTelephone(user.getPhone());
155 sysFactoryUserInfo.setSex(user.getSalt());
156 }
157 }
144 sysFactoryUserInfo.setId(String.valueOf(sequenceService.nextId())); 158 sysFactoryUserInfo.setId(String.valueOf(sequenceService.nextId()));
145 sysFactoryUserInfoService.save(sysFactoryUserInfo); 159 sysFactoryUserInfoService.save(sysFactoryUserInfo);
146 result.success("添加成功！"); 160 result.success("添加成功！");
...@@ -166,7 +180,6 @@ public class SysFactoryUserInfoController { ...@@ -166,7 +180,6 @@ public class SysFactoryUserInfoController {
166 result.error500("未找到对应实体"); 180 result.error500("未找到对应实体");
167 }else { 181 }else {
168 boolean ok = sysFactoryUserInfoService.updateById(sysFactoryUserInfo); 182 boolean ok = sysFactoryUserInfoService.updateById(sysFactoryUserInfo);
169 //TODO 返回false说明什么？
170 if(ok) { 183 if(ok) {
171 result.success("修改成功!"); 184 result.success("修改成功!");
172 } 185 }
......
sk-module-system/src/main/java/com/skua/modules/system/entity/SysFactoryUserInfo.java
1 package com.skua.modules.system.entity; 1 package com.skua.modules.system.entity;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField;
4 import com.baomidou.mybatisplus.annotation.TableId; 5 import com.baomidou.mybatisplus.annotation.TableId;
5 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
6 import com.skua.core.aspect.annotation.Dict; 7 import com.skua.core.aspect.annotation.Dict;
...@@ -43,6 +44,9 @@ public class SysFactoryUserInfo { ...@@ -43,6 +44,9 @@ public class SysFactoryUserInfo {
43 /**邮箱*/ 44 /**邮箱*/
44 @ApiModelProperty(value = "邮箱") 45 @ApiModelProperty(value = "邮箱")
45 private java.lang.String email; 46 private java.lang.String email;
47 /**工号*/
48 @ApiModelProperty(value = "工号")
49 private java.lang.String workNo;
46 /**学历*/ 50 /**学历*/
47 @ApiModelProperty(value = "学历") 51 @ApiModelProperty(value = "学历")
48 private java.lang.String degree; 52 private java.lang.String degree;
...@@ -74,4 +78,7 @@ public class SysFactoryUserInfo { ...@@ -74,4 +78,7 @@ public class SysFactoryUserInfo {
74 /**合同到期时间*/ 78 /**合同到期时间*/
75 @ApiModelProperty(value = "合同到期时间") 79 @ApiModelProperty(value = "合同到期时间")
76 private java.lang.String contractEnddate; 80 private java.lang.String contractEnddate;
81 /**角色*/
82 @TableField(exist = false)
83 private String roleName;
77 } 84 }
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/SysFactoryUserInfoMapper.java
...@@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
11 */ 11 */
12 public interface SysFactoryUserInfoMapper extends BaseMapper<SysFactoryUserInfo> { 12 public interface SysFactoryUserInfoMapper extends BaseMapper<SysFactoryUserInfo> {
13 13
14 List<SysFactoryUserInfo> getList(String departIds, String userName);
15
14 } 16 }
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysFactoryUserInfoMapper.xml
...@@ -2,4 +2,25 @@ ...@@ -2,4 +2,25 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.system.mapper.SysFactoryUserInfoMapper"> 3 <mapper namespace="com.skua.modules.system.mapper.SysFactoryUserInfoMapper">
4 4
5 <select id="getList" resultType="com.skua.modules.system.entity.SysFactoryUserInfo">
6 SELECT
7 group_concat( DISTINCT ( SELECT r.role_name FROM sys_role r WHERE r.id = sur.role_id ) ) role_name,
8 fu.*
9 FROM
10 sys_factory_user_info fu
11 LEFT JOIN sys_user_role sur ON fu.user_id = sur.user_id
12 where 1 = 1
13 <if test="departIds!=null and departIds!=''">
14 AND fu.depart_id in
15 <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
16 #{item}
17 </foreach>
18 </if>
19 <if test="userName!=null and userName!=''">
20 and fu.user_name like concat('%',#{userName},'%')
21 </if>
22 GROUP BY
23 fu.user_id
24 </select>
25
5 </mapper> 26 </mapper>
......
sk-module-system/src/main/java/com/skua/modules/system/service/ISysFactoryUserInfoService.java
1 package com.skua.modules.system.service; 1 package com.skua.modules.system.service;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.skua.modules.system.entity.SysFactoryUserInfo; 5 import com.skua.modules.system.entity.SysFactoryUserInfo;
4 import com.baomidou.mybatisplus.extension.service.IService; 6 import com.baomidou.mybatisplus.extension.service.IService;
7 import com.skua.modules.system.entity.SysUser;
8
9 import java.util.List;
5 10
6 /** 11 /**
7 * 厂站人员管理 12 * 厂站人员管理
8 */ 13 */
9 public interface ISysFactoryUserInfoService extends IService<SysFactoryUserInfo> { 14 public interface ISysFactoryUserInfoService extends IService<SysFactoryUserInfo> {
10 15
16 IPage<SysFactoryUserInfo> getPage(Page<SysFactoryUserInfo> page, SysFactoryUserInfo sysFactoryUserInfo);
17
18 List<SysFactoryUserInfo> getList(SysFactoryUserInfo sysFactoryUserInfo);
19
20 SysFactoryUserInfo saveOrUpdateByUser(SysUser sysUser);
11 } 21 }
......
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysFactoryUserInfoServiceImpl.java
1 package com.skua.modules.system.service.impl; 1 package com.skua.modules.system.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.skua.core.context.BaseContextHandler;
3 import com.skua.modules.system.entity.SysFactoryUserInfo; 6 import com.skua.modules.system.entity.SysFactoryUserInfo;
7 import com.skua.modules.system.entity.SysUser;
4 import com.skua.modules.system.mapper.SysFactoryUserInfoMapper; 8 import com.skua.modules.system.mapper.SysFactoryUserInfoMapper;
5 import com.skua.modules.system.service.ISysFactoryUserInfoService; 9 import com.skua.modules.system.service.ISysFactoryUserInfoService;
10 import org.apache.commons.lang3.StringUtils;
11 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
7 13
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 14 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9 15
16 import java.util.ArrayList;
17 import java.util.List;
18
10 /** 19 /**
11 * 厂站人员管理 20 * 厂站人员管理
12 */ 21 */
13 @Service 22 @Service
14 public class SysFactoryUserInfoServiceImpl extends ServiceImpl<SysFactoryUserInfoMapper, SysFactoryUserInfo> implements ISysFactoryUserInfoService { 23 public class SysFactoryUserInfoServiceImpl extends ServiceImpl<SysFactoryUserInfoMapper, SysFactoryUserInfo> implements ISysFactoryUserInfoService {
15 24
25 @Autowired
26 private SysFactoryUserInfoMapper sysFactoryUserInfoMapper;
27
28 @Override
29 public IPage<SysFactoryUserInfo> getPage(Page<SysFactoryUserInfo> page, SysFactoryUserInfo sysFactoryUserInfo) {
30 List<SysFactoryUserInfo> list = getList(sysFactoryUserInfo);
31 page.setTotal(list.size());
32 page.setRecords(list);
33 return page;
34 }
35
36 @Override
37 public List<SysFactoryUserInfo> getList(SysFactoryUserInfo sysFactoryUserInfo) {
38 List<SysFactoryUserInfo> list = new ArrayList<>();
39 String departIds = BaseContextHandler.getDeparts();
40 if(StringUtils.isNotEmpty(sysFactoryUserInfo.getDepartId())){
41 departIds = sysFactoryUserInfo.getDepartId();
42 }
43 list = sysFactoryUserInfoMapper.getList(departIds,sysFactoryUserInfo.getUserName());
44 return list;
45 }
46
47 @Override
48 public SysFactoryUserInfo saveOrUpdateByUser(SysUser sysUser) {
49 return null;
50 }
51
16 } 52 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!