浏览代码

OKR业务代码提交

hcst_sunzhen 5 年之前
父节点
当前提交
281248204c

+ 295 - 32
src/main/java/cn/com/ctop/okr/controller/OkrController.java

@@ -2,6 +2,9 @@ package cn.com.ctop.okr.controller;
 
 
 import cn.com.ctop.okr.dto.OkrDto;
 import cn.com.ctop.okr.dto.OkrDto;
 import cn.com.ctop.okr.dto.UserInfoDto;
 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.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;
@@ -94,38 +97,6 @@ public class OkrController {
         return result;
         return result;
     }
     }
 
 
-
-    @ResponseBody
-    @RequestMapping(value = "/saveOrUpdateWeekTask")
-    public Result saveOrUpdateWeekTask(HttpServletRequest request,
-                                       HttpServletResponse response){
-
-
-        return null;
-    }
-
-    @ResponseBody
-    @RequestMapping(value = "/saveOrUpdateNextFourWeekTask")
-    public Result saveOrUpdateNextFourWeekTask(HttpServletRequest request,
-                                               HttpServletResponse response){
-
-
-
-
-
-        return null;
-    }
-
-    @ResponseBody
-    @RequestMapping(value = "/departAndUser")
-    public Result saveOrUpdateContentStatus(HttpServletRequest request,
-                                            HttpServletResponse response){
-
-        return null;
-    }
-
-
-
     @ResponseBody
     @ResponseBody
     @RequestMapping(value = "/getOkrInfo")
     @RequestMapping(value = "/getOkrInfo")
     public Result getOkrInfo(@RequestBody UserInfoDto dto,
     public Result getOkrInfo(@RequestBody UserInfoDto dto,
@@ -233,4 +204,296 @@ public class OkrController {
     }
     }
 
 
 
 
+    /**
+     * 保存状态指标
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/insertContentStatus")
+    public Result<List<UserInfoDto>> insertContentStatus(@RequestBody OkrDto dto,
+                                                         HttpServletRequest request,
+                                                         HttpServletResponse response){
+        logger.info("/okr/insertContentStatus 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        try {
+            okrService.insertContentStatus(dto.getContent());
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/insertContentStatus 方法结束");
+        }
+
+        return result;
+    }
+
+    /**
+     * 更新状态指标
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/updateContentStatus")
+    public Result<List<UserInfoDto>> updateContentStatus(@RequestBody OkrDto dto,
+                                                         HttpServletRequest request,
+                                                         HttpServletResponse response){
+        logger.info("/okr/updateContentStatus 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        try {
+            okrService.updateContentStatus(dto.getContent());
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/updateContentStatus 方法结束");
+        }
+
+        return result;
+    }
+
+    /**
+     * 更新状态指标
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/insertObjectAndKrList")
+    public Result<List<UserInfoDto>> insertObjectAndKrList(@RequestBody OkrDto dto,
+                                                         HttpServletRequest request,
+                                                         HttpServletResponse response){
+        logger.info("/okr/insertObjectAndKrList 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        try {
+            okrService.insertObjectAndKrList(dto.getObjectInfo(), dto.getKrList());
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/insertObjectAndKrList 方法结束");
+        }
+
+        return result;
+    }
+
+    /**
+     * 更新状态指标
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/updateObject")
+    public Result<List<UserInfoDto>> updateObject(@RequestBody OkrDto dto,
+                                                           HttpServletRequest request,
+                                                           HttpServletResponse response){
+        logger.info("/okr/updateObject 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        if(dto == null || dto.getObjectInfo()==null ){
+            result.setSuccess(false);
+            result.setMessage("参数不能为空");
+        }
+        OkrObjectInfo objectInfo = dto.getObjectInfo();
+        if(objectInfo.getId() == null){
+            result.setSuccess(false);
+            result.setMessage("主键不能为空");
+        }
+
+        try {
+            okrService.updateObject(objectInfo);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/updateObject 方法结束");
+        }
+
+        return result;
+    }
+
+
+    /**
+     * 更新状态指标
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/updateKr")
+    public Result<List<UserInfoDto>> updateKr(@RequestBody OkrDto dto,
+                                                  HttpServletRequest request,
+                                                  HttpServletResponse response){
+        logger.info("/okr/updateKr 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        if(dto == null || dto.getKrInfo()==null ){
+            result.setSuccess(false);
+            result.setMessage("参数不能为空");
+        }
+        OkrKrInfo krInfo = dto.getKrInfo();
+        if(krInfo.getId() == null){
+            result.setSuccess(false);
+            result.setMessage("主键不能为空");
+        }
+
+        try {
+            okrService.updateKr(krInfo);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/updateKr 方法结束");
+        }
+
+        return result;
+    }
+
+
+    /**逻辑删除Object
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/deleteObjectInfoById")
+    public Result<List<UserInfoDto>> deleteObjectInfoById(@RequestBody OkrDto dto,
+                                                  HttpServletRequest request,
+                                                  HttpServletResponse response){
+        logger.info("/okr/deleteObjectInfoById 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        if(dto == null || dto.getObjectInfo()==null ){
+            result.setSuccess(false);
+            result.setMessage("参数不能为空");
+        }
+        OkrObjectInfo objectInfo = dto.getObjectInfo();
+        if(objectInfo.getId() == null){
+            result.setSuccess(false);
+            result.setMessage("主键不能为空");
+        }
+
+        try {
+            okrService.deleteObjectInfoById(objectInfo);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/deleteObjectInfoById 方法结束");
+        }
+
+        return result;
+    }
+
+    /**逻辑删除Kr
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/deleteKrById")
+    public Result<List<UserInfoDto>> deleteKrById(@RequestBody OkrDto dto,
+                                                          HttpServletRequest request,
+                                                          HttpServletResponse response){
+        logger.info("/okr/deleteKrById 方法开始");
+        Result<List<UserInfoDto>> result = new Result();
+
+        if(dto == null || dto.getKrInfo()==null ){
+            result.setSuccess(false);
+            result.setMessage("参数不能为空");
+        }
+        OkrKrInfo krInfo = dto.getKrInfo();
+        if(krInfo.getId() == null){
+            result.setSuccess(false);
+            result.setMessage("主键不能为空");
+        }
+
+        try {
+            okrService.deleteKrById(krInfo);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/deleteKrById 方法结束");
+        }
+
+        return result;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/deleteContentStatusById")
+    public Result deleteContentStatuaById(@RequestBody OkrDto dto,
+                                          HttpServletRequest request,
+                                          HttpServletResponse response){
+        logger.info("/okr/deleteContentStatusById 方法开始");
+        Result result = new Result();
+
+        if(dto == null || dto.getContent()==null ){
+            result.setSuccess(false);
+            result.setMessage("参数不能为空");
+        }
+        OkrContentStatus content = dto.getContent();
+        if(content.getId() == null){
+            result.setSuccess(false);
+            result.setMessage("主键不能为空");
+        }
+
+        try {
+            okrService.deleteContentStatusById(content);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/deleteContentStatusById 方法结束");
+        }
+
+        return result;
+
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/deleteTaskInfoById")
+    public Result deleteTaskInfoById(@RequestBody OkrDto dto,
+                                          HttpServletRequest request,
+                                          HttpServletResponse response){
+        logger.info("/okr/deleteTaskInfoById 方法开始");
+        Result result = new Result();
+
+        if(dto == null || dto.getTaskInfo()==null ){
+            result.setSuccess(false);
+            result.setMessage("参数不能为空");
+        }
+        OkrTaskInfo taskInfo = dto.getTaskInfo();
+        if(taskInfo.getId() == null){
+            result.setSuccess(false);
+            result.setMessage("主键不能为空");
+        }
+
+        try {
+            okrService.deleteTaskInfoById(taskInfo);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/deleteTaskInfoById 方法结束");
+        }
+
+        return result;
+    }
+
 }
 }

+ 1 - 0
src/main/java/cn/com/ctop/okr/dto/OkrDto.java

@@ -15,5 +15,6 @@ public class OkrDto {
     private OkrTaskInfo taskInfo;
     private OkrTaskInfo taskInfo;
     private OkrObjectInfo objectInfo;
     private OkrObjectInfo objectInfo;
     private List<OkrKrInfo> krList;
     private List<OkrKrInfo> krList;
+    private OkrKrInfo krInfo;
 
 
 }
 }

+ 1 - 0
src/main/java/cn/com/ctop/okr/entity/OkrContentStatus.java

@@ -16,6 +16,7 @@ public class OkrContentStatus {
     private Integer quarter;
     private Integer quarter;
     private Integer year;
     private Integer year;
     private String content;
     private String content;
+    private Integer type;
     private Integer status;
     private Integer status;
     private Date createTime;
     private Date createTime;
     private Date updateTime;
     private Date updateTime;

+ 2 - 0
src/main/java/cn/com/ctop/okr/entity/OkrKrInfo.java

@@ -17,6 +17,8 @@ public class OkrKrInfo {
     private String krInfo;
     private String krInfo;
     private Integer year;
     private Integer year;
     private Integer quarter;
     private Integer quarter;
+    private Integer status;
+    private Integer completion;
     private Date createTime;
     private Date createTime;
     private Date updateTime;
     private Date updateTime;
 }
 }

+ 2 - 0
src/main/java/cn/com/ctop/okr/entity/OkrObjectInfo.java

@@ -16,6 +16,8 @@ public class OkrObjectInfo {
     private String objectInfo;
     private String objectInfo;
     private Integer quarter;
     private Integer quarter;
     private Integer year;
     private Integer year;
+    private Integer status;
+    private Integer completion;
     private Date createTime;
     private Date createTime;
     private Date updateTime;
     private Date updateTime;
 }
 }

+ 2 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrContentStatusMapper.java

@@ -15,4 +15,6 @@ public interface OkrContentStatusMapper extends BaseMapper<OkrContentStatus> {
 
 
     void updateContentStatus(@Param("content")OkrContentStatus content);
     void updateContentStatus(@Param("content")OkrContentStatus content);
 
 
+    void deleteContentStatuaById(@Param("content")OkrContentStatus content);
+
 }
 }

+ 3 - 1
src/main/java/cn/com/ctop/okr/mapper/OkrKrInfoMapper.java

@@ -13,5 +13,7 @@ public interface OkrKrInfoMapper extends BaseMapper<OkrContentStatus> {
 
 
     void updateKrInfo(@Param("kr")OkrKrInfo kr);
     void updateKrInfo(@Param("kr")OkrKrInfo kr);
 
 
-    void insertBatchOkrKrInfo(@Param("krList")List<OkrKrInfo> krList, @Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
+    void insertBatchOkrKrInfo(@Param("krList")List<OkrKrInfo> krList, @Param("userId")String userId, @Param("objectId")Long objectId, @Param("year")Integer year, @Param("quarter")Integer quarter);
+
+    void deleteKrById(@Param("kr")OkrKrInfo kr);
 }
 }

+ 3 - 1
src/main/java/cn/com/ctop/okr/mapper/OkrObjectInfoMapper.java

@@ -9,7 +9,9 @@ import java.util.List;
 public interface OkrObjectInfoMapper extends BaseMapper<OkrObjectInfo> {
 public interface OkrObjectInfoMapper extends BaseMapper<OkrObjectInfo> {
    List<OkrObjectInfo> getQuarterObject(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
    List<OkrObjectInfo> getQuarterObject(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
 
 
-   void insertObjectInfo(@Param("object")OkrObjectInfo object);
+   Long insertObjectInfo(@Param("object")OkrObjectInfo object);
 
 
    void updateObjectInfo(@Param("object")OkrObjectInfo object);
    void updateObjectInfo(@Param("object")OkrObjectInfo object);
+
+   void deleteObjectInfoById(@Param("object")OkrObjectInfo object);
 }
 }

+ 2 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrTaskInfoMapper.java

@@ -13,4 +13,6 @@ public interface OkrTaskInfoMapper extends BaseMapper<OkrTaskInfo> {
 
 
     void updateTaskInfo(@Param("taskInfo")OkrTaskInfo taskInfo);
     void updateTaskInfo(@Param("taskInfo")OkrTaskInfo taskInfo);
 
 
+    void deleteTaskInfoById(@Param("taskInfo")OkrTaskInfo taskInfo);
+
 }
 }

+ 22 - 3
src/main/java/cn/com/ctop/okr/mapper/xml/OkrContentStatusMapper.xml

@@ -13,6 +13,8 @@
         year = #{year}
         year = #{year}
         and
         and
         quarter = #{quarter}
         quarter = #{quarter}
+        and
+        status = 1
     </select>
     </select>
 
 
     <insert id="insertContentStatus">
     <insert id="insertContentStatus">
@@ -23,6 +25,7 @@
                 year,
                 year,
                 quarter,
                 quarter,
                 content,
                 content,
+                type,
                 status
                 status
             )
             )
         values
         values
@@ -31,7 +34,8 @@
                 #{content.year},
                 #{content.year},
                 #{content.quarter},
                 #{content.quarter},
                 #{content.content},
                 #{content.content},
-                #{content.status}
+                #{content.type},
+                1
             )
             )
     </insert>
     </insert>
 
 
@@ -40,11 +44,26 @@
         okr_content_status
         okr_content_status
         set
         set
         content = #{content.content}
         content = #{content.content}
-        and
-        status = #{content.status}
+        ,
+        type = #{content.type}
+        where
+        id = #{content.id}
+    </update>
+
+    <!-- 逻辑删除状态指标 -->
+    <update id="deleteContentStatuaById">
+        update
+        okr_content_status
+        set
+        status = 0
         where
         where
         id = #{content.id}
         id = #{content.id}
     </update>
     </update>
 
 
 
 
+
+
+
+
+
 </mapper>
 </mapper>

+ 20 - 3
src/main/java/cn/com/ctop/okr/mapper/xml/OkrKrInfoMapper.xml

@@ -15,6 +15,8 @@
         year = #{year}
         year = #{year}
         and
         and
         quarter = #{quarter}
         quarter = #{quarter}
+        and
+        status = 1
     </select>
     </select>
 
 
     <insert id="insertBatchOkrKrInfo">
     <insert id="insertBatchOkrKrInfo">
@@ -25,16 +27,20 @@
             object_id,
             object_id,
             kr_info,
             kr_info,
             year,
             year,
-            quarter
+            quarter,
+            status,
+            completion
         )
         )
         values
         values
         <foreach collection="krList" item="kr" separator=",">
         <foreach collection="krList" item="kr" separator=",">
             (
             (
                 #{userId},
                 #{userId},
-                #{kr.objectId},
+                #{objectId},
                 #{kr.krInfo},
                 #{kr.krInfo},
                 #{year},
                 #{year},
-                #{quarter}
+                #{quarter},
+                1,
+                #{kr.completion}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -44,6 +50,17 @@
         okr_kr_info
         okr_kr_info
         set
         set
         kr_info = #{kr.krInfo}
         kr_info = #{kr.krInfo}
+        ,
+        completion = #{kr.completion}
+        where
+        id = #{kr.id}
+    </update>
+
+    <update id="deleteKrById">
+        update
+        okr_kr_info
+        set
+        status = 0
         where
         where
         id = #{kr.id}
         id = #{kr.id}
     </update>
     </update>

+ 20 - 3
src/main/java/cn/com/ctop/okr/mapper/xml/OkrObjectInfoMapper.xml

@@ -13,23 +13,29 @@
         year = #{year}
         year = #{year}
         and
         and
         quarter = #{quarter}
         quarter = #{quarter}
+        and
+        status = 1
     </select>
     </select>
 
 
-    <insert id="insertObjectInfo">
+    <insert id="insertObjectInfo" useGeneratedKeys="true" keyProperty="id">
         insert into
         insert into
         okr_object_info
         okr_object_info
         (
         (
             user_id,
             user_id,
             object_info,
             object_info,
             year,
             year,
-            quarter
+            quarter,
+            status,
+            completion
         )
         )
         values
         values
         (
         (
             #{object.userId},
             #{object.userId},
             #{object.objectInfo},
             #{object.objectInfo},
             #{object.year},
             #{object.year},
-            #{object.quarter}
+            #{object.quarter},
+            1,
+            #{completion}
         )
         )
     </insert>
     </insert>
 
 
@@ -38,8 +44,19 @@
         okr_object_info
         okr_object_info
         set
         set
         object_info = #{object.objectInfo}
         object_info = #{object.objectInfo}
+        ,
+        completion = #{object.completion}
         where
         where
         id = #{object.id}
         id = #{object.id}
     </update>
     </update>
 
 
+    <update id="deleteObjectInfoById">
+        update
+        okr_object_info
+        set
+        status = 0
+        where
+        id=#{object.id}
+    </update>
+
 </mapper>
 </mapper>

+ 16 - 2
src/main/java/cn/com/ctop/okr/mapper/xml/OkrTaskInfoMapper.xml

@@ -15,6 +15,8 @@
         quarter = #{quarter}
         quarter = #{quarter}
         and
         and
         type = #{type}
         type = #{type}
+        and
+        status = 1
     </select>
     </select>
 
 
     <!-- 增加任务 -->
     <!-- 增加任务 -->
@@ -28,7 +30,8 @@
             year,
             year,
             quarter,
             quarter,
             type,
             type,
-            priority
+            priority,
+            status
             )
             )
         values
         values
             (
             (
@@ -38,7 +41,8 @@
             #{taskInfo.year},
             #{taskInfo.year},
             #{taskInfo.quarter},
             #{taskInfo.quarter},
             #{taskInfo.type},
             #{taskInfo.type},
-            #{taskInfo.priority}
+            #{taskInfo.priority},
+            1
             )
             )
     </insert>
     </insert>
 
 
@@ -56,4 +60,14 @@
         id = #{taskInfo.id}
         id = #{taskInfo.id}
     </update>
     </update>
 
 
+    <!-- 逻辑删除任务 -->
+    <update id="deleteTaskInfoById">
+        update
+        okr_task_info
+        set
+        status = 0
+        where
+        id = #{taskInfo.id}
+    </update>
+
 </mapper>
 </mapper>

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

@@ -1,6 +1,10 @@
 package cn.com.ctop.okr.service;
 package cn.com.ctop.okr.service;
 
 
+import cn.com.ctop.okr.dto.OkrDto;
 import cn.com.ctop.okr.dto.UserInfoDto;
 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.OkrTaskInfo;
 
 
 import java.util.List;
 import java.util.List;
@@ -19,4 +23,22 @@ public interface OkrService{
     void insertTaskInfo(OkrTaskInfo taskInfo);
     void insertTaskInfo(OkrTaskInfo taskInfo);
 
 
     void updateTaskInfo(OkrTaskInfo taskInfo);
     void updateTaskInfo(OkrTaskInfo taskInfo);
+
+    void insertContentStatus(OkrContentStatus content);
+
+    void updateContentStatus(OkrContentStatus content);
+
+    void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList);
+
+    void updateObject(OkrObjectInfo objectInfo);
+
+    void updateKr(OkrKrInfo okrKrInfo);
+
+    void deleteObjectInfoById(OkrObjectInfo objectInfo);
+
+    void deleteKrById(OkrKrInfo krInfo);
+
+    void deleteContentStatusById(OkrContentStatus content);
+
+    void deleteTaskInfoById(OkrTaskInfo okrTaskInfo);
 }
 }

+ 31 - 5
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -122,36 +122,44 @@ public class OkrServiceImpl implements OkrService {
     }
     }
 
 
     //保存任务
     //保存任务
+    @Override
     public void insertContentStatus(OkrContentStatus content){
     public void insertContentStatus(OkrContentStatus content){
         //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         content.setUserId(userId);
         content.setUserId(userId);
-        content.setYear(DateUtils.getQuarter(new Date()));
-        content.setQuarter(DateUtils.getYear(new Date()));
+        content.setYear(DateUtils.getYear(new Date()));
+        content.setQuarter(DateUtils.getQuarter(new Date()));
         okrContentStatusMapper.insertContentStatus(content);
         okrContentStatusMapper.insertContentStatus(content);
     }
     }
 
 
     //更新任务
     //更新任务
+    @Override
     public void updateContentStatus(OkrContentStatus content){
     public void updateContentStatus(OkrContentStatus content){
         okrContentStatusMapper.updateContentStatus(content);
         okrContentStatusMapper.updateContentStatus(content);
     }
     }
 
 
     //同时保存O和krList
     //同时保存O和krList
-    public void insertObjectAndKrList(OkrDto okr){
+    @Override
+    public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList){
         //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
 
 
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
         Integer year = DateUtils.getYear(new Date());
 
 
-        okrObjectInfoMapper.insertObjectInfo(okr.getObjectInfo());
-        okrKrInfoMapper.insertBatchOkrKrInfo(okr.getKrList(),userId, year,quarter);
+        objectInfo.setYear(year);
+        objectInfo.setQuarter(quarter);
+        objectInfo.setUserId(userId);
+        okrObjectInfoMapper.insertObjectInfo(objectInfo);
+        okrKrInfoMapper.insertBatchOkrKrInfo(krList,userId, objectInfo.getId(),year,quarter);
     }
     }
 
 
+    @Override
     public void updateObject(OkrObjectInfo objectInfo){
     public void updateObject(OkrObjectInfo objectInfo){
         okrObjectInfoMapper.updateObjectInfo(objectInfo);
         okrObjectInfoMapper.updateObjectInfo(objectInfo);
     }
     }
 
 
+    @Override
     public void updateKr(OkrKrInfo okrKrInfo){
     public void updateKr(OkrKrInfo okrKrInfo){
         okrKrInfoMapper.updateKrInfo(okrKrInfo);
         okrKrInfoMapper.updateKrInfo(okrKrInfo);
     }
     }
@@ -169,6 +177,24 @@ public class OkrServiceImpl implements OkrService {
     }
     }
 
 
 
 
+    @Override
+    public void deleteObjectInfoById(OkrObjectInfo objectInfo){
+        okrObjectInfoMapper.deleteObjectInfoById(objectInfo);
+    }
 
 
+    @Override
+    public void deleteKrById(OkrKrInfo krInfo){
+        okrKrInfoMapper.deleteKrById(krInfo);
+    }
+
+    @Override
+    public void deleteContentStatusById(OkrContentStatus content){
+        okrContentStatusMapper.deleteContentStatuaById(content);
+    }
+
+    @Override
+    public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
+        okrTaskInfoMapper.deleteTaskInfoById(okrTaskInfo);
+    }
 
 
 }
 }