Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
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
chenweisong
datacollector
Commits
fcea4901
Commit
fcea4901
authored
Mar 14, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
cbca00c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
18 deletions
+11
-18
UserController.java
...in/java/com/keymobile/rest/controller/UserController.java
+3
-5
AssignmentService.java
...in/java/com/keymobile/rest/service/AssignmentService.java
+8
-13
No files found.
src/main/java/com/keymobile/rest/controller/UserController.java
View file @
fcea4901
package
com
.
keymobile
.
rest
.
controller
;
package
com
.
keymobile
.
rest
.
controller
;
import
com.keymobile.rest.common.bean.ApiResponse
;
import
com.keymobile.rest.common.bean.ApiResponse
;
import
com.keymobile.rest.common.constant.UserConstant
;
import
com.keymobile.rest.model.*
;
import
com.keymobile.rest.model.*
;
import
com.keymobile.rest.service.*
;
import
com.keymobile.rest.service.*
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -18,15 +19,12 @@ public class UserController {
...
@@ -18,15 +19,12 @@ public class UserController {
private
UserService
userService
;
private
UserService
userService
;
@ApiOperation
(
value
=
"获取补录人员列表"
)
@ApiOperation
(
value
=
"获取补录人员列表"
)
@PostMapping
(
value
=
"/user/list"
)
@PostMapping
(
value
=
"/user/list"
)
public
ApiResponse
getUserList
()
{
public
ApiResponse
getUserList
()
{
// List<User> userList = userService.findAllByRole(User
.ROLE_NORMAL);
List
<
User
>
userList
=
userService
.
findAllByRole
(
UserConstant
.
ROLE_NORMAL
);
return
ApiResponse
.
ok
(
null
);
return
ApiResponse
.
ok
(
userList
);
}
}
}
}
src/main/java/com/keymobile/rest/service/AssignmentService.java
View file @
fcea4901
package
com
.
keymobile
.
rest
.
service
;
package
com
.
keymobile
.
rest
.
service
;
import
com.keymobile.rest.common.constant.AssignmentConstant
;
import
com.keymobile.rest.common.utils.DateUtil
;
import
com.keymobile.rest.common.utils.DateUtil
;
import
com.keymobile.rest.dao.AssignmentDao
;
import
com.keymobile.rest.dao.AssignmentDao
;
import
com.keymobile.rest.model.Assignment
;
import
com.keymobile.rest.model.Assignment
;
...
@@ -12,6 +13,7 @@ import org.springframework.data.domain.Sort;
...
@@ -12,6 +13,7 @@ import org.springframework.data.domain.Sort;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
import
java.time.LocalDateTime
;
@Service
@Service
public
class
AssignmentService
{
public
class
AssignmentService
{
...
@@ -35,19 +37,12 @@ public class AssignmentService {
...
@@ -35,19 +37,12 @@ public class AssignmentService {
Assignment
assignment
=
new
Assignment
();
Assignment
assignment
=
new
Assignment
();
Timestamp
now
=
Timestamp
.
valueOf
(
DateUtil
.
getDateTime
());
Timestamp
now
=
Timestamp
.
valueOf
(
DateUtil
.
getDateTime
());
assignment
.
setCreateAt
(
now
);
assignment
.
setCreateAt
(
now
);
// assignment.setStatus(Assignment.STATUS_UNRELEASED);
assignment
.
setNeedAudit
(
AssignmentConstant
.
NEED_AUDIT
);
// assignment.setAudit(Assignment.AUDIT_NEED);
assignment
.
setName
(
form
.
getName
());
// assignment.setName(form.getName());
assignment
.
setType
(
form
.
getType
());
// assignment.setType(form.getType());
if
(
form
.
getType
()
==
AssignmentConstant
.
TYPE_AUTO
)
{
// if (form.getType() == Assignment.TYPE_AUTO) {
// Timestamp startAt;
}
// try {
// startAt = Timestamp.valueOf(form.getStartAt());
// } catch (Exception e) {
// startAt = Timestamp.valueOf(LocalDateTime.now());
// }
// assignment.setStartAt(startAt);
// }
assignment
.
setUser
(
form
.
getUser
());
assignment
.
setUser
(
form
.
getUser
());
assignment
=
assignmentDao
.
save
(
assignment
);
assignment
=
assignmentDao
.
save
(
assignment
);
return
assignment
;
return
assignment
;
...
...
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