瀏覽代碼

OKR业务代码提交

hcst_sunzhen 5 年之前
父節點
當前提交
b3970a7f96

+ 54 - 0
src/main/java/cn/com/ctop/okr/controller/OkrController.java

@@ -45,6 +45,7 @@ public class OkrController {
         ){
         ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("任务标题、类型、优先级均不可为空");
             result.setMessage("任务标题、类型、优先级均不可为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -302,11 +303,13 @@ public class OkrController {
         if(dto == null || dto.getObjectInfo()==null ){
         if(dto == null || dto.getObjectInfo()==null ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("参数不能为空");
             result.setMessage("参数不能为空");
+            return result;
         }
         }
         OkrObjectInfo objectInfo = dto.getObjectInfo();
         OkrObjectInfo objectInfo = dto.getObjectInfo();
         if(objectInfo.getId() == null){
         if(objectInfo.getId() == null){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("主键不能为空");
             result.setMessage("主键不能为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -340,11 +343,13 @@ public class OkrController {
         if(dto == null || dto.getKrInfo()==null ){
         if(dto == null || dto.getKrInfo()==null ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("参数不能为空");
             result.setMessage("参数不能为空");
+            return result;
         }
         }
         OkrKrInfo krInfo = dto.getKrInfo();
         OkrKrInfo krInfo = dto.getKrInfo();
         if(krInfo.getId() == null){
         if(krInfo.getId() == null){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("主键不能为空");
             result.setMessage("主键不能为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -377,11 +382,13 @@ public class OkrController {
         if(dto == null || dto.getObjectInfo()==null ){
         if(dto == null || dto.getObjectInfo()==null ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("参数不能为空");
             result.setMessage("参数不能为空");
+            return result;
         }
         }
         OkrObjectInfo objectInfo = dto.getObjectInfo();
         OkrObjectInfo objectInfo = dto.getObjectInfo();
         if(objectInfo.getId() == null){
         if(objectInfo.getId() == null){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("主键不能为空");
             result.setMessage("主键不能为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -413,11 +420,13 @@ public class OkrController {
         if(dto == null || dto.getKrInfo()==null ){
         if(dto == null || dto.getKrInfo()==null ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("参数不能为空");
             result.setMessage("参数不能为空");
+            return result;
         }
         }
         OkrKrInfo krInfo = dto.getKrInfo();
         OkrKrInfo krInfo = dto.getKrInfo();
         if(krInfo.getId() == null){
         if(krInfo.getId() == null){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("主键不能为空");
             result.setMessage("主键不能为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -444,11 +453,13 @@ public class OkrController {
         if(dto == null || dto.getContent()==null ){
         if(dto == null || dto.getContent()==null ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("参数不能为空");
             result.setMessage("参数不能为空");
+            return result;
         }
         }
         OkrContentStatus content = dto.getContent();
         OkrContentStatus content = dto.getContent();
         if(content.getId() == null){
         if(content.getId() == null){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("主键不能为空");
             result.setMessage("主键不能为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -476,11 +487,13 @@ public class OkrController {
         if(dto == null || dto.getTaskInfo()==null ){
         if(dto == null || dto.getTaskInfo()==null ){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("参数不能为空");
             result.setMessage("参数不能为空");
+            return result;
         }
         }
         OkrTaskInfo taskInfo = dto.getTaskInfo();
         OkrTaskInfo taskInfo = dto.getTaskInfo();
         if(taskInfo.getId() == null){
         if(taskInfo.getId() == null){
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("主键不能为空");
             result.setMessage("主键不能为空");
+            return result;
         }
         }
 
 
         try {
         try {
@@ -496,4 +509,45 @@ public class OkrController {
         return result;
         return result;
     }
     }
 
 
+    /**
+     * 保存状态指标
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/insertOkrKrInfo")
+    public Result insertOkrKrInfo(@RequestBody OkrDto dto,
+                                                         HttpServletRequest request,
+                                                         HttpServletResponse response){
+        logger.info("/okr/insertOkrKrInfo 方法开始");
+        Result result = new Result();
+
+        if(dto == null || dto.getKrInfo() ==null){
+            result.setSuccess(false);
+            result.setMessage("参数不可为空");
+            return result;
+        }
+
+        OkrKrInfo krInfo = dto.getKrInfo();
+
+        if(krInfo.getObjectId() == null || krInfo.getCompletion() == null || StringUtils.isBlank(krInfo.getKrInfo())){
+            result.setSuccess(false);
+            result.setMessage("参数不可为空");
+            return result;
+        }
+
+        try {
+            okrService.insertOkrKrInfo(dto.getKrInfo());
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/insertOkrKrInfo 方法结束");
+        }
+
+        return result;
+    }
+
 }
 }

+ 2 - 0
src/main/java/cn/com/ctop/okr/service/OkrService.java

@@ -41,4 +41,6 @@ public interface OkrService{
     void deleteContentStatusById(OkrContentStatus content);
     void deleteContentStatusById(OkrContentStatus content);
 
 
     void deleteTaskInfoById(OkrTaskInfo okrTaskInfo);
     void deleteTaskInfoById(OkrTaskInfo okrTaskInfo);
+
+    void insertOkrKrInfo(OkrKrInfo krInfo);
 }
 }

+ 27 - 1
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -230,7 +230,7 @@ public class OkrServiceImpl implements OkrService {
             OkrLog okrKrLog = new OkrLog();
             OkrLog okrKrLog = new OkrLog();
             okrKrLog.setType(1); //操作:1.创建2.修改3.删除
             okrKrLog.setType(1); //操作:1.创建2.修改3.删除
             okrKrLog.setOperation(2);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
             okrKrLog.setOperation(2);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-            okrKrLog.setOperationId(objectInfo.getId());
+            okrKrLog.setOperationId(kr.getId());
             okrKrLog.setYear(year);
             okrKrLog.setYear(year);
             okrKrLog.setQuarter(quarter);
             okrKrLog.setQuarter(quarter);
             okrKrLog.setContent(JSONObject.toJSONString(kr));
             okrKrLog.setContent(JSONObject.toJSONString(kr));
@@ -365,4 +365,30 @@ public class OkrServiceImpl implements OkrService {
         okrLogMapper.insertOkrLog(okrLog);
         okrLogMapper.insertOkrLog(okrLog);
     }
     }
 
 
+    @Override
+    public void insertOkrKrInfo(OkrKrInfo krInfo){
+        //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
+
+        Integer quarter = DateUtils.getQuarter(new Date());
+        Integer year = DateUtils.getYear(new Date());
+
+        krInfo.setYear(year);
+        krInfo.setQuarter(quarter);
+        krInfo.setUserId(userId);
+        okrKrInfoMapper.insertOkrKrInfo(krInfo);
+
+        //日志留存
+        OkrLog okrKrLog = new OkrLog();
+        okrKrLog.setType(1); //操作:1.创建2.修改3.删除
+        okrKrLog.setOperation(2);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
+        okrKrLog.setOperationId(krInfo.getId());
+        okrKrLog.setYear(year);
+        okrKrLog.setQuarter(quarter);
+        okrKrLog.setContent(JSONObject.toJSONString(krInfo));
+        okrKrLog.setUserId(userId);
+        okrLogMapper.insertOkrLog(okrKrLog);
+
+    }
+
 }
 }