Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
竹天卫
tianjin-cement
Commits
91527e92
Commit
91527e92
authored
Nov 09, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员附件功能
parent
d493e619
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
122 additions
and
30 deletions
+122
-30
SysUserController.java
...wise/sc/cement/business/controller/SysUserController.java
+30
-4
EquipmentScrap.java
...ava/cn/wise/sc/cement/business/entity/EquipmentScrap.java
+3
-0
SysUserEnclosure.java
...a/cn/wise/sc/cement/business/entity/SysUserEnclosure.java
+4
-0
SysUserEnclosureMapper.java
...ise/sc/cement/business/mapper/SysUserEnclosureMapper.java
+6
-1
SysUserEnclosureMapper.xml
.../sc/cement/business/mapper/xml/SysUserEnclosureMapper.xml
+12
-2
SysUserEnclosureQuery.java
...sc/cement/business/model/query/SysUserEnclosureQuery.java
+0
-3
EquipmentScrapVo.java
...cn/wise/sc/cement/business/model/vo/EquipmentScrapVo.java
+3
-0
ISysUserService.java
...a/cn/wise/sc/cement/business/service/ISysUserService.java
+5
-7
EquipmentServiceImpl.java
...sc/cement/business/service/impl/EquipmentServiceImpl.java
+2
-0
UserServiceImpl.java
...wise/sc/cement/business/service/impl/UserServiceImpl.java
+57
-13
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysUserController.java
View file @
91527e92
...
...
@@ -117,17 +117,43 @@ public class SysUserController {
}
@ApiOperation
(
value
=
"附件"
)
@
Ge
tMapping
(
"/uploadPeoplePF"
)
public
BaseResponse
uploadPeoplePF
(
SysUserEnclosureQuery
query
){
@ApiOperation
(
value
=
"
上传
附件"
)
@
Pos
tMapping
(
"/uploadPeoplePF"
)
public
BaseResponse
uploadPeoplePF
(
@RequestBody
SysUserEnclosureQuery
query
){
try
{
return
userService
.
uploadPeoplePF
(
query
);
}
catch
(
Exception
e
){
log
.
debug
(
"
人员管理
上传附件{}"
,
e
);
log
.
debug
(
"上传附件{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"附件分页列表"
)
@GetMapping
(
"/getUserEnclosurePage"
)
public
BaseResponse
getUserEnclosurePage
(
PageQuery
pageQuery
,
Integer
userId
)
{
try
{
return
userService
.
getUserEnclosurePage
(
pageQuery
,
userId
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"附件分页列表{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"删除人员附件"
)
@PostMapping
(
"/deleteUserEnclosure"
)
public
BaseResponse
deleteUserEnclosure
(
Integer
id
)
{
try
{
return
userService
.
deleteUserEnclosure
(
id
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"删除人员附件{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
// @ApiOperation("人员详情导出列表")
// @PostMapping("/exportList")
// public void exportList(Integer status,String filename,String name, HttpServletResponse response) {
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/EquipmentScrap.java
View file @
91527e92
...
...
@@ -44,6 +44,9 @@ public class EquipmentScrap implements Serializable {
@ApiModelProperty
(
"报废申请日期"
)
private
LocalDate
scrapDate
;
@ApiModelProperty
(
"审批意见"
)
private
String
opinion
;
@ApiModelProperty
(
"申请结果(0待审批,1已通过,2未通过)"
)
private
Integer
status
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysUserEnclosure.java
View file @
91527e92
...
...
@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
...
...
@@ -33,4 +34,7 @@ public class SysUserEnclosure implements Serializable {
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
@ApiModelProperty
(
"上传时间"
)
private
LocalDateTime
uploadTime
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysUserEnclosureMapper.java
View file @
91527e92
...
...
@@ -2,7 +2,10 @@ package cn.wise.sc.cement.business.mapper;
import
cn.wise.sc.cement.business.entity.SysUserEnclosure
;
import
cn.wise.sc.cement.business.model.vo.PlanTrainingVo
;
import
cn.wise.sc.cement.business.model.vo.UserVo
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -17,5 +20,7 @@ import java.util.Map;
* @since 2020-11-9
*/
public
interface
SysUserEnclosureMapper
extends
BaseMapper
<
SysUserEnclosure
>
{
SysUserEnclosure
getByUserId
(
@Param
(
"params"
)
Integer
params
);
IPage
<
SysUserEnclosure
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysUserEnclosureMapper.xml
View file @
91527e92
...
...
@@ -2,9 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.wise.sc.cement.business.mapper.SysUserEnclosureMapper"
>
<select
id=
"get
ByUserId
"
resultType=
"cn.wise.sc.cement.business.entity.SysUserEnclosure"
>
<select
id=
"get
Page
"
resultType=
"cn.wise.sc.cement.business.entity.SysUserEnclosure"
>
select sue.*
from sys_user_enclosure sue
where sue.user_id = #{params}
<if
test=
"params.userId != null"
>
where sue.user_id = #{params.userId}
</if>
</select>
</mapper>
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SysUserEnclosureQuery.java
View file @
91527e92
...
...
@@ -12,9 +12,6 @@ import lombok.Data;
@Data
@ApiModel
(
"人员管理附件"
)
public
class
SysUserEnclosureQuery
{
@ApiModelProperty
(
"培训计划审批id"
)
private
Integer
id
;
@ApiModelProperty
(
"用户id"
)
private
Integer
userId
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentScrapVo.java
View file @
91527e92
...
...
@@ -52,6 +52,9 @@ public class EquipmentScrapVo {
@ApiModelProperty
(
"报废申请日期"
)
private
LocalDate
scrapDate
;
@ApiModelProperty
(
"审批意见"
)
private
String
opinion
;
@ApiModelProperty
(
"申请结果(0待审批,1已通过,2未通过)"
)
private
Integer
status
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysUserService.java
View file @
91527e92
...
...
@@ -37,13 +37,11 @@ public interface ISysUserService extends IService<SysUser> {
BaseResponse
<
UserVo
>
findById
(
Integer
id
);
/**
* 人员管理上传附件
*
* @param query
* @return
*/
BaseResponse
<
SysUserEnclosure
>
uploadPeoplePF
(
SysUserEnclosureQuery
query
);
BaseResponse
<
String
>
uploadPeoplePF
(
SysUserEnclosureQuery
query
);
BaseResponse
<
IPage
<
SysUserEnclosure
>>
getUserEnclosurePage
(
PageQuery
pageQuery
,
Integer
userId
);
BaseResponse
<
String
>
deleteUserEnclosure
(
Integer
id
);
/**
* 人员详情列表导出
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java
View file @
91527e92
...
...
@@ -521,6 +521,8 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
return
BaseResponse
.
errorMsg
(
"信息错误!"
);
}
equipmentScrap
.
setStatus
(
query
.
getIsAgree
());
equipmentScrap
.
setOpinion
(
query
.
getAuditReason
());
scrapMapper
.
updateById
(
equipmentScrap
);
if
(
query
.
getIsAgree
()
==
1
)
{
Equipment
equipment
=
equipmentMapper
.
selectById
(
equipmentScrap
.
getEquipmentId
());
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/UserServiceImpl.java
View file @
91527e92
...
...
@@ -233,32 +233,76 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
return
BaseResponse
.
okData
(
userVo
);
}
/**
* 上传人员附件
* @param query
* @return
*/
@Override
public
BaseResponse
<
SysUserEnclosure
>
uploadPeoplePF
(
SysUserEnclosureQuery
query
)
{
@Transactional
public
BaseResponse
<
String
>
uploadPeoplePF
(
SysUserEnclosureQuery
query
)
{
LoginUser
loginUser
=
userService
.
getLoginUser
();
if
(
loginUser
==
null
){
return
BaseResponse
.
errorMsg
(
"请登录账号"
);
}
if
(
query
==
null
||
query
.
get
Id
()==
null
){
if
(
query
==
null
||
query
.
get
UserId
()
==
null
){
return
BaseResponse
.
errorMsg
(
"参数错误"
);
}
SysUserEnclosure
sysUserEnclosure
=
sysUserEnclosureMapper
.
getByUserId
(
query
.
getUserId
());
if
(
sysUserEnclosure
==
null
){
return
BaseResponse
.
errorMsg
(
"数据错误"
);
}
sysUserEnclosure
.
setEnclosureUrl
(
query
.
getEnclosureUrl
())
SysUserEnclosure
sysUserEnclosure
=
new
SysUserEnclosure
();
sysUserEnclosure
.
setUserId
(
query
.
getUserId
())
.
setEnclosureUrl
(
query
.
getEnclosureUrl
())
.
setExtName
(
query
.
getExtName
())
.
setAlias
(
query
.
getAlias
())
.
setFlStatus
(
1
);
.
setFlStatus
(
1
)
.
setUploadTime
(
LocalDateTime
.
now
());
sysUserEnclosureMapper
.
insert
(
sysUserEnclosure
);
return
BaseResponse
.
okMsg
(
"成功"
);
}
/**
* 附件列表
* @param pageQuery
* @param userId
* @return
*/
@Override
public
BaseResponse
<
IPage
<
SysUserEnclosure
>>
getUserEnclosurePage
(
PageQuery
pageQuery
,
Integer
userId
)
{
if
(
userId
==
null
){
return
BaseResponse
.
errorMsg
(
"请传入用户id"
);
}
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"userId"
,
userId
);
Page
<
SysUserEnclosure
>
page
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
IPage
<
SysUserEnclosure
>
pages
=
sysUserEnclosureMapper
.
getPage
(
page
,
params
);
return
BaseResponse
.
okData
(
pages
);
}
if
(
StringUtils
.
isEmpty
(
query
.
getEnclosureUrl
())){
sysUserEnclosure
.
setFlStatus
(
2
);
/**
* 删除人员附件
* @param id
* @return
*/
@Transactional
@Override
public
BaseResponse
<
String
>
deleteUserEnclosure
(
Integer
id
)
{
if
(
id
==
null
){
return
BaseResponse
.
errorMsg
(
"参数错误"
);
}
sysUserEnclosureMapper
.
updateById
(
sysUserEnclosure
);
return
BaseResponse
.
okData
(
sysUserEnclosure
);
SysUserEnclosure
userEnclosure
=
sysUserEnclosureMapper
.
selectById
(
id
);
if
(
userEnclosure
==
null
){
return
BaseResponse
.
errorMsg
(
"人员附件信息错误"
);
}
sysUserEnclosureMapper
.
deleteById
(
id
);
return
BaseResponse
.
okData
(
"附件信息删除成功"
);
}
/**
* 人员详情列表导出
* @param status 状态
...
...
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