Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
ops
Commits
89409cea
Commit
89409cea
authored
Feb 21, 2025
by
朱翔
Browse files
增加用户绩效接口
parent
951392fa
Changes
33
Show whitespace changes
Inline
Side-by-side
pom.xml
View file @
89409cea
...
...
@@ -99,6 +99,13 @@
<artifactId>
common-core
</artifactId>
<version>
1.0.2
</version>
</dependency>
<!-- 阿里云oss-->
<dependency>
<groupId>
com.aliyun.oss
</groupId>
<artifactId>
aliyun-sdk-oss
</artifactId>
<version>
3.15.1
</version>
</dependency>
</dependencies>
<repositories>
...
...
src/main/java/com/ruzhoukj/sms/common/Constant.java
View file @
89409cea
...
...
@@ -17,4 +17,6 @@ public class Constant {
//部门管理员
public
static
final
String
D_ADMIN
=
"D_ADMIN"
;
public
static
final
String
DIR_OA
=
"OA/"
;
}
src/main/java/com/ruzhoukj/sms/controller/DeptController.java
View file @
89409cea
...
...
@@ -5,9 +5,9 @@ import com.platform.controller.BaseController;
import
com.platform.model.resp.Result
;
import
com.platform.page.TableDataInfo
;
import
com.ruzhoukj.sms.common.Constant
;
import
com.ruzhoukj.sms.entity.DeptAndUserEntity
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.DeptDTO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
com.ruzhoukj.sms.service.DeptService
;
import
com.ruzhoukj.sms.service.UserService
;
import
io.swagger.annotations.Api
;
...
...
@@ -61,7 +61,7 @@ public class DeptController extends BaseController {
}
@PostMapping
(
"/userList"
)
public
Result
<
List
<
DeptAndUserEntity
>>
userList
(
@RequestBody
DeptDTO
deptDTO
){
public
Result
<
List
<
UserVO
>>
userList
(
@RequestBody
DeptDTO
deptDTO
){
return
Result
.
data
(
deptService
.
getDeptUserList
(
deptDTO
));
}
}
src/main/java/com/ruzhoukj/sms/controller/FileController.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.controller
;
import
com.platform.controller.BaseController
;
import
com.platform.model.resp.Result
;
import
com.ruzhoukj.sms.service.FileService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.annotation.Resource
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.controller
* @Project:OA
* @name:FileController
* @Date:2025/2/21 11:26
* @Filename:FileController
*/
@Api
(
tags
=
"文件上传"
)
@RestController
@RequestMapping
(
"/file"
)
public
class
FileController
extends
BaseController
{
@Resource
private
FileService
fileService
;
@ApiOperation
(
value
=
"文件上传"
)
@PostMapping
(
"/upload"
)
public
Result
<
String
>
uploadFile
(
@RequestParam
(
"file"
)
MultipartFile
multipartFile
)
{
return
Result
.
data
(
fileService
.
upload
(
multipartFile
));
}
}
src/main/java/com/ruzhoukj/sms/controller/ReportDataInfoController.java
View file @
89409cea
package
com.ruzhoukj.sms.controller
;
import
com.google.common.collect.Lists
;
import
com.platform.controller.BaseController
;
import
com.platform.model.resp.Result
;
import
com.platform.page.TableDataInfo
;
import
com.platform.utils.DozerUtils
;
import
com.ruzhoukj.sms.common.Constant
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.ReportDataInfoDTO
;
import
com.ruzhoukj.sms.model.vo.ReportDataInfoVO
;
import
com.ruzhoukj.sms.service.DeptService
;
import
com.ruzhoukj.sms.service.ReportDataInfoService
;
import
com.ruzhoukj.sms.service.UserService
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -25,12 +30,23 @@ import javax.annotation.Resource;
@RequestMapping
(
"/report/data"
)
public
class
ReportDataInfoController
extends
BaseController
{
@Resource
private
UserService
userService
;
@Resource
private
ReportDataInfoService
reportDataInfoService
;
@PostMapping
(
"/page"
)
public
TableDataInfo
page
(
@RequestBody
ReportDataInfoDTO
reportDataInfoDTO
){
UserEntity
user
=
userService
.
getById
(
reportDataInfoDTO
.
getLoginUserId
());
startPage
(
reportDataInfoDTO
.
getPageNum
(),
reportDataInfoDTO
.
getPageSize
());
if
(
user
.
getUserRole
().
equals
(
Constant
.
ADMIN
)){
return
getDataTable
(
reportDataInfoService
.
queryList
(
reportDataInfoDTO
));
}
if
(
user
.
getUserRole
().
equals
(
Constant
.
D_ADMIN
)){
reportDataInfoDTO
.
setDeptId
(
user
.
getDeptId
());
return
getDataTable
(
reportDataInfoService
.
queryList
(
reportDataInfoDTO
));
}
reportDataInfoDTO
.
setUserId
(
user
.
getId
());
return
getDataTable
(
reportDataInfoService
.
queryList
(
reportDataInfoDTO
));
}
...
...
@@ -39,6 +55,11 @@ public class ReportDataInfoController extends BaseController {
return
Result
.
data
(
DozerUtils
.
convertBean
(
reportDataInfoService
.
getById
(
id
),
ReportDataInfoVO
.
class
));
}
@PostMapping
(
"/saveOrUpdate"
)
public
Result
saveOrUpdate
(
@RequestBody
ReportDataInfoDTO
reportDataInfoDTO
){
return
toAjax
(
reportDataInfoService
.
saveOrUpdateReportData
(
reportDataInfoDTO
));
}
@GetMapping
(
"/test"
)
public
void
test
(){
reportDataInfoService
.
test
();
...
...
src/main/java/com/ruzhoukj/sms/controller/UserController.java
View file @
89409cea
package
com.ruzhoukj.sms.controller
;
import
com.platform.controller.BaseController
;
import
com.platform.page.TableDataInfo
;
import
com.ruzhoukj.sms.common.Result
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.UserDTO
;
...
...
@@ -14,15 +16,15 @@ import java.util.List;
@RestController
@RequestMapping
(
"/user"
)
@Api
(
tags
=
"用户管理"
)
public
class
UserController
{
public
class
UserController
extends
BaseController
{
@Resource
private
UserService
userService
;
@
Ge
tMapping
(
value
=
"/list"
)
public
List
<
UserEntity
>
getUserList
(
@Request
Param
(
value
=
"name"
,
required
=
false
)
String
name
,
@RequestParam
(
name
=
"page"
,
defaultValue
=
"1"
)
Integer
page
,
@Reque
st
P
ar
am
(
name
=
"pageSize"
,
defaultValue
=
"10"
)
Integer
p
ageSize
)
{
return
userService
.
getUs
erList
(
name
,
(
page
-
1
)
*
pageSize
,
pageSize
);
@
Pos
tMapping
(
value
=
"/list"
)
public
TableDataInfo
getUserList
(
@Request
Body
UserDTO
userDTO
)
{
star
tPage
(
userDTO
.
getPageNum
(),
userDTO
.
getP
ageSize
());
return
getDataTable
(
userService
.
qu
er
y
List
(
userDTO
)
);
}
@ApiOperation
(
"新增用户"
)
...
...
src/main/java/com/ruzhoukj/sms/controller/UserPerformanceController.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.controller
;
import
com.google.common.collect.Lists
;
import
com.platform.controller.BaseController
;
import
com.platform.page.TableDataInfo
;
import
com.ruzhoukj.sms.common.Constant
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.UserPerformanceDTO
;
import
com.ruzhoukj.sms.service.UserPerformanceService
;
import
com.ruzhoukj.sms.service.UserService
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.controller
* @Project:OA
* @name:UserPerformanceController
* @Date:2025/2/21 14:25
* @Filename:UserPerformanceController
*/
@Api
(
"绩效管理"
)
@RestController
@RequestMapping
(
"/performance"
)
public
class
UserPerformanceController
extends
BaseController
{
@Resource
private
UserService
userService
;
@Resource
private
UserPerformanceService
userPerformanceService
;
@PostMapping
(
"page"
)
public
TableDataInfo
page
(
@RequestBody
UserPerformanceDTO
userPerformanceDTO
){
//查看当前登录用户信息
UserEntity
user
=
userService
.
getById
(
userPerformanceDTO
.
getLoginUserId
());
if
(
user
.
getUserRole
().
equals
(
Constant
.
ADMIN
)){
return
getDataTable
(
userPerformanceService
.
queryList
(
userPerformanceDTO
));
}
if
(
user
.
getUserRole
().
equals
(
Constant
.
D_ADMIN
)){
userPerformanceDTO
.
setDeptId
(
user
.
getDeptId
());
return
getDataTable
(
userPerformanceService
.
queryList
(
userPerformanceDTO
));
}
return
getDataTable
(
Lists
.
newArrayList
());
}
}
src/main/java/com/ruzhoukj/sms/dao/ReportDataInfo
Mapper
.java
→
src/main/java/com/ruzhoukj/sms/dao/ReportDataInfo
Dao
.java
View file @
89409cea
...
...
@@ -17,6 +17,6 @@ import java.util.List;
* @Filename:ReportDataInfoMapper
*/
@Mapper
public
interface
ReportDataInfo
Mapper
extends
BaseMapper
<
ReportDataInfoEntity
>
{
public
interface
ReportDataInfo
Dao
extends
BaseMapper
<
ReportDataInfoEntity
>
{
List
<
ReportDataInfoVO
>
queryList
(
ReportDataInfoDTO
reportDataInfoDTO
);
}
src/main/java/com/ruzhoukj/sms/dao/UserDao.java
View file @
89409cea
...
...
@@ -3,6 +3,8 @@ package com.ruzhoukj.sms.dao;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruzhoukj.sms.entity.ProjectEntity
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.UserDTO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -39,4 +41,6 @@ public interface UserDao extends BaseMapper<UserEntity> {
* @return List<ProjectEntity>
*/
List
<
ProjectEntity
>
listProjectByUserId
(
@Param
(
"id"
)
String
id
);
List
<
UserVO
>
queryList
(
UserDTO
userDTO
);
}
src/main/java/com/ruzhoukj/sms/dao/
DeptAndUser
Dao.java
→
src/main/java/com/ruzhoukj/sms/dao/
UserPerformance
Dao.java
View file @
89409cea
package
com.ruzhoukj.sms.dao
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
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
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
...
...
@@ -10,17 +12,11 @@ import java.util.List;
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.dao
* @Project:OA
* @name:
DeptAndUser
Dao
* @Date:2025/2/21 1
0:04
* @Filename:
DeptAndUser
Dao
* @name:
UserPerformance
Dao
* @Date:2025/2/21 1
4:21
* @Filename:
UserPerformance
Dao
*/
@Mapper
public
interface
DeptAndUserDao
extends
BaseMapper
<
DeptAndUserEntity
>
{
/**
* 查看部门用户列表
* @param deptAndUserEntity deptAndUserEntity
* @return List<DeptAndUserEntity>
*/
List
<
DeptAndUserEntity
>
queryList
(
DeptAndUserEntity
deptAndUserEntity
);
public
interface
UserPerformanceDao
extends
BaseMapper
<
UserPerformanceEntity
>
{
List
<
UserPerformanceVO
>
queryList
(
UserPerformanceDTO
userPerformanceDTO
);
}
src/main/java/com/ruzhoukj/sms/entity/ReportDataInfoEntity.java
View file @
89409cea
...
...
@@ -41,4 +41,7 @@ public class ReportDataInfoEntity {
@TableField
(
"month"
)
private
Integer
month
;
@TableField
(
"dept_id"
)
private
String
deptId
;
}
src/main/java/com/ruzhoukj/sms/entity/UserEntity.java
View file @
89409cea
...
...
@@ -82,4 +82,7 @@ public class UserEntity {
@TableField
(
"user_role"
)
private
String
userRole
;
@TableField
(
"dept_id"
)
private
String
deptId
;
}
src/main/java/com/ruzhoukj/sms/entity/
DeptAndUser
Entity.java
→
src/main/java/com/ruzhoukj/sms/entity/
UserPerformance
Entity.java
View file @
89409cea
...
...
@@ -10,23 +10,27 @@ import lombok.Data;
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.entity
* @Project:OA
* @name:
DeptAndUser
Entity
* @Date:2025/2/21 1
0:02
* @Filename:
DeptAndUser
Entity
* @name:
UserPerformance
Entity
* @Date:2025/2/21 1
4:14
* @Filename:
UserPerformance
Entity
*/
@Data
@TableName
(
"
dept_and_user
"
)
public
class
DeptAndUser
Entity
{
@TableName
(
"
user_performance
"
)
public
class
UserPerformance
Entity
{
@TableId
(
value
=
"id"
,
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
@TableField
(
"dept_id"
)
private
String
deptId
;
@TableField
(
"user_id"
)
private
String
userId
;
@TableField
(
exist
=
false
)
private
String
userName
;
@TableField
(
"performance_date"
)
private
String
performanceDate
;
@TableField
(
"performance_score"
)
private
String
performanceScore
;
@TableField
(
"dept_id"
)
private
String
deptId
;
}
src/main/java/com/ruzhoukj/sms/model/dto/DeptDTO.java
View file @
89409cea
package
com.ruzhoukj.sms.model.dto
;
import
com.ruzhoukj.sms.entity.DeptAndUserEntity
;
import
com.ruzhoukj.sms.entity.DeptEntity
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -24,9 +24,6 @@ public class DeptDTO extends DeptEntity {
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"部门人员"
)
private
List
<
DeptAndUserEntity
>
deptUserList
;
@ApiModelProperty
(
value
=
"当前登陆人"
)
private
String
loginUserId
;
}
src/main/java/com/ruzhoukj/sms/model/dto/ReportDataInfoDTO.java
View file @
89409cea
package
com.ruzhoukj.sms.model.dto
;
import
com.ruzhoukj.sms.entity.ReportDataInfoEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -19,4 +20,7 @@ public class ReportDataInfoDTO extends ReportDataInfoEntity {
private
Integer
pageNum
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"当前登录用户Id"
)
private
String
loginUserId
;
}
src/main/java/com/ruzhoukj/sms/model/dto/UserDTO.java
View file @
89409cea
...
...
@@ -18,6 +18,10 @@ import lombok.EqualsAndHashCode;
@Data
public
class
UserDTO
extends
UserEntity
{
private
Integer
pageNum
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"用户扩展信息"
)
private
UserExtend
userExtend
;
...
...
src/main/java/com/ruzhoukj/sms/model/dto/UserPerformanceDTO.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.model.dto
;
import
com.ruzhoukj.sms.entity.UserPerformanceEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model.dto
* @Project:OA
* @name:UserPerformanceDTO
* @Date:2025/2/21 14:27
* @Filename:UserPerformanceDTO
*/
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
public
class
UserPerformanceDTO
extends
UserPerformanceEntity
{
private
Integer
pageNum
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"当前登录用户Id"
)
private
String
loginUserId
;
}
src/main/java/com/ruzhoukj/sms/model/vo/UserPerformanceVO.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.model.vo
;
import
com.ruzhoukj.sms.entity.UserPerformanceEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model.vo
* @Project:OA
* @name:UserPerformanceVO
* @Date:2025/2/21 14:30
* @Filename:UserPerformanceVO
*/
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
public
class
UserPerformanceVO
extends
UserPerformanceEntity
{
private
String
userName
;
private
String
deptName
;
}
src/main/java/com/ruzhoukj/sms/service/DeptService.java
View file @
89409cea
package
com.ruzhoukj.sms.service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.sms.entity.DeptAndUserEntity
;
import
com.ruzhoukj.sms.entity.DeptEntity
;
import
com.ruzhoukj.sms.model.dto.DeptDTO
;
import
com.ruzhoukj.sms.model.vo.DeptVO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
java.util.List
;
...
...
@@ -31,5 +31,6 @@ public interface DeptService extends IService<DeptEntity> {
* @param deptDTO deptDTO
* @return List<DeptAndUserEntity>
*/
List
<
DeptAndUserEntity
>
getDeptUserList
(
DeptDTO
deptDTO
);
List
<
UserVO
>
getDeptUserList
(
DeptDTO
deptDTO
);
}
src/main/java/com/ruzhoukj/sms/service/FileService.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.service
;
import
org.springframework.web.multipart.MultipartFile
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service
* @Project:OA
* @name:FileService
* @Date:2025/2/21 11:28
* @Filename:FileService
*/
public
interface
FileService
{
/**
* 文件上传
* @param multipartFile multipartFile
* @return String
*/
String
upload
(
MultipartFile
multipartFile
);
}
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment