Browse Source

okr逻辑改版

syh 4 years ago
parent
commit
a323f54ae7

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

@@ -79,37 +79,30 @@ public class OkrController {
 
 
         try {
         try {
             okrService.updateTaskInfo(taskInfo);
             okrService.updateTaskInfo(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/updateTaskInfo 方法结束");
+            return result;
         }
         }
 
 
-        return result;
     }
     }
 
 
     @RequestMapping(value = "/getOkrInfo")
     @RequestMapping(value = "/getOkrInfo")
-    public Result getOkrInfo(@RequestBody UserInfoDto dto,
-                             HttpServletRequest request,
-                             HttpServletResponse response){
-        logger.info("okr/getOkrInfo 方法开始");
+    public Result getOkrInfo(@RequestBody UserInfoDto dto){
         Result<Map<String,Object>> result = new Result();
         Result<Map<String,Object>> result = new Result();
         result.setSuccess(true);
         result.setSuccess(true);
-
         try {
         try {
             Map<String, Object> map = okrService.getOkrInfo(dto);
             Map<String, Object> map = okrService.getOkrInfo(dto);
             result.setResult(map);
             result.setResult(map);
+            return result;
         }catch(Exception e){
         }catch(Exception e){
             e.printStackTrace();
             e.printStackTrace();
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("error");
             result.setMessage("error");
-        }finally {
-            logger.info("okr/getOkrInfo 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     @RequestMapping(value = "/detail")
     @RequestMapping(value = "/detail")
@@ -129,10 +122,7 @@ public class OkrController {
     }
     }
 
 
     @RequestMapping(value = "/saveOkrMember")
     @RequestMapping(value = "/saveOkrMember")
-    public Result saveOkrMember(@RequestBody UserInfoDto dto,
-                             HttpServletRequest request,
-                             HttpServletResponse response){
-        logger.info("/okr/saveOkrMember 方法开始");
+    public Result saveOkrMember(@RequestBody UserInfoDto dto){
         Result result = new Result();
         Result result = new Result();
         List<String> userIdList = dto.getUserIdList();
         List<String> userIdList = dto.getUserIdList();
         if(userIdList == null || userIdList.size() == 0){
         if(userIdList == null || userIdList.size() == 0){
@@ -143,23 +133,19 @@ public class OkrController {
 
 
         try {
         try {
             okrService.insertOkrMember(userIdList);
             okrService.insertOkrMember(userIdList);
+            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/saveOkrMember 方法结束");
+            return result;
         }
         }
 
 
-        return result;
     }
     }
 
 
     @ResponseBody
     @ResponseBody
     @RequestMapping(value = "/deleteOkrMember")
     @RequestMapping(value = "/deleteOkrMember")
-    public Result deleteOkrMember(@RequestBody UserInfoDto dto,
-                                HttpServletRequest request,
-                                HttpServletResponse response){
-        logger.info("/okr/deleteOkrMember 方法开始");
+    public Result deleteOkrMember(@RequestBody UserInfoDto dto){
         Result result = new Result();
         Result result = new Result();
         if(dto == null || StringUtils.isBlank(dto.getMemberId())){
         if(dto == null || StringUtils.isBlank(dto.getMemberId())){
             result.setSuccess(false);
             result.setSuccess(false);
@@ -169,23 +155,19 @@ public class OkrController {
 
 
         try {
         try {
             okrService.deleteOkrMember(dto.getMemberId());
             okrService.deleteOkrMember(dto.getMemberId());
+            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/deleteOkrMember 方法结束");
+            return result;
         }
         }
 
 
-        return result;
     }
     }
 
 
     @ResponseBody
     @ResponseBody
     @RequestMapping(value = "/saveOkrMember2")
     @RequestMapping(value = "/saveOkrMember2")
-    public Result saveOkrMember2(@RequestBody UserInfoDto dto,
-                                HttpServletRequest request,
-                                HttpServletResponse response){
-        logger.info("/okr/saveOkrMember2 方法开始");
+    public Result saveOkrMember2(@RequestBody UserInfoDto dto){
         Result result = new Result();
         Result result = new Result();
         List<String> userIdList = dto.getUserIdList();
         List<String> userIdList = dto.getUserIdList();
         if(userIdList == null || userIdList.size() == 0){
         if(userIdList == null || userIdList.size() == 0){
@@ -201,9 +183,6 @@ public class OkrController {
             int filter = 0;
             int filter = 0;
             for (UserInfoDto memberInfo:memberList){
             for (UserInfoDto memberInfo:memberList){
                 if(StringUtils.equals(userId,memberInfo.getUserId())){
                 if(StringUtils.equals(userId,memberInfo.getUserId())){
-                    //result.setSuccess(false);
-                    //result.setMessage(memberInfo.getName() + "已是同步人,请重新选择");
-                    //return result;
                     filter = -1;
                     filter = -1;
                     break;
                     break;
                 }
                 }
@@ -216,42 +195,32 @@ public class OkrController {
 
 
         try {
         try {
             okrService.insertOkrMember2(userListFilter);
             okrService.insertOkrMember2(userListFilter);
+            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/saveOkrMember2 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     /**
     /**
      * @param dto
      * @param dto
-     * @param request
-     * @param response
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/getMemberListByUserId")
     @RequestMapping(value = "/getMemberListByUserId")
-    public Result<List<UserInfoDto>> getMemberListByUserId(@RequestBody UserInfoDto dto,
-                                HttpServletRequest request,
-                                HttpServletResponse response){
-        logger.info("/okr/getMemberListByUserId 方法开始");
+    public Result<List<UserInfoDto>> getMemberListByUserId(@RequestBody UserInfoDto dto){
         Result<List<UserInfoDto>> result = new Result();
         Result<List<UserInfoDto>> result = new Result();
-
         try {
         try {
             List<UserInfoDto> userInfoList = okrService.getMemberListByUserId(dto.getName());
             List<UserInfoDto> userInfoList = okrService.getMemberListByUserId(dto.getName());
             result.setResult(userInfoList);
             result.setResult(userInfoList);
+            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/getMemberListByUserId 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
 
 
@@ -278,54 +247,39 @@ public class OkrController {
 
 
     /**
     /**
      * 保存状态指标
      * 保存状态指标
-     * @param request
-     * @param response
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/insertContentStatus")
     @RequestMapping(value = "/insertContentStatus")
-    public Result<List<UserInfoDto>> insertContentStatus(@RequestBody OkrDto dto,
-                                                         HttpServletRequest request,
-                                                         HttpServletResponse response){
-        logger.info("/okr/insertContentStatus 方法开始");
+    public Result<List<UserInfoDto>> insertContentStatus(@RequestBody OkrDto dto){
         Result<List<UserInfoDto>> result = new Result();
         Result<List<UserInfoDto>> result = new Result();
-
         try {
         try {
             okrService.insertContentStatus(dto.getContent());
             okrService.insertContentStatus(dto.getContent());
+            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/insertContentStatus 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     /**
     /**
      * 更新状态指标
      * 更新状态指标
-     * @param request
-     * @param response
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/updateContentStatus")
     @RequestMapping(value = "/updateContentStatus")
-    public Result<List<UserInfoDto>> updateContentStatus(@RequestBody OkrDto dto,
-                                                         HttpServletRequest request,
-                                                         HttpServletResponse response){
+    public Result<List<UserInfoDto>> updateContentStatus(@RequestBody OkrDto dto){
         logger.info("/okr/updateContentStatus 方法开始");
         logger.info("/okr/updateContentStatus 方法开始");
         Result<List<UserInfoDto>> result = new Result();
         Result<List<UserInfoDto>> result = new Result();
-
         try {
         try {
             okrService.updateContentStatus(dto.getContent());
             okrService.updateContentStatus(dto.getContent());
+            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/updateContentStatus 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     /**
     /**
@@ -338,15 +292,13 @@ public class OkrController {
         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());
+            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/insertObjectAndKrList 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     /**
     /**
@@ -434,15 +386,13 @@ public class OkrController {
         }
         }
         try {
         try {
             okrService.deleteObjectInfoById(objectInfo);
             okrService.deleteObjectInfoById(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/deleteObjectInfoById 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     /**逻辑删除Kr
     /**逻辑删除Kr
@@ -466,15 +416,13 @@ public class OkrController {
 
 
         try {
         try {
             okrService.deleteKrById(krInfo);
             okrService.deleteKrById(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/deleteKrById 方法结束");
+            return result;
         }
         }
-
-        return result;
     }
     }
 
 
     @RequestMapping(value = "/deleteContentStatusById")
     @RequestMapping(value = "/deleteContentStatusById")
@@ -521,25 +469,22 @@ public class OkrController {
 
 
         try {
         try {
             okrService.deleteTaskInfoById(taskInfo);
             okrService.deleteTaskInfoById(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/deleteTaskInfoById 方法结束");
+            return result;
         }
         }
 
 
-        return result;
     }
     }
 
 
     /**
     /**
      * 保存状态指标
      * 保存状态指标
-     * @param request
-     * @param response
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/insertOkrKrInfo")
     @RequestMapping(value = "/insertOkrKrInfo")
-    public Result insertOkrKrInfo(@RequestBody OkrDto dto, HttpServletRequest request, HttpServletResponse response){
+    public Result insertOkrKrInfo(@RequestBody OkrDto dto){
         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);

+ 1 - 1
src/main/java/cn/com/ctop/okr/controller/OkrFocusInfoController.java

@@ -62,7 +62,7 @@ public class OkrFocusInfoController {
 													 HttpServletRequest req) {
 													 HttpServletRequest req) {
 		Result<IPage<OkrFocusInfo>> result = new Result<>();
 		Result<IPage<OkrFocusInfo>> result = new Result<>();
 		QueryWrapper<OkrFocusInfo> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<OkrFocusInfo> queryWrapper = new QueryWrapper<>();
-		Page<OkrFocusInfo> page = new Page<OkrFocusInfo>(pageNo, pageSize);
+		Page<OkrFocusInfo> page = new Page<>(pageNo, pageSize);
 		IPage<OkrFocusInfo> pageList = okrFocusInfoService.page(page, queryWrapper);
 		IPage<OkrFocusInfo> pageList = okrFocusInfoService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);

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

@@ -5,7 +5,7 @@ import cn.com.ctop.okr.entity.OkrLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
-public interface OkrLogMapper extends BaseMapper<OkrContentStatus> {
+public interface OkrLogMapper extends BaseMapper<OkrLog> {
 
 
     void insertOkrLog(@Param("okrLog")OkrLog okrLog);
     void insertOkrLog(@Param("okrLog")OkrLog okrLog);
 
 

+ 2 - 1
src/main/java/cn/com/ctop/okr/mapper/OkrMemberMapper.java

@@ -2,12 +2,13 @@ package cn.com.ctop.okr.mapper;
 
 
 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.OkrContentStatus;
+import cn.com.ctop.okr.entity.OkrMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
-public interface OkrMemberMapper extends BaseMapper<OkrContentStatus> {
+public interface OkrMemberMapper extends BaseMapper<OkrMember> {
     void deleteOkrMemberByUserId(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
     void deleteOkrMemberByUserId(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
 
 
     void deleteOkrMemberByUserId2(@Param("userId")String userId, @Param("memberId")String memberId,@Param("year")Integer year, @Param("quarter")Integer quarter);
     void deleteOkrMemberByUserId2(@Param("userId")String userId, @Param("memberId")String memberId,@Param("year")Integer year, @Param("quarter")Integer quarter);

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

@@ -51,10 +51,9 @@
     </update>
     </update>
 
 
     <update id="deleteObjectInfoById">
     <update id="deleteObjectInfoById">
-        update
-        okr_object_info
-        set
-        status = 0
+        delete
+            from
+            okr_object_info
         where
         where
         id=#{object.id}
         id=#{object.id}
     </update>
     </update>

+ 8 - 0
src/main/java/cn/com/ctop/okr/service/IOkrLogService.java

@@ -0,0 +1,8 @@
+package cn.com.ctop.okr.service;
+
+import cn.com.ctop.okr.entity.OkrLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IOkrLogService extends IService<OkrLog> {
+    void insertOkrLog(int type,int opration,Long oprationId,int year,int quarter,String content,String userId );
+}

+ 18 - 0
src/main/java/cn/com/ctop/okr/service/IOkrObjectInfoService.java

@@ -5,6 +5,24 @@ import cn.com.ctop.okr.entity.OkrObjectInfoRemind;
 import cn.com.ctop.okr.entity.QYWxUserInfo;
 import cn.com.ctop.okr.entity.QYWxUserInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
+
 public interface IOkrObjectInfoService extends IService<OkrObjectInfo> {
 public interface IOkrObjectInfoService extends IService<OkrObjectInfo> {
     OkrObjectInfo getByParams(String userId, Integer year, Integer quarter);
     OkrObjectInfo getByParams(String userId, Integer year, Integer quarter);
+
+    List<OkrObjectInfo> getQuarterObject(String userId, Integer year, Integer quarter);
+
+    void insertObjectInfo(OkrObjectInfo objectInfo,String userId,Integer year,Integer quarter);
+
+    void updateObjectInfo(OkrObjectInfo objectInfo);
+
+    List<OkrObjectInfo> getAllQuarterObject(String name, Integer year, Integer quarter, int startIndex, Integer pageSize);
+
+    List<OkrObjectInfo> getFollowQuarterObject(String name, Integer year, Integer quarter, int startIndex, Integer pageSize);
+
+    List<OkrObjectInfo> getDepartmentQuarterObject(String openId, String name, Integer year, Integer quarter, int startIndex, Integer pageSize);
+
+    void deleteObjectInfoById(OkrObjectInfo objectInfo);
+
+    List<Integer> getObjectYear();
 }
 }

+ 28 - 0
src/main/java/cn/com/ctop/okr/service/impl/OkrLogServiceImpl.java

@@ -0,0 +1,28 @@
+package cn.com.ctop.okr.service.impl;
+
+import cn.com.ctop.okr.entity.OkrLog;
+import cn.com.ctop.okr.mapper.OkrLogMapper;
+import cn.com.ctop.okr.service.IOkrLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OkrLogServiceImpl extends ServiceImpl<OkrLogMapper, OkrLog> implements IOkrLogService {
+    @Autowired OkrLogMapper okrLogMapper;
+    @Override
+    public void insertOkrLog(int type,int opration,Long oprationId,int year,int quarter,String content,String userId ){
+        OkrLog okrKrLog = new OkrLog();
+        //操作:1.创建2.修改3.删除
+        okrKrLog.setType(type);
+        //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
+        okrKrLog.setOperation(opration);
+        //操作id
+        okrKrLog.setOperationId(oprationId);
+        okrKrLog.setYear(year);
+        okrKrLog.setQuarter(quarter);
+        okrKrLog.setContent(content);
+        okrKrLog.setUserId(userId);
+        okrLogMapper.insertOkrLog(okrKrLog);
+    }
+}

+ 50 - 0
src/main/java/cn/com/ctop/okr/service/impl/OkrObjectInfoServiceImpl.java

@@ -3,12 +3,19 @@ package cn.com.ctop.okr.service.impl;
 import cn.com.ctop.okr.entity.OkrObjectInfo;
 import cn.com.ctop.okr.entity.OkrObjectInfo;
 import cn.com.ctop.okr.mapper.OkrObjectInfoMapper;
 import cn.com.ctop.okr.mapper.OkrObjectInfoMapper;
 import cn.com.ctop.okr.service.IOkrObjectInfoService;
 import cn.com.ctop.okr.service.IOkrObjectInfoService;
+import cn.com.ctop.okr.utils.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 @Service
 public class OkrObjectInfoServiceImpl extends ServiceImpl<OkrObjectInfoMapper, OkrObjectInfo> implements IOkrObjectInfoService {
 public class OkrObjectInfoServiceImpl extends ServiceImpl<OkrObjectInfoMapper, OkrObjectInfo> implements IOkrObjectInfoService {
+    @Autowired
+    private OkrObjectInfoMapper objectInfoMapper;
     @Override
     @Override
     public OkrObjectInfo getByParams(String userId, Integer year, Integer quarter) {
     public OkrObjectInfo getByParams(String userId, Integer year, Integer quarter) {
         QueryWrapper<OkrObjectInfo>queryWrapper = new QueryWrapper<>();
         QueryWrapper<OkrObjectInfo>queryWrapper = new QueryWrapper<>();
@@ -16,4 +23,47 @@ public class OkrObjectInfoServiceImpl extends ServiceImpl<OkrObjectInfoMapper, O
         queryWrapper.orderByDesc("create_time").last("limit 1");
         queryWrapper.orderByDesc("create_time").last("limit 1");
         return this.getOne(queryWrapper);
         return this.getOne(queryWrapper);
     }
     }
+
+    @Override
+    public List<OkrObjectInfo> getQuarterObject(String userId, Integer year, Integer quarter) {
+        return objectInfoMapper.getQuarterObject(userId,year,quarter);
+    }
+
+    @Override
+    public void insertObjectInfo(OkrObjectInfo objectInfo,String userId,Integer year,Integer quarter) {
+        objectInfo.setQuarter(quarter);
+        objectInfo.setYear(year);
+        objectInfo.setUserId(userId);
+        objectInfoMapper.insertObjectInfo(objectInfo);
+    }
+
+    @Override
+    public void updateObjectInfo(OkrObjectInfo objectInfo) {
+        objectInfoMapper.updateObjectInfo(objectInfo);
+    }
+
+    @Override
+    public List<OkrObjectInfo> getAllQuarterObject(String name, Integer year, Integer quarter, int startIndex, Integer pageSize) {
+        return objectInfoMapper.getAllQuarterObject(name,year,quarter,startIndex,pageSize);
+    }
+
+    @Override
+    public List<OkrObjectInfo> getFollowQuarterObject(String name, Integer year, Integer quarter, int startIndex, Integer pageSize) {
+        return objectInfoMapper.getFollowQuarterObject(name,year,quarter,startIndex,pageSize);
+    }
+
+    @Override
+    public List<OkrObjectInfo> getDepartmentQuarterObject(String openId, String name, Integer year, Integer quarter, int startIndex, Integer pageSize) {
+        return objectInfoMapper.getDepartmentQuarterObject(openId,name,year,quarter,startIndex,pageSize);
+    }
+
+    @Override
+    public void deleteObjectInfoById(OkrObjectInfo objectInfo) {
+        objectInfoMapper.deleteObjectInfoById(objectInfo);
+    }
+
+    @Override
+    public List<Integer> getObjectYear() {
+        return objectInfoMapper.getObjectYear();
+    }
 }
 }

+ 119 - 317
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -8,7 +8,6 @@ import cn.com.ctop.okr.utils.DateUtils;
 import cn.com.ctop.okr.utils.ResultMapUtils;
 import cn.com.ctop.okr.utils.ResultMapUtils;
 import cn.com.ctop.okr.utils.StatusCode;
 import cn.com.ctop.okr.utils.StatusCode;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
-import com.xxl.job.core.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,17 +23,23 @@ public class OkrServiceImpl implements OkrService {
     @Autowired
     @Autowired
     private OkrKrInfoMapper okrKrInfoMapper;
     private OkrKrInfoMapper okrKrInfoMapper;
     @Autowired
     @Autowired
-    private OkrLogMapper okrLogMapper;
-    @Autowired
     private OkrMemberMapper okrMemberMapper;
     private OkrMemberMapper okrMemberMapper;
     @Autowired
     @Autowired
-    private OkrObjectInfoMapper okrObjectInfoMapper;
+    private IOkrObjectInfoService okrObjectInfoService;
     @Autowired
     @Autowired
     private IOkrTaskInfoService okrTaskInfoService;
     private IOkrTaskInfoService okrTaskInfoService;
     @Autowired
     @Autowired
     private QYWxUserInfoMapper wxUserInfoMapper;
     private QYWxUserInfoMapper wxUserInfoMapper;
     @Autowired
     @Autowired
+    private IOkrTaskInfoDisclosureService okrTaskInfoDisclosureService;
+    @Autowired
+    private IOkrTaskInfoRemindService okrTaskInfoRemindService;
+    @Autowired
     private IOkrObjectInfoService objectInfoService;
     private IOkrObjectInfoService objectInfoService;
+    @Autowired
+    IOkrLogService okrLogService;
+
+
     @Override
     @Override
     public Map<String, Object> getOkrInfo(UserInfoDto data){
     public Map<String, Object> getOkrInfo(UserInfoDto data){
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
@@ -53,10 +58,10 @@ public class OkrServiceImpl implements OkrService {
 
 
         //未来四周任务信息
         //未来四周任务信息
         List<OkrTaskInfo> taskFourWeekList = okrTaskInfoService.getTaskInfo(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter(), 2);
         List<OkrTaskInfo> taskFourWeekList = okrTaskInfoService.getTaskInfo(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter(), 2);
-        List<OkrTaskInfo>settaskFourWeekList =checkTaskInfo(taskInfoList,currentUserId);
+        List<OkrTaskInfo>setTaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
 
 
         //OKR信息
         //OKR信息
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getQuarterObject(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getQuarterObject(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
         List<Map<String, Object>> okrList = new ArrayList<>();
         List<Map<String, Object>> okrList = new ArrayList<>();
         for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
         for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
             Map<String, Object> okrMap = new HashMap<>();
             Map<String, Object> okrMap = new HashMap<>();
@@ -74,7 +79,7 @@ public class OkrServiceImpl implements OkrService {
         timeMap.put("quarter",objectInfo.getQuarter());
         timeMap.put("quarter",objectInfo.getQuarter());
         result.put("time", timeMap);
         result.put("time", timeMap);
         result.put("taskInfoList",setTaskList);
         result.put("taskInfoList",setTaskList);
-        result.put("taskFourWeekList",settaskFourWeekList);
+        result.put("taskFourWeekList",setTaskFourWeekList);
         result.put("okr",okrList);
         result.put("okr",okrList);
         result.put("status", contentStatusList);
         result.put("status", contentStatusList);
         return result;
         return result;
@@ -100,11 +105,8 @@ public class OkrServiceImpl implements OkrService {
     public void insertOkrMember(List<String> memberList){
     public void insertOkrMember(List<String> memberList){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //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());
-
         okrMemberMapper.deleteOkrMemberByUserId(userId,year,quarter);
         okrMemberMapper.deleteOkrMemberByUserId(userId,year,quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
     }
     }
@@ -113,12 +115,8 @@ public class OkrServiceImpl implements OkrService {
     public void insertOkrMember2(List<String> memberList){
     public void insertOkrMember2(List<String> memberList){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //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());
-
-        //okrMemberMapper.deleteOkrMemberByUserId2(userId,memyear,quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
     }
     }
 
 
@@ -126,31 +124,20 @@ public class OkrServiceImpl implements OkrService {
     public void deleteOkrMember(String memberId){
     public void deleteOkrMember(String memberId){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
         Integer year = DateUtils.getYear(new Date());
-
         okrMemberMapper.deleteOkrMemberByUserId2(userId, memberId, year, quarter);
         okrMemberMapper.deleteOkrMemberByUserId2(userId, memberId, year, quarter);
-
     }
     }
-
     @Override
     @Override
     public List<UserInfoDto> getMemberListByUserId(String name){
     public List<UserInfoDto> getMemberListByUserId(String name){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //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());
-
         return okrMemberMapper.getMemberListByUserId(userId, name, year, quarter);
         return okrMemberMapper.getMemberListByUserId(userId, name, year, quarter);
     }
     }
-
-    @Autowired
-    private IOkrTaskInfoDisclosureService okrTaskInfoDisclosureService;
-    @Autowired
-    private IOkrTaskInfoRemindService okrTaskInfoRemindService;
     //保存任务
     //保存任务
+
     @Override
     @Override
     public void insertTaskInfo(OkrTaskInfo taskInfo){
     public void insertTaskInfo(OkrTaskInfo taskInfo){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -161,8 +148,20 @@ public class OkrServiceImpl implements OkrService {
         taskInfo.setYear(year);
         taskInfo.setYear(year);
         taskInfo.setQuarter(quarter);
         taskInfo.setQuarter(quarter);
         okrTaskInfoService.insertTaskInfo(taskInfo);
         okrTaskInfoService.insertTaskInfo(taskInfo);
-        if(null!=taskInfo.getPublicIds()&&!taskInfo.getPublicIds().isEmpty()){
-            List<String>publicIds = taskInfo.getPublicIds();
+
+        insertTaskPublicIds(taskInfo,taskInfo.getPublicIds());
+        insertTaskRemindIds(taskInfo,taskInfo.getRemindIds());
+        //日志留存
+        Integer opration;
+        if(taskInfo.getType() == 1){
+            opration = 3;
+        }else{
+            opration = 4;
+        }
+        okrLogService.insertOkrLog(1,opration,taskInfo.getId(),year,quarter,JSONObject.toJSONString(taskInfo),userId);
+    }
+    private void insertTaskPublicIds(OkrTaskInfo taskInfo,List<String>publicIds){
+        if(null!=publicIds&&!publicIds.isEmpty()){
             for(String publicId:publicIds){
             for(String publicId:publicIds){
                 OkrTaskInfoDisclosure disclosure = new OkrTaskInfoDisclosure();
                 OkrTaskInfoDisclosure disclosure = new OkrTaskInfoDisclosure();
                 disclosure.setExtraId(publicId);
                 disclosure.setExtraId(publicId);
@@ -180,8 +179,9 @@ public class OkrServiceImpl implements OkrService {
                 okrTaskInfoDisclosureService.save(disclosure);
                 okrTaskInfoDisclosureService.save(disclosure);
             }
             }
         }
         }
-        if(null!=taskInfo.getRemindIds()&&!taskInfo.getRemindIds().isEmpty()){
-            List<String>remindIds = taskInfo.getRemindIds();
+    }
+    private void insertTaskRemindIds(OkrTaskInfo taskInfo,List<String>remindIds){
+        if(null!=remindIds&&!remindIds.isEmpty()){
             for(String remindId:remindIds){
             for(String remindId:remindIds){
                 OkrTaskInfoRemind remind = new OkrTaskInfoRemind();
                 OkrTaskInfoRemind remind = new OkrTaskInfoRemind();
                 remind.setExtraId(remindId);
                 remind.setExtraId(remindId);
@@ -199,25 +199,9 @@ public class OkrServiceImpl implements OkrService {
                 okrTaskInfoRemindService.save(remind);
                 okrTaskInfoRemindService.save(remind);
             }
             }
         }
         }
-        //日志留存
-        OkrLog okrLog = new OkrLog();
-        //操作:1.创建2.修改3.删除
-        okrLog.setType(1);
-        if(taskInfo.getType() == 1){
-            //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-            okrLog.setOperation(3);
-        }else{
-            okrLog.setOperation(4);
-        }
-        okrLog.setOperationId(taskInfo.getId());
-        okrLog.setYear(year);
-        okrLog.setQuarter(quarter);
-        okrLog.setContent(JSONObject.toJSONString(taskInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
     }
     }
-
     //更新任务
     //更新任务
+
     @Override
     @Override
     public void updateTaskInfo(OkrTaskInfo taskInfo){
     public void updateTaskInfo(OkrTaskInfo taskInfo){
         List<String>publicIds = taskInfo.getRemindIds();
         List<String>publicIds = taskInfo.getRemindIds();
@@ -229,184 +213,90 @@ public class OkrServiceImpl implements OkrService {
         taskInfo = okrTaskInfoService.selectById(taskInfo.getId());
         taskInfo = okrTaskInfoService.selectById(taskInfo.getId());
         okrTaskInfoDisclosureService.deleteByTaskId(taskInfo.getId());
         okrTaskInfoDisclosureService.deleteByTaskId(taskInfo.getId());
         okrTaskInfoRemindService.deleteByTaskId(taskInfo.getId());
         okrTaskInfoRemindService.deleteByTaskId(taskInfo.getId());
-        if(null!=publicIds&&!publicIds.isEmpty()){
-            for(String publicId:publicIds){
-                OkrTaskInfoDisclosure disclosure = new OkrTaskInfoDisclosure();
-                disclosure.setExtraId(publicId);
-                String[] ids = publicId.split("##");
-                disclosure.setOkrTaskId(taskInfo.getId());
-                //部门
-                if(ids.length == 1){
-                    disclosure.setPublicType(1);
-                }
-                if(ids.length == 2){
-                    disclosure.setPublicType(2);
-                }
-                disclosure.setPublicId(ids[0]);
-                disclosure.setStatus(1);
-                okrTaskInfoDisclosureService.save(disclosure);
-            }
-        }
-        if(null!=remindIds&&!remindIds.isEmpty()){
-            for(String remindId:remindIds){
-                OkrTaskInfoRemind remind = new OkrTaskInfoRemind();
-                remind.setExtraId(remindId);
-                String[] ids = remindId.split("##");
-                remind.setOkrTaskId(taskInfo.getId());
-                //部门
-                if(ids.length == 1){
-                    remind.setRemindType(1);
-                }
-                if(ids.length == 2){
-                    remind.setRemindType(2);
-                }
-                remind.setRemindId(ids[0]);
-                remind.setStatus(1);
-                okrTaskInfoRemindService.save(remind);
-            }
-        }
+        insertTaskPublicIds(taskInfo,publicIds);
+        insertTaskRemindIds(taskInfo,remindIds);
 
 
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        //操作:1.创建2.修改3.删除
-        okrLog.setType(2);
+        Integer operation;
         if(taskInfo.getType() == 1){
         if(taskInfo.getType() == 1){
-            //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-            okrLog.setOperation(3);
+            operation = 3;
         }else{
         }else{
-            okrLog.setOperation(4);
-        }
-        okrLog.setOperationId(taskInfo.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(taskInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+            operation = 4;
+        }
+        okrLogService.insertOkrLog(2,operation,taskInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(taskInfo),userId);
     }
     }
-
     //保存任务
     //保存任务
+
     @Override
     @Override
     public void insertContentStatus(OkrContentStatus content){
     public void insertContentStatus(OkrContentStatus content){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         content.setUserId(userId);
         content.setUserId(userId);
         content.setYear(DateUtils.getYear(new Date()));
         content.setYear(DateUtils.getYear(new Date()));
         content.setQuarter(DateUtils.getQuarter(new Date()));
         content.setQuarter(DateUtils.getQuarter(new Date()));
         okrContentStatusMapper.insertContentStatus(content);
         okrContentStatusMapper.insertContentStatus(content);
 
 
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        //操作:1.创建2.修改3.删除
-        okrLog.setType(1);
-        //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperation(5);
-        okrLog.setOperationId(content.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(content));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(1,5,content.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(content),userId);
     }
     }
-
     //更新任务
     //更新任务
+
     @Override
     @Override
     public void updateContentStatus(OkrContentStatus content){
     public void updateContentStatus(OkrContentStatus content){
         okrContentStatusMapper.updateContentStatus(content);
         okrContentStatusMapper.updateContentStatus(content);
-
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(2); //操作:1.创建2.修改3.删除
-        okrLog.setOperation(5);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperationId(content.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(content));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(2,5,content.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(content),userId);
     }
     }
-
     //同时保存O和krList
     //同时保存O和krList
+
     @Override
     @Override
     public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList){
     public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //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());
-
-        objectInfo.setYear(year);
-        objectInfo.setQuarter(quarter);
-        objectInfo.setUserId(userId);
-        okrObjectInfoMapper.insertObjectInfo(objectInfo);
+        okrObjectInfoService.insertObjectInfo(objectInfo,userId,year,quarter);
         //日志留存
         //日志留存
-        OkrLog okrObjectLog = new OkrLog();
-        okrObjectLog.setType(1); //操作:1.创建2.修改3.删除
-        okrObjectLog.setOperation(1);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrObjectLog.setOperationId(objectInfo.getId());
-        okrObjectLog.setYear(DateUtils.getYear(new Date()));
-        okrObjectLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrObjectLog.setContent(JSONObject.toJSONString(objectInfo));
-        okrObjectLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrObjectLog);
-        //
-
-        // 由于需要返回主键id作为日志留存,故放弃批量插入的接口
-        // okrKrInfoMapper.insertBatchOkrKrInfo(krList,userId, objectInfo.getId(),year,quarter);
-        for(OkrKrInfo kr:krList){
-            kr.setUserId(userId);
-            kr.setObjectId(objectInfo.getId());
-            kr.setYear(year);
-            kr.setQuarter(quarter);
-            okrKrInfoMapper.insertOkrKrInfo(kr);
-
+        okrLogService.insertOkrLog(1,1,objectInfo.getId(),year,quarter,JSONObject.toJSONString(objectInfo),userId);
+
+        for(OkrKrInfo krInfo:krList){
+            krInfo.setUserId(userId);
+            krInfo.setObjectId(objectInfo.getId());
+            krInfo.setYear(year);
+            krInfo.setQuarter(quarter);
+            okrKrInfoMapper.insertOkrKrInfo(krInfo);
+            insertKrPublicIds(krInfo,krInfo.getPublicIds());
+            insertKrRemindIds(krInfo,krInfo.getRemindIds());
             //日志留存
             //日志留存
-            OkrLog okrKrLog = new OkrLog();
-            okrKrLog.setType(1); //操作:1.创建2.修改3.删除
-            okrKrLog.setOperation(2);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-            okrKrLog.setOperationId(kr.getId());
-            okrKrLog.setYear(year);
-            okrKrLog.setQuarter(quarter);
-            okrKrLog.setContent(JSONObject.toJSONString(kr));
-            okrKrLog.setUserId(userId);
-            okrLogMapper.insertOkrLog(okrKrLog);
+            okrLogService.insertOkrLog(1,2,krInfo.getId(),year,quarter,JSONObject.toJSONString(krInfo),userId);
         }
         }
     }
     }
 
 
-    @Override
-    public void updateObject(OkrObjectInfo objectInfo){
-        okrObjectInfoMapper.updateObjectInfo(objectInfo);
-
-        QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
-        String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
-        //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(2); //操作:1.创建2.修改3.删除
-        okrLog.setOperation(1);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperationId(objectInfo.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(objectInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+    private void insertKrRemindIds(OkrKrInfo krInfo,List<String>remindIds){
+        if(null!=remindIds&&!remindIds.isEmpty()){
+            for(String remindId:remindIds){
+                OkrObjectInfoRemind remind = new OkrObjectInfoRemind();
+                remind.setExtraId(remindId);
+                String[] ids = remindId.split("##");
+                remind.setKrId(krInfo.getId());
+                //部门
+                if(ids.length == 1){
+                    remind.setRemindType(1);
+                }
+                if(ids.length == 2){
+                    remind.setRemindType(2);
+                }
+                remind.setRemindId(ids[0]);
+                remind.setStatus(1);
+                okrObjectInfoRemindService.save(remind);
+            }
+        }
     }
     }
-    @Autowired
-    private IKrInfoservice krInfoservice;
-    @Override
-    public void updateKr(OkrKrInfo krInfo){
-        List<String>publicIds = krInfo.getPublicIds();
-        List<String>remindIds = krInfo.getRemindIds();
-        krInfoservice.updateKrInfo(krInfo);
-        okrObjectInfoDisclosureService.deleteByKrId(krInfo.getId());
-        okrObjectInfoRemindService.deleteByKrId(krInfo.getId());
+    private void insertKrPublicIds(OkrKrInfo krInfo,List<String>publicIds){
         if(null!=publicIds&&!publicIds.isEmpty()){
         if(null!=publicIds&&!publicIds.isEmpty()){
             for(String publicId:publicIds){
             for(String publicId:publicIds){
                 OkrObjectInfoDisclosure disclosure = new OkrObjectInfoDisclosure();
                 OkrObjectInfoDisclosure disclosure = new OkrObjectInfoDisclosure();
@@ -425,48 +315,42 @@ public class OkrServiceImpl implements OkrService {
                 okrObjectInfoDisclosureService.save(disclosure);
                 okrObjectInfoDisclosureService.save(disclosure);
             }
             }
         }
         }
-        if(null!=remindIds&&!remindIds.isEmpty()){
-            for(String remindId:remindIds){
-                OkrObjectInfoRemind remind = new OkrObjectInfoRemind();
-                remind.setExtraId(remindId);
-                String[] ids = remindId.split("##");
-                remind.setKrId(krInfo.getId());
-                //部门
-                if(ids.length == 1){
-                    remind.setRemindType(1);
-                }
-                if(ids.length == 2){
-                    remind.setRemindType(2);
-                }
-                remind.setRemindId(ids[0]);
-                remind.setStatus(1);
-                okrObjectInfoRemindService.save(remind);
-            }
-        }
-
+    }
+    @Override
+    public void updateObject(OkrObjectInfo objectInfo){
+        okrObjectInfoService.updateObjectInfo(objectInfo);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(2); //操作:1.创建2.修改3.删除
-        okrLog.setOperation(2);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperationId(krInfo.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(krInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(2,1,objectInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(objectInfo),userId);
     }
     }
+    @Autowired
+    private IKrInfoservice krInfoservice;
 
 
+    @Override
+    public void updateKr(OkrKrInfo krInfo){
+        List<String>publicIds = krInfo.getPublicIds();
+        List<String>remindIds = krInfo.getRemindIds();
+        krInfoservice.updateKrInfo(krInfo);
+        okrObjectInfoDisclosureService.deleteByKrId(krInfo.getId());
+        okrObjectInfoRemindService.deleteByKrId(krInfo.getId());
+        insertKrPublicIds(krInfo,publicIds);
+        insertKrRemindIds(krInfo,remindIds);
+
+        QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
+        String userId = sysUser.getOpenId();
+        //日志留存
+        okrLogService.insertOkrLog(2,2,krInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(krInfo),userId);
+    }
     //获取本季度同步给我OKR的同事的列表
     //获取本季度同步给我OKR的同事的列表
+
     @Override
     @Override
     public Map<String, Object> getSyncUserListByMemberId(JSONObject data){
     public Map<String, Object> getSyncUserListByMemberId(JSONObject data){
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String openId = sysUser.getOpenId();
         String openId = sysUser.getOpenId();
         Integer pageSize = data.getInteger("pageSize");
         Integer pageSize = data.getInteger("pageSize");
         if(null == pageSize||pageSize == 0){
         if(null == pageSize||pageSize == 0){
-            pageSize = 12;
+            pageSize = 16;
         }
         }
         Integer pageNumber = data.getInteger("pageNumber");
         Integer pageNumber = data.getInteger("pageNumber");
         if(null == pageNumber||pageNumber == 0){
         if(null == pageNumber||pageNumber == 0){
@@ -495,7 +379,7 @@ public class OkrServiceImpl implements OkrService {
         }
         }
 
 
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<Map<String, Object>> mapList = new ArrayList<>();
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getAllQuarterObject(name,year, quarter,(pageNumber-1)*pageSize,pageSize);
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getAllQuarterObject(name,year, quarter,(pageNumber-1)*pageSize,pageSize);
         for(OkrObjectInfo object:OkrObjectInfoList){
         for(OkrObjectInfo object:OkrObjectInfoList){
             Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
             Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
             mapList.add(okrmap);
             mapList.add(okrmap);
@@ -529,7 +413,7 @@ public class OkrServiceImpl implements OkrService {
         String openId = sysUser.getOpenId();
         String openId = sysUser.getOpenId();
         Integer pageSize = data.getInteger("pageSize");
         Integer pageSize = data.getInteger("pageSize");
         if(null == pageSize||pageSize == 0){
         if(null == pageSize||pageSize == 0){
-            pageSize = 12;
+            pageSize = 16;
         }
         }
         Integer pageNumber = data.getInteger("pageNumber");
         Integer pageNumber = data.getInteger("pageNumber");
         if(null == pageNumber||pageNumber == 0){
         if(null == pageNumber||pageNumber == 0){
@@ -558,7 +442,7 @@ public class OkrServiceImpl implements OkrService {
         }
         }
 
 
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<Map<String, Object>> mapList = new ArrayList<>();
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getFollowQuarterObject(name,year, quarter,(pageNumber-1)*pageSize,pageSize);
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getFollowQuarterObject(name,year, quarter,(pageNumber-1)*pageSize,pageSize);
         for(OkrObjectInfo object:OkrObjectInfoList){
         for(OkrObjectInfo object:OkrObjectInfoList){
             Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
             Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
             mapList.add(okrmap);
             mapList.add(okrmap);
@@ -587,17 +471,17 @@ public class OkrServiceImpl implements OkrService {
         okrmap.put("name",userInfo.getName());
         okrmap.put("name",userInfo.getName());
         return okrmap;
         return okrmap;
     }
     }
-
     @Autowired
     @Autowired
     private IOkrFocusInfoService focusInfoService;
     private IOkrFocusInfoService focusInfoService;
 
 
+
     @Override
     @Override
     public Map<String, Object> getMyDepartmentList(JSONObject data) {
     public Map<String, Object> getMyDepartmentList(JSONObject data) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String openId = sysUser.getOpenId();
         String openId = sysUser.getOpenId();
         Integer pageSize = data.getInteger("pageSize");
         Integer pageSize = data.getInteger("pageSize");
         if(null == pageSize||pageSize == 0){
         if(null == pageSize||pageSize == 0){
-            pageSize = 12;
+            pageSize = 16;
         }
         }
         Integer pageNumber = data.getInteger("pageNumber");
         Integer pageNumber = data.getInteger("pageNumber");
         if(null == pageNumber||pageNumber == 0){
         if(null == pageNumber||pageNumber == 0){
@@ -627,7 +511,7 @@ public class OkrServiceImpl implements OkrService {
 
 
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<Map<String, Object>> mapList = new ArrayList<>();
         //1:查询自己所属部门下的用户信息
         //1:查询自己所属部门下的用户信息
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getDepartmentQuarterObject(openId,name,year, quarter,(pageNumber-1)*pageSize,pageSize);
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getDepartmentQuarterObject(openId,name,year, quarter,(pageNumber-1)*pageSize,pageSize);
         for(OkrObjectInfo object:OkrObjectInfoList){
         for(OkrObjectInfo object:OkrObjectInfoList){
             Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
             Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
             mapList.add(okrmap);
             mapList.add(okrmap);
@@ -661,7 +545,7 @@ public class OkrServiceImpl implements OkrService {
         List<OkrTaskInfo>settaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
         List<OkrTaskInfo>settaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
 
 
         //OKR信息
         //OKR信息
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getQuarterObject(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getQuarterObject(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
         List<Map<String, Object>> okrList = new ArrayList<>();
         List<Map<String, Object>> okrList = new ArrayList<>();
         for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
         for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
             Map<String, Object> okrMap = new HashMap<>();
             Map<String, Object> okrMap = new HashMap<>();
@@ -688,83 +572,45 @@ public class OkrServiceImpl implements OkrService {
 
 
     @Override
     @Override
     public void deleteObjectInfoById(OkrObjectInfo objectInfo){
     public void deleteObjectInfoById(OkrObjectInfo objectInfo){
-        okrObjectInfoMapper.deleteObjectInfoById(objectInfo);
-
+        okrObjectInfoService.deleteObjectInfoById(objectInfo);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(3); //操作:1.创建2.修改3.删除
-        okrLog.setOperation(1);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperationId(objectInfo.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(objectInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(3,1,objectInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(objectInfo),userId);
     }
     }
 
 
     @Override
     @Override
     public void deleteKrById(OkrKrInfo krInfo){
     public void deleteKrById(OkrKrInfo krInfo){
         okrKrInfoMapper.deleteKrById(krInfo);
         okrKrInfoMapper.deleteKrById(krInfo);
-
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(3); //操作:1.创建2.修改3.删除
-        okrLog.setOperation(2);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperationId(krInfo.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(krInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(3,2,krInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(krInfo),userId);
     }
     }
 
 
     @Override
     @Override
     public void deleteContentStatusById(OkrContentStatus content){
     public void deleteContentStatusById(OkrContentStatus content){
         okrContentStatusMapper.deleteContentStatuaById(content);
         okrContentStatusMapper.deleteContentStatuaById(content);
-
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(3); //操作:1.创建2.修改3.删除
-        okrLog.setOperation(5);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        okrLog.setOperationId(content.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(content));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(3,5,content.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(content),userId);
     }
     }
-
     @Override
     @Override
     public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
     public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
         okrTaskInfoService.deleteTaskInfoById(okrTaskInfo);
         okrTaskInfoService.deleteTaskInfoById(okrTaskInfo);
 
 
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();
-        //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
         //日志留存
         //日志留存
-        OkrLog okrLog = new OkrLog();
-        okrLog.setType(3); //操作:1.创建2.修改3.删除
+        Integer opetation = 1;
+        //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
         if(okrTaskInfoService.selectById(okrTaskInfo.getId()).getType()==1){
         if(okrTaskInfoService.selectById(okrTaskInfo.getId()).getType()==1){
-            okrLog.setOperation(3);  //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
+            opetation = 3;
         }else{
         }else{
-            okrLog.setOperation(4);
+            opetation = 4;
         }
         }
-
-        okrLog.setOperationId(okrTaskInfo.getId());
-        okrLog.setYear(DateUtils.getYear(new Date()));
-        okrLog.setQuarter(DateUtils.getQuarter(new Date()));
-        okrLog.setContent(JSONObject.toJSONString(okrTaskInfo));
-        okrLog.setUserId(userId);
-        okrLogMapper.insertOkrLog(okrLog);
+        okrLogService.insertOkrLog(3,opetation,okrTaskInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(okrTaskInfo),userId);
     }
     }
     @Autowired
     @Autowired
     private IOkrObjectInfoDisclosureService okrObjectInfoDisclosureService;
     private IOkrObjectInfoDisclosureService okrObjectInfoDisclosureService;
@@ -782,61 +628,17 @@ public class OkrServiceImpl implements OkrService {
         krInfo.setUserId(userId);
         krInfo.setUserId(userId);
         okrKrInfoMapper.insertOkrKrInfo(krInfo);
         okrKrInfoMapper.insertOkrKrInfo(krInfo);
 
 
-        if(null!=krInfo.getPublicIds()&&!krInfo.getPublicIds().isEmpty()){
-            List<String>publicIds = krInfo.getPublicIds();
-            for(String publicId:publicIds){
-                OkrObjectInfoDisclosure disclosure = new OkrObjectInfoDisclosure();
-                disclosure.setExtraId(publicId);
-                String[] ids = publicId.split("##");
-                disclosure.setKrId(krInfo.getId());
-                //部门
-                if(ids.length == 1){
-                    disclosure.setPublicType(1);
-                }
-                if(ids.length == 2){
-                    disclosure.setPublicType(2);
-                }
-                disclosure.setPublicId(ids[0]);
-                disclosure.setStatus(1);
-                okrObjectInfoDisclosureService.save(disclosure);
-            }
-        }
-        if(null!=krInfo.getRemindIds()&&!krInfo.getRemindIds().isEmpty()){
-            List<String>remindIds = krInfo.getRemindIds();
-            for(String remindId:remindIds){
-                OkrObjectInfoRemind remind = new OkrObjectInfoRemind();
-                remind.setExtraId(remindId);
-                String[] ids = remindId.split("##");
-                remind.setKrId(krInfo.getId());
-                //部门
-                if(ids.length == 1){
-                    remind.setRemindType(1);
-                }
-                if(ids.length == 2){
-                    remind.setRemindType(2);
-                }
-                remind.setRemindId(ids[0]);
-                remind.setStatus(1);
-                okrObjectInfoRemindService.save(remind);
-            }
-        }
+        insertKrPublicIds(krInfo,krInfo.getPublicIds());
+        insertKrRemindIds(krInfo,krInfo.getRemindIds());
 
 
         //日志留存
         //日志留存
-        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);
+        okrLogService.insertOkrLog(1,2,krInfo.getId(),year,quarter,JSONObject.toJSONString(krInfo),userId);
 
 
     }
     }
 
 
     @Override
     @Override
     public List<Integer> getObjectYear(){
     public List<Integer> getObjectYear(){
-        return okrObjectInfoMapper.getObjectYear();
+        return okrObjectInfoService.getObjectYear();
     }
     }