"src/main/resources/git@gitlab.ruzhoukj.com:wujipeng/ops.git" did not exist on "84dcb2ef131e7060505fb81a09f7f0c1bc68d94f"
Commit 89409cea authored by 朱翔's avatar 朱翔
Browse files

增加用户绩效接口

parent 951392fa
...@@ -19,4 +19,6 @@ public interface ReportDataInfoService extends IService<ReportDataInfoEntity> { ...@@ -19,4 +19,6 @@ public interface ReportDataInfoService extends IService<ReportDataInfoEntity> {
List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO); List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO);
void test(); void test();
boolean saveOrUpdateReportData(ReportDataInfoDTO reportDataInfoDTO);
} }
package com.ruzhoukj.sms.service; package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.DeptAndUserEntity; import com.ruzhoukj.sms.entity.UserPerformanceEntity;
import com.ruzhoukj.sms.model.dto.UserPerformanceDTO;
import com.ruzhoukj.sms.model.vo.UserPerformanceVO;
import java.util.List; import java.util.List;
...@@ -9,16 +11,10 @@ import java.util.List; ...@@ -9,16 +11,10 @@ import java.util.List;
* @Author:zhuxiang * @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service * @Package:com.ruzhoukj.sms.service
* @Project:OA * @Project:OA
* @name:DeptAndUserService * @name:UserPerformanceService
* @Date:2025/2/21 10:05 * @Date:2025/2/21 14:22
* @Filename:DeptAndUserService * @Filename:UserPerformanceService
*/ */
public interface DeptAndUserService extends IService<DeptAndUserEntity> { public interface UserPerformanceService extends IService<UserPerformanceEntity> {
List<UserPerformanceVO> queryList(UserPerformanceDTO userPerformanceDTO);
/**
*
* @param deptAndUserEntity deptAndUserEntity
* @return List<DeptAndUserEntity>
*/
List<DeptAndUserEntity> queryList(DeptAndUserEntity deptAndUserEntity);
} }
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.ProjectEntity; import com.ruzhoukj.sms.entity.ProjectEntity;
import com.ruzhoukj.sms.entity.UserEntity; import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.model.dto.UserDTO; import com.ruzhoukj.sms.model.dto.UserDTO;
import com.ruzhoukj.sms.model.dto.UserPerformanceDTO;
import com.ruzhoukj.sms.model.vo.UserVO; import com.ruzhoukj.sms.model.vo.UserVO;
import java.util.List; import java.util.List;
...@@ -49,4 +50,6 @@ public interface UserService extends IService<UserEntity> { ...@@ -49,4 +50,6 @@ public interface UserService extends IService<UserEntity> {
* @return UserVO * @return UserVO
*/ */
UserVO getUserInfo(String id); UserVO getUserInfo(String id);
List<UserVO> queryList(UserDTO userDTO);
} }
package com.ruzhoukj.sms.service.impl; package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.ruzhoukj.sms.common.Constant; import com.ruzhoukj.sms.common.Constant;
import com.ruzhoukj.sms.dao.DeptDao; import com.ruzhoukj.sms.dao.DeptDao;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import com.ruzhoukj.sms.entity.DeptEntity; import com.ruzhoukj.sms.entity.DeptEntity;
import com.ruzhoukj.sms.entity.UserEntity; import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.model.dto.DeptDTO; import com.ruzhoukj.sms.model.dto.DeptDTO;
import com.ruzhoukj.sms.model.dto.UserDTO;
import com.ruzhoukj.sms.model.vo.DeptVO; import com.ruzhoukj.sms.model.vo.DeptVO;
import com.ruzhoukj.sms.model.vo.UserVO; import com.ruzhoukj.sms.model.vo.UserVO;
import com.ruzhoukj.sms.service.DeptAndUserService;
import com.ruzhoukj.sms.service.DeptService; import com.ruzhoukj.sms.service.DeptService;
import com.ruzhoukj.sms.service.UserService; import com.ruzhoukj.sms.service.UserService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -33,8 +31,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements ...@@ -33,8 +31,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
@Resource @Resource
private UserService userService; private UserService userService;
@Resource
private DeptAndUserService deptAndUserService;
@Override @Override
public List<DeptVO> queryList(DeptDTO deptDTO) { public List<DeptVO> queryList(DeptDTO deptDTO) {
return baseMapper.queryList(deptDTO); return baseMapper.queryList(deptDTO);
...@@ -43,36 +39,22 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements ...@@ -43,36 +39,22 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateDept(DeptDTO deptDTO) { public boolean saveOrUpdateDept(DeptDTO deptDTO) {
if(deptDTO.getId()!=null){ return saveOrUpdate(deptDTO);
//删除当前部门人员
deptAndUserService.remove(new LambdaQueryWrapper<DeptAndUserEntity>().eq(DeptAndUserEntity::getDeptId,deptDTO.getId()));
updateById(deptDTO);
//保存部门人员
deptDTO.getDeptUserList().forEach(deptAndUserEntity -> deptAndUserEntity.setDeptId(deptDTO.getId()));
}else{
save(deptDTO);
//保存部门人员
deptDTO.getDeptUserList().forEach(deptAndUserEntity -> {
deptAndUserEntity.setDeptId(deptDTO.getId());
});
deptAndUserService.saveBatch(deptDTO.getDeptUserList());
}
return true;
} }
@Override @Override
public List<DeptAndUserEntity> getDeptUserList(DeptDTO deptDTO) { public List<UserVO> getDeptUserList(DeptDTO deptDTO) {
//查看当前登录用户信息 //查看当前登录用户信息
UserEntity user = userService.getById(deptDTO.getLoginUserId()); UserEntity user = userService.getById(deptDTO.getLoginUserId());
DeptAndUserEntity deptAndUserEntity = new DeptAndUserEntity(); UserDTO userDTO = new UserDTO();
if(user.getUserRole().equals(Constant.ADMIN)){ if(user.getUserRole().equals(Constant.ADMIN)){
//查询全部用户 //查询全部用户
return deptAndUserService.queryList(deptAndUserEntity); return userService.queryList(userDTO);
} }
if(user.getUserRole().equals(Constant.D_ADMIN)){ if(user.getUserRole().equals(Constant.D_ADMIN)){
//查看部门用户 //查看部门用户
deptAndUserEntity.setDeptId(deptDTO.getId()); userDTO.setDeptId(user.getDeptId());
return deptAndUserService.queryList(deptAndUserEntity); return userService.queryList(userDTO);
} }
return Lists.newArrayList(); return Lists.newArrayList();
} }
......
package com.ruzhoukj.sms.service.impl;
import com.platform.exception.BusinessException;
import com.ruzhoukj.sms.common.Constant;
import com.ruzhoukj.sms.service.FileService;
import com.ruzhoukj.sms.util.AliOSSUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl
* @Project:OA
* @name:FileServiceImpl
* @Date:2025/2/21 11:28
* @Filename:FileServiceImpl
*/
@Service
public class FileServiceImpl implements FileService {
@Resource
private AliOSSUtils aliOSSUtils;
@Override
public String upload(MultipartFile multipartFile) {
String url;
try {
url = aliOSSUtils.upload(multipartFile, Constant.DIR_OA);
} catch (IOException e) {
throw new BusinessException("上传文件失败");
}
return url;
}
}
...@@ -2,10 +2,8 @@ package com.ruzhoukj.sms.service.impl; ...@@ -2,10 +2,8 @@ package com.ruzhoukj.sms.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.utils.StringUtils; import com.ruzhoukj.sms.dao.ReportDataInfoDao;
import com.ruzhoukj.sms.dao.ReportDataInfoMapper;
import com.ruzhoukj.sms.entity.ReportDataInfoEntity; import com.ruzhoukj.sms.entity.ReportDataInfoEntity;
import com.ruzhoukj.sms.model.dto.ReportDataInfoDTO; import com.ruzhoukj.sms.model.dto.ReportDataInfoDTO;
import com.ruzhoukj.sms.model.vo.ReportDataInfoVO; import com.ruzhoukj.sms.model.vo.ReportDataInfoVO;
...@@ -23,7 +21,7 @@ import java.util.List; ...@@ -23,7 +21,7 @@ import java.util.List;
* @Filename:ReportDataInfoServiceImpl * @Filename:ReportDataInfoServiceImpl
*/ */
@Service @Service
public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoMapper, ReportDataInfoEntity> implements ReportDataInfoService { public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoDao, ReportDataInfoEntity> implements ReportDataInfoService {
@Override @Override
public List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO) { public List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO) {
return baseMapper.queryList(reportDataInfoDTO); return baseMapper.queryList(reportDataInfoDTO);
...@@ -49,4 +47,9 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoMapper, ...@@ -49,4 +47,9 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoMapper,
} }
} }
@Override
public boolean saveOrUpdateReportData(ReportDataInfoDTO reportDataInfoDTO) {
return saveOrUpdate(reportDataInfoDTO);
}
} }
package com.ruzhoukj.sms.service.impl; package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.sms.dao.DeptAndUserDao; import com.ruzhoukj.sms.dao.UserPerformanceDao;
import com.ruzhoukj.sms.entity.DeptAndUserEntity; import com.ruzhoukj.sms.entity.UserPerformanceEntity;
import com.ruzhoukj.sms.service.DeptAndUserService; import com.ruzhoukj.sms.model.dto.UserPerformanceDTO;
import com.ruzhoukj.sms.model.vo.UserPerformanceVO;
import com.ruzhoukj.sms.service.UserPerformanceService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -12,14 +14,14 @@ import java.util.List; ...@@ -12,14 +14,14 @@ import java.util.List;
* @Author:zhuxiang * @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl * @Package:com.ruzhoukj.sms.service.impl
* @Project:OA * @Project:OA
* @name:DeptAndUserServiceImpl * @name:UserPerformanceServiceImpl
* @Date:2025/2/21 10:05 * @Date:2025/2/21 14:22
* @Filename:DeptAndUserServiceImpl * @Filename:UserPerformanceServiceImpl
*/ */
@Service @Service
public class DeptAndUserServiceImpl extends ServiceImpl<DeptAndUserDao, DeptAndUserEntity> implements DeptAndUserService { public class UserPerformanceServiceImpl extends ServiceImpl<UserPerformanceDao, UserPerformanceEntity> implements UserPerformanceService {
@Override @Override
public List<DeptAndUserEntity> queryList(DeptAndUserEntity deptAndUserEntity) { public List<UserPerformanceVO> queryList(UserPerformanceDTO userPerformanceDTO) {
return baseMapper.queryList(deptAndUserEntity); return baseMapper.queryList(userPerformanceDTO);
} }
} }
...@@ -78,4 +78,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements ...@@ -78,4 +78,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userVO.setUserExtend(userExtend); userVO.setUserExtend(userExtend);
return userVO; return userVO;
} }
@Override
public List<UserVO> queryList(UserDTO userDTO) {
return baseMapper.queryList(userDTO);
}
} }
package com.ruzhoukj.sms.util;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
import java.util.UUID;
@Component
public class AliOSSUtils {
@Value("${oss.endPoint}")
private String endpoint;
@Value("${oss.key}")
private String accessKeyId;
@Value("${oss.secret}")
private String accessKeySecret;
@Value("${oss.bucket}")
private String bucketName;
/**
* 实现上传图片到OSS
*/
public String upload(MultipartFile multipartFile,String dir) throws IOException {
// 获取上传的文件的输入流
InputStream inputStream = multipartFile.getInputStream();
// 避免文件覆盖
String originalFilename = multipartFile.getOriginalFilename();
String fileName = dir +UUID.randomUUID().toString() + originalFilename.substring(originalFilename.lastIndexOf("."));
//上传文件到 OSS
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
ossClient.putObject(bucketName, fileName, inputStream);
Date expiration = new Date(System.currentTimeMillis() + 3600 * 596523);
String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
// 关闭ossClient
ossClient.shutdown();
// 把上传到oss的路径返回
return url;
}
/**
* 删除单个图片
*
* @param url
*/
public void deleteImg(String url) {
// 填写文件完整路径。文件完整路径中不能包含Bucket名称。(这里根据自己的地址改)
url = url.replace("http://"+bucketName+"."+endpoint+"/", "");
int index = url.indexOf("?");
url = url.substring(0, index);
// 创建OSSClient实例。
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
// 删除文件或目录。如果要删除目录,目录必须为空。
ossClient.deleteObject(bucketName, url);
// 关闭OSSClient。
ossClient.shutdown();
}
}
...@@ -25,4 +25,10 @@ pagehelper: ...@@ -25,4 +25,10 @@ pagehelper:
helperDialect: mysql helperDialect: mysql
reasonable: true reasonable: true
supportMethodsArguments: true supportMethodsArguments: true
params: count=countSql params: count=countSql
\ No newline at end of file
oss:
key: LTAI5tENboKK5bcuqHfPvEdr
secret: Q006EvMzC63i1ozDiVNxEAxo8eH9zA
endPoint: oss-cn-beijing.aliyuncs.com
bucket: manj
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.sms.dao.ReportDataInfoMapper"> <mapper namespace="com.ruzhoukj.sms.dao.ReportDataInfoDao">
<select id="queryList" resultType="com.ruzhoukj.sms.model.vo.ReportDataInfoVO"> <select id="queryList" resultType="com.ruzhoukj.sms.model.vo.ReportDataInfoVO">
select select
rdi.name name, r.id id,
u.name userName, r.user_id userId,
rdi.id id, r.template_id templateId,
rdi.user_id userId, r.content content,
rdi.year year, r.all_content allContent,
rdi.month month r.year year,
r.month month,
r.key_value keyValue,
u.name userName
from from
report_data_info rdi report_data_info r
left join user u on
rdi.user_id = u.id
left join left join
report_data_and_user rdau on user u
rdi.id = rdau.report_data_info_id on
where r.user_id = u.id
rdi.user_id = #{userId} <where>
or <if test="deptId != null and deptId != ''">
rdau.user_id = #{userId} r.dept_id = #{deptId}
</if>
<if test="userId != null and userId != ''">
r.user_id = #{userId}
</if>
</where>
</select> </select>
</mapper> </mapper>
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
SELECT SELECT
id, id,
name, name,
departments, second_dept as secondDept,
third_dept as thirdDept,
create_time as createTime, create_time as createTime,
email, email,
phone phone
...@@ -25,7 +26,8 @@ ...@@ -25,7 +26,8 @@
SELECT SELECT
id, id,
name, name,
departments, second_dept as secondDept,
third_dept as thirdDept,
create_time as createTime create_time as createTime
FROM user FROM user
WHERE name = #{name} WHERE name = #{name}
...@@ -54,4 +56,26 @@ ...@@ -54,4 +56,26 @@
or visible_people like concat('%', #{id}, '%') or visible_people like concat('%', #{id}, '%')
or visible_people = 'all' or visible_people = 'all'
</select> </select>
<select id="queryList" resultType="com.ruzhoukj.sms.model.vo.UserVO">
SELECT
id,
name,
second_dept as secondDept,
third_dept as thirdDept,
create_time as createTime,
email,
phone
FROM
user
WHERE
1 = 1
<if test="name != null and name != ''">
AND name LIKE CONCAT('%', #{name}, '%')
</if>
<if test="deptId != null and deptId != ''">
AND dept_id = #{deptId}
</if>
ORDER BY id DESC
</select>
</mapper> </mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.sms.dao.UserPerformanceDao">
<select id="queryList" resultType="com.ruzhoukj.sms.model.vo.UserPerformanceVO">
select
u.name userName,
up.user_id userId,
u.dept_id deptId,
up.performance_date performanceDate,
up.performance_score performanceScore,
d.name deptName
from
user_performance up
left join
user u on
u.id = up.user_id
left join
dept d on
up.dept_id = d.id
<where>
<if test="deptId != null and deptId != ''">
and up.dept_id = #{deptId}
</if>
</where>
</select>
</mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment