|
@@ -8,6 +8,7 @@ import cn.com.ctop.okr.entity.OkrObjectInfo;
|
|
import cn.com.ctop.okr.entity.OkrTaskInfo;
|
|
import cn.com.ctop.okr.entity.OkrTaskInfo;
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
import cn.com.ctop.okr.vo.Result;
|
|
import cn.com.ctop.okr.vo.Result;
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.log4j.Logger;
|
|
import org.apache.log4j.Logger;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -15,33 +16,34 @@ import org.springframework.stereotype.Controller;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
-@Controller
|
|
|
|
|
|
+@RestController
|
|
@RequestMapping("/okr")
|
|
@RequestMapping("/okr")
|
|
public class OkrController {
|
|
public class OkrController {
|
|
private static Logger logger = Logger.getLogger(OkrController.class);
|
|
private static Logger logger = Logger.getLogger(OkrController.class);
|
|
@Autowired
|
|
@Autowired
|
|
private OkrService okrService;
|
|
private OkrService okrService;
|
|
|
|
|
|
- @ResponseBody
|
|
|
|
|
|
+ /**
|
|
|
|
+ * type = 1 最近一周工作
|
|
|
|
+ * type = 4 最近四周工作
|
|
|
|
+ * @param dto
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@RequestMapping(value = "/insertTaskInfo")
|
|
@RequestMapping(value = "/insertTaskInfo")
|
|
- public Result insertTaskInfo(@RequestBody OkrDto dto ,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
-
|
|
|
|
- logger.info("okr/insertTaskInfo 方法开始");
|
|
|
|
|
|
+ public Result insertTaskInfo(@RequestBody OkrDto dto){
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
OkrTaskInfo taskInfo = dto.getTaskInfo();
|
|
OkrTaskInfo taskInfo = dto.getTaskInfo();
|
|
if(dto == null || dto.getTaskInfo() == null || StringUtils.isBlank(taskInfo.getTaskTitle()) ||
|
|
if(dto == null || dto.getTaskInfo() == null || StringUtils.isBlank(taskInfo.getTaskTitle()) ||
|
|
- taskInfo.getType() == null || taskInfo.getPriority() == null
|
|
|
|
- ){
|
|
|
|
|
|
+ taskInfo.getType() == null || taskInfo.getPriority() == null){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("任务标题、类型、优先级均不可为空");
|
|
result.setMessage("任务标题、类型、优先级均不可为空");
|
|
return result;
|
|
return result;
|
|
@@ -49,25 +51,17 @@ public class OkrController {
|
|
|
|
|
|
try {
|
|
try {
|
|
okrService.insertTaskInfo(taskInfo);
|
|
okrService.insertTaskInfo(taskInfo);
|
|
|
|
+ return result;
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally {
|
|
|
|
- logger.info("okr/insertTaskInfo 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- return result;
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/updateTaskInfo")
|
|
@RequestMapping(value = "/updateTaskInfo")
|
|
- public Result updateTaskInfo(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
-
|
|
|
|
- logger.info("okr/updateTaskInfo 方法开始");
|
|
|
|
|
|
+ public Result updateTaskInfo(@RequestBody OkrDto dto){
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
@@ -97,7 +91,6 @@ public class OkrController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/getOkrInfo")
|
|
@RequestMapping(value = "/getOkrInfo")
|
|
public Result getOkrInfo(@RequestBody UserInfoDto dto,
|
|
public Result getOkrInfo(@RequestBody UserInfoDto dto,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
@@ -120,7 +113,6 @@ public class OkrController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/saveOkrMember")
|
|
@RequestMapping(value = "/saveOkrMember")
|
|
public Result saveOkrMember(@RequestBody UserInfoDto dto,
|
|
public Result saveOkrMember(@RequestBody UserInfoDto dto,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
@@ -153,7 +145,6 @@ public class OkrController {
|
|
* @param response
|
|
* @param response
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/getMemberListByUserId")
|
|
@RequestMapping(value = "/getMemberListByUserId")
|
|
public Result<List<UserInfoDto>> getMemberListByUserId(@RequestBody UserInfoDto dto,
|
|
public Result<List<UserInfoDto>> getMemberListByUserId(@RequestBody UserInfoDto dto,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
@@ -178,36 +169,22 @@ public class OkrController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取本季度同步给我OKR的同事的列表
|
|
* 获取本季度同步给我OKR的同事的列表
|
|
- * @param request
|
|
|
|
- * @param response
|
|
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/getSyncUserListByMemberId")
|
|
@RequestMapping(value = "/getSyncUserListByMemberId")
|
|
- public Result<Map<String, Object>> getSyncUserListByMemberId(@RequestBody UserInfoDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/getSyncUserListByMemberId 方法开始");
|
|
|
|
|
|
+ public Result<Map<String, Object>> getSyncUserListByMemberId(@RequestBody JSONObject data){
|
|
Result<Map<String, Object>> result = new Result();
|
|
Result<Map<String, Object>> result = new Result();
|
|
-
|
|
|
|
- if(dto == null){
|
|
|
|
- result.setSuccess(false);
|
|
|
|
- result.setMessage("参数错误");
|
|
|
|
- return result;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
try {
|
|
try {
|
|
- Map<String, Object> resultMap = okrService.getSyncUserListByMemberId(dto.getYear(), dto.getQuarter(), dto.getName());
|
|
|
|
|
|
+ Map<String, Object> resultMap = okrService.getSyncUserListByMemberId(data);
|
|
result.setResult(resultMap);
|
|
result.setResult(resultMap);
|
|
|
|
+ return result;
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally{
|
|
|
|
- logger.info("/okr/getSyncUserListByMemberId 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
|
|
|
|
- return result;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -217,7 +194,6 @@ public class OkrController {
|
|
* @param response
|
|
* @param response
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/insertContentStatus")
|
|
@RequestMapping(value = "/insertContentStatus")
|
|
public Result<List<UserInfoDto>> insertContentStatus(@RequestBody OkrDto dto,
|
|
public Result<List<UserInfoDto>> insertContentStatus(@RequestBody OkrDto dto,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
@@ -244,7 +220,6 @@ public class OkrController {
|
|
* @param response
|
|
* @param response
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/updateContentStatus")
|
|
@RequestMapping(value = "/updateContentStatus")
|
|
public Result<List<UserInfoDto>> updateContentStatus(@RequestBody OkrDto dto,
|
|
public Result<List<UserInfoDto>> updateContentStatus(@RequestBody OkrDto dto,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
@@ -267,18 +242,12 @@ public class OkrController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 同时保存O和krList
|
|
* 同时保存O和krList
|
|
- * @param request
|
|
|
|
- * @param response
|
|
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/insertObjectAndKrList")
|
|
@RequestMapping(value = "/insertObjectAndKrList")
|
|
- public Result<List<UserInfoDto>> insertObjectAndKrList(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
|
|
+ public Result<List<UserInfoDto>> insertObjectAndKrList(@RequestBody OkrDto dto){
|
|
logger.info("/okr/insertObjectAndKrList 方法开始");
|
|
logger.info("/okr/insertObjectAndKrList 方法开始");
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
-
|
|
|
|
try {
|
|
try {
|
|
okrService.insertObjectAndKrList(dto.getObjectInfo(), dto.getKrList());
|
|
okrService.insertObjectAndKrList(dto.getObjectInfo(), dto.getKrList());
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
@@ -293,19 +262,12 @@ public class OkrController {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 更新状态指标
|
|
|
|
- * @param request
|
|
|
|
- * @param response
|
|
|
|
|
|
+ * 更新O状态指标
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/updateObject")
|
|
@RequestMapping(value = "/updateObject")
|
|
- public Result<List<UserInfoDto>> updateObject(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/updateObject 方法开始");
|
|
|
|
|
|
+ public Result<List<UserInfoDto>> updateObject(@RequestBody OkrDto dto){
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
-
|
|
|
|
if(dto == null || dto.getObjectInfo()==null ){
|
|
if(dto == null || dto.getObjectInfo()==null ){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不能为空");
|
|
result.setMessage("参数不能为空");
|
|
@@ -320,15 +282,13 @@ public class OkrController {
|
|
|
|
|
|
try {
|
|
try {
|
|
okrService.updateObject(objectInfo);
|
|
okrService.updateObject(objectInfo);
|
|
|
|
+ return result;
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally{
|
|
|
|
- logger.info("/okr/updateObject 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- return result;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -338,14 +298,11 @@ public class OkrController {
|
|
* @param response
|
|
* @param response
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/updateKr")
|
|
@RequestMapping(value = "/updateKr")
|
|
public Result<List<UserInfoDto>> updateKr(@RequestBody OkrDto dto,
|
|
public Result<List<UserInfoDto>> updateKr(@RequestBody OkrDto dto,
|
|
HttpServletRequest request,
|
|
HttpServletRequest request,
|
|
HttpServletResponse response){
|
|
HttpServletResponse response){
|
|
- logger.info("/okr/updateKr 方法开始");
|
|
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
-
|
|
|
|
if(dto == null || dto.getKrInfo()==null ){
|
|
if(dto == null || dto.getKrInfo()==null ){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不能为空");
|
|
result.setMessage("参数不能为空");
|
|
@@ -360,31 +317,22 @@ public class OkrController {
|
|
|
|
|
|
try {
|
|
try {
|
|
okrService.updateKr(krInfo);
|
|
okrService.updateKr(krInfo);
|
|
|
|
+ return result;
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally{
|
|
|
|
- logger.info("/okr/updateKr 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- return result;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
/**逻辑删除Object
|
|
/**逻辑删除Object
|
|
- * @param request
|
|
|
|
- * @param response
|
|
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/deleteObjectInfoById")
|
|
@RequestMapping(value = "/deleteObjectInfoById")
|
|
- public Result<List<UserInfoDto>> deleteObjectInfoById(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/deleteObjectInfoById 方法开始");
|
|
|
|
|
|
+ public Result<List<UserInfoDto>> deleteObjectInfoById(@RequestBody OkrDto dto){
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
-
|
|
|
|
if(dto == null || dto.getObjectInfo()==null ){
|
|
if(dto == null || dto.getObjectInfo()==null ){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不能为空");
|
|
result.setMessage("参数不能为空");
|
|
@@ -396,7 +344,6 @@ public class OkrController {
|
|
result.setMessage("主键不能为空");
|
|
result.setMessage("主键不能为空");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
try {
|
|
try {
|
|
okrService.deleteObjectInfoById(objectInfo);
|
|
okrService.deleteObjectInfoById(objectInfo);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
@@ -411,18 +358,12 @@ public class OkrController {
|
|
}
|
|
}
|
|
|
|
|
|
/**逻辑删除Kr
|
|
/**逻辑删除Kr
|
|
- * @param request
|
|
|
|
- * @param response
|
|
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/deleteKrById")
|
|
@RequestMapping(value = "/deleteKrById")
|
|
- public Result<List<UserInfoDto>> deleteKrById(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
|
|
+ public Result<List<UserInfoDto>> deleteKrById(@RequestBody OkrDto dto){
|
|
logger.info("/okr/deleteKrById 方法开始");
|
|
logger.info("/okr/deleteKrById 方法开始");
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
Result<List<UserInfoDto>> result = new Result();
|
|
-
|
|
|
|
if(dto == null || dto.getKrInfo()==null ){
|
|
if(dto == null || dto.getKrInfo()==null ){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不能为空");
|
|
result.setMessage("参数不能为空");
|
|
@@ -448,14 +389,9 @@ public class OkrController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/deleteContentStatusById")
|
|
@RequestMapping(value = "/deleteContentStatusById")
|
|
- public Result deleteContentStatuaById(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/deleteContentStatusById 方法开始");
|
|
|
|
|
|
+ public Result deleteContentStatuaById(@RequestBody OkrDto dto){
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
-
|
|
|
|
if(dto == null || dto.getContent()==null ){
|
|
if(dto == null || dto.getContent()==null ){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不能为空");
|
|
result.setMessage("参数不能为空");
|
|
@@ -470,24 +406,17 @@ public class OkrController {
|
|
|
|
|
|
try {
|
|
try {
|
|
okrService.deleteContentStatusById(content);
|
|
okrService.deleteContentStatusById(content);
|
|
|
|
+ return result;
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally{
|
|
|
|
- logger.info("/okr/deleteContentStatusById 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- return result;
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/deleteTaskInfoById")
|
|
@RequestMapping(value = "/deleteTaskInfoById")
|
|
- public Result deleteTaskInfoById(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/deleteTaskInfoById 方法开始");
|
|
|
|
|
|
+ public Result deleteTaskInfoById(@RequestBody OkrDto dto){
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
|
|
|
|
if(dto == null || dto.getTaskInfo()==null ){
|
|
if(dto == null || dto.getTaskInfo()==null ){
|
|
@@ -521,14 +450,9 @@ public class OkrController {
|
|
* @param response
|
|
* @param response
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/insertOkrKrInfo")
|
|
@RequestMapping(value = "/insertOkrKrInfo")
|
|
- public Result insertOkrKrInfo(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/insertOkrKrInfo 方法开始");
|
|
|
|
|
|
+ public Result insertOkrKrInfo(@RequestBody OkrDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
-
|
|
|
|
if(dto == null || dto.getKrInfo() ==null){
|
|
if(dto == null || dto.getKrInfo() ==null){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不可为空");
|
|
result.setMessage("参数不可为空");
|
|
@@ -536,7 +460,6 @@ public class OkrController {
|
|
}
|
|
}
|
|
|
|
|
|
OkrKrInfo krInfo = dto.getKrInfo();
|
|
OkrKrInfo krInfo = dto.getKrInfo();
|
|
-
|
|
|
|
if(krInfo.getObjectId() == null || krInfo.getCompletion() == null || StringUtils.isBlank(krInfo.getKrInfo())){
|
|
if(krInfo.getObjectId() == null || krInfo.getCompletion() == null || StringUtils.isBlank(krInfo.getKrInfo())){
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("参数不可为空");
|
|
result.setMessage("参数不可为空");
|
|
@@ -545,44 +468,33 @@ public class OkrController {
|
|
|
|
|
|
try {
|
|
try {
|
|
okrService.insertOkrKrInfo(dto.getKrInfo());
|
|
okrService.insertOkrKrInfo(dto.getKrInfo());
|
|
|
|
+ return result;
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally{
|
|
|
|
- logger.info("/okr/insertOkrKrInfo 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- return result;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取OKR所有年
|
|
* 获取OKR所有年
|
|
- * @param request
|
|
|
|
- * @param response
|
|
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @ResponseBody
|
|
|
|
@RequestMapping(value = "/getObjectYear")
|
|
@RequestMapping(value = "/getObjectYear")
|
|
- public Result getObjectYear(@RequestBody OkrDto dto,
|
|
|
|
- HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
- logger.info("/okr/getObjectYear 方法开始");
|
|
|
|
|
|
+ public Result getObjectYear(@RequestBody OkrDto dto){
|
|
Result<List<Integer>> result = new Result();
|
|
Result<List<Integer>> result = new Result();
|
|
-
|
|
|
|
try {
|
|
try {
|
|
List<Integer> yearList = okrService.getObjectYear();
|
|
List<Integer> yearList = okrService.getObjectYear();
|
|
result.setResult(yearList);
|
|
result.setResult(yearList);
|
|
|
|
+ return result;
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
- }finally{
|
|
|
|
- logger.info("/okr/getObjectYear 方法结束");
|
|
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- return result;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|