|
@@ -2,15 +2,13 @@ package cn.com.ctop.okr.controller;
|
|
|
|
|
|
import cn.com.ctop.okr.dto.OkrDto;
|
|
|
import cn.com.ctop.okr.dto.UserInfoDto;
|
|
|
-import cn.com.ctop.okr.entity.OkrContentStatus;
|
|
|
-import cn.com.ctop.okr.entity.OkrKrInfo;
|
|
|
-import cn.com.ctop.okr.entity.OkrObjectInfo;
|
|
|
-import cn.com.ctop.okr.entity.OkrTaskInfo;
|
|
|
+import cn.com.ctop.okr.entity.*;
|
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
|
import cn.com.ctop.okr.vo.Result;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.log4j.Logger;
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -20,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -117,7 +116,7 @@ public class OkrController {
|
|
|
public Result saveOkrMember(@RequestBody UserInfoDto dto,
|
|
|
HttpServletRequest request,
|
|
|
HttpServletResponse response){
|
|
|
- logger.info("/okr/getOkrInfo 方法开始");
|
|
|
+ logger.info("/okr/saveOkrMember 方法开始");
|
|
|
Result result = new Result();
|
|
|
List<String> userIdList = dto.getUserIdList();
|
|
|
if(userIdList == null || userIdList.size() == 0){
|
|
@@ -133,7 +132,80 @@ public class OkrController {
|
|
|
result.setSuccess(false);
|
|
|
result.setMessage("error");
|
|
|
}finally{
|
|
|
- logger.info("/okr/getOkrInfo 方法结束");
|
|
|
+ logger.info("/okr/saveOkrMember 方法结束");
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ @ResponseBody
|
|
|
+ @RequestMapping(value = "/deleteOkrMember")
|
|
|
+ public Result deleteOkrMember(@RequestBody UserInfoDto dto,
|
|
|
+ HttpServletRequest request,
|
|
|
+ HttpServletResponse response){
|
|
|
+ logger.info("/okr/deleteOkrMember 方法开始");
|
|
|
+ Result result = new Result();
|
|
|
+ if(dto == null || StringUtils.isBlank(dto.getMemberId())){
|
|
|
+ result.setSuccess(false);
|
|
|
+ result.setMessage("需要删除的同步人不能为空");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ try {
|
|
|
+ okrService.deleteOkrMember(dto.getMemberId());
|
|
|
+ }catch (Exception e){
|
|
|
+ logger.error(e.getMessage());
|
|
|
+ result.setSuccess(false);
|
|
|
+ result.setMessage("error");
|
|
|
+ }finally{
|
|
|
+ logger.info("/okr/deleteOkrMember 方法结束");
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ @ResponseBody
|
|
|
+ @RequestMapping(value = "/saveOkrMember2")
|
|
|
+ public Result saveOkrMember2(@RequestBody UserInfoDto dto,
|
|
|
+ HttpServletRequest request,
|
|
|
+ HttpServletResponse response){
|
|
|
+ logger.info("/okr/saveOkrMember2 方法开始");
|
|
|
+ Result result = new Result();
|
|
|
+ List<String> userIdList = dto.getUserIdList();
|
|
|
+ if(userIdList == null || userIdList.size() == 0){
|
|
|
+ result.setSuccess(false);
|
|
|
+ result.setMessage("同步人员不能为空");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ List<String> userListFilter = new ArrayList<>();
|
|
|
+ //同步人是否重复校验
|
|
|
+ List<UserInfoDto> memberList = okrService.getMemberListByUserId(null);
|
|
|
+ for(String userId:userIdList){
|
|
|
+ int filter = 0;
|
|
|
+ for (UserInfoDto memberInfo:memberList){
|
|
|
+ if(StringUtils.equals(userId,memberInfo.getUserId())){
|
|
|
+ //result.setSuccess(false);
|
|
|
+ //result.setMessage(memberInfo.getName() + "已是同步人,请重新选择");
|
|
|
+ //return result;
|
|
|
+ filter = -1;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(filter == 0){
|
|
|
+ userListFilter.add(userId);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ try {
|
|
|
+ okrService.insertOkrMember2(userListFilter);
|
|
|
+ }catch (Exception e){
|
|
|
+ logger.error(e.getMessage());
|
|
|
+ result.setSuccess(false);
|
|
|
+ result.setMessage("error");
|
|
|
+ }finally{
|
|
|
+ logger.info("/okr/saveOkrMember2 方法结束");
|
|
|
}
|
|
|
|
|
|
return result;
|