Commit fcea4901 by chenweisong

更新

parent cbca00c9
package com.keymobile.rest.controller;
import com.keymobile.rest.common.bean.ApiResponse;
import com.keymobile.rest.common.constant.UserConstant;
import com.keymobile.rest.model.*;
import com.keymobile.rest.service.*;
import io.swagger.annotations.Api;
......@@ -18,15 +19,12 @@ public class UserController {
private UserService userService;
@ApiOperation(value = "获取补录人员列表")
@PostMapping(value = "/user/list")
public ApiResponse getUserList() {
// List<User> userList = userService.findAllByRole(User.ROLE_NORMAL);
return ApiResponse.ok(null);
List<User> userList = userService.findAllByRole(UserConstant.ROLE_NORMAL);
return ApiResponse.ok(userList);
}
}
package com.keymobile.rest.service;
import com.keymobile.rest.common.constant.AssignmentConstant;
import com.keymobile.rest.common.utils.DateUtil;
import com.keymobile.rest.dao.AssignmentDao;
import com.keymobile.rest.model.Assignment;
......@@ -12,6 +13,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.time.LocalDateTime;
@Service
public class AssignmentService {
......@@ -35,19 +37,12 @@ public class AssignmentService {
Assignment assignment = new Assignment();
Timestamp now = Timestamp.valueOf(DateUtil.getDateTime());
assignment.setCreateAt(now);
// assignment.setStatus(Assignment.STATUS_UNRELEASED);
// assignment.setAudit(Assignment.AUDIT_NEED);
// assignment.setName(form.getName());
// assignment.setType(form.getType());
// 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.setNeedAudit(AssignmentConstant.NEED_AUDIT);
assignment.setName(form.getName());
assignment.setType(form.getType());
if (form.getType() == AssignmentConstant.TYPE_AUTO) {
}
assignment.setUser(form.getUser());
assignment = assignmentDao.save(assignment);
return assignment;
......
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