소스 검색

okr调整

yumeng 3 년 전
부모
커밋
a23b5de4dc

+ 7 - 4
src/main/java/cn/com/ctop/okr/mapper/OkrTaskInfoMapper.java

@@ -7,12 +7,15 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface OkrTaskInfoMapper extends BaseMapper<OkrTaskInfo> {
-    List<OkrTaskInfo> getTaskInfo(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter, @Param("type")Integer type);
+    List<OkrTaskInfo> getTaskInfo(@Param("userId") String userId, @Param("year") Integer year, @Param("quarter") Integer quarter, @Param("type") Integer type);
 
-    Integer insertTaskInfo(@Param("taskInfo")OkrTaskInfo taskInfo);
+    Integer insertTaskInfo(@Param("taskInfo") OkrTaskInfo taskInfo);
 
-    void updateTaskInfo(@Param("taskInfo")OkrTaskInfo taskInfo);
+    void updateTaskInfo(@Param("taskInfo") OkrTaskInfo taskInfo);
 
-    void deleteTaskInfoById(@Param("taskInfo")OkrTaskInfo taskInfo);
+    void deleteTaskInfoById(@Param("taskInfo") OkrTaskInfo taskInfo);
 
+    Integer checkTaskByMonth(@Param("checkYear") Integer checkYear, @Param("checkMonth") Integer checkMonth, @Param("taskTitle") String taskTitle, @Param("userId") String userId);
+
+    Integer checkTaskByWeek(@Param("year") Integer year, @Param("month") Integer month, @Param("week") Integer week, @Param("taskTitle") String taskTitle, @Param("userId") String userId);
 }

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

@@ -19,6 +19,24 @@
         status != 0
         order by priority
     </select>
+    <select id="checkTaskByMonth" resultType="java.lang.Integer">
+        select  count(1)  from  okr_task_info where
+        `year` = #{checkYear}
+        and `month` = #{checkMonth}
+        and task_title = #{taskTitle}
+        and user_id = #{userId}
+        and `status` = 1
+
+    </select>
+    <select id="checkTaskByWeek" resultType="java.lang.Integer">
+        select  count(1)  from  okr_task_info
+        where `year` = #{year}
+        and `month` = #{month}
+        and `week` = #{week}
+        and task_title = #{taskTitle}
+        and user_id = #{userId}
+        and `status` = 1
+    </select>
 
     <!-- 增加任务 -->
     <insert id="insertTaskInfo" useGeneratedKeys="true" keyProperty="id">

+ 4 - 0
src/main/java/cn/com/ctop/okr/service/IOkrTaskInfoService.java

@@ -20,4 +20,8 @@ public interface IOkrTaskInfoService extends IService<OkrTaskInfo> {
     void insertTaskInfo(OkrTaskInfo taskInfo);
 
     OkrTaskInfo checkShow(OkrTaskInfo taskInfo, String openId);
+
+    Integer checkTaskByMonth(Integer checkYear, Integer checkMonth, String taskTitle,String userId);
+
+    Integer checkTaskByWeek(Integer year, Integer month, Integer week, String taskTitle,String userId);
 }

+ 248 - 220
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -1,9 +1,10 @@
 package cn.com.ctop.okr.service.impl;
 
-import cn.com.ctop.okr.controller.QyWxController;
 import cn.com.ctop.okr.dto.UserInfoDto;
 import cn.com.ctop.okr.entity.*;
-import cn.com.ctop.okr.mapper.*;
+import cn.com.ctop.okr.mapper.OkrContentStatusMapper;
+import cn.com.ctop.okr.mapper.OkrKrInfoMapper;
+import cn.com.ctop.okr.mapper.OkrMemberMapper;
 import cn.com.ctop.okr.service.*;
 import cn.com.ctop.okr.utils.*;
 import com.alibaba.fastjson.JSONObject;
@@ -41,34 +42,34 @@ public class OkrServiceImpl implements OkrService {
 
 
     @Override
-    public Map<String, Object> getOkrInfo(UserInfoDto data){
+    public Map<String, Object> getOkrInfo(UserInfoDto data) {
         Map<String, Object> result = new HashMap<>();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String currentUserId = sysUser.getOpenId();
         Long objectId = data.getObjectId();
-        OkrObjectInfo objectInfo =objectInfoService.getById(objectId);
-        if(null == objectInfo){
+        OkrObjectInfo objectInfo = objectInfoService.getById(objectId);
+        if (null == objectInfo) {
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
             return result;
         }
 
         //本周任务信息
         List<OkrTaskInfo> taskInfoList = okrTaskInfoService.getTaskInfo(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter(), 1);
-        List<OkrTaskInfo>setTaskList =checkTaskInfo(taskInfoList,currentUserId);
+        List<OkrTaskInfo> setTaskList = checkTaskInfo(taskInfoList, currentUserId);
 
         //未来四周任务信息
         List<OkrTaskInfo> taskFourWeekList = okrTaskInfoService.getTaskInfo(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter(), 2);
-        List<OkrTaskInfo>setTaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
+        List<OkrTaskInfo> setTaskFourWeekList = checkTaskInfo(taskFourWeekList, currentUserId);
 
         //OKR信息
         List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getQuarterObject(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
         List<Map<String, Object>> okrList = new ArrayList<>();
-        for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
+        for (OkrObjectInfo okrObjectInfo : OkrObjectInfoList) {
             Map<String, Object> okrMap = new HashMap<>();
-            List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(okrObjectInfo.getId(),objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
-            List<OkrKrInfo>setKrList =checkKrList(krList,currentUserId);
-            okrMap.put("objectInfo",okrObjectInfo);
-            okrMap.put("krList",setKrList);
+            List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(okrObjectInfo.getId(), objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
+            List<OkrKrInfo> setKrList = checkKrList(krList, currentUserId);
+            okrMap.put("objectInfo", okrObjectInfo);
+            okrMap.put("krList", setKrList);
             okrList.add(okrMap);
         }
 
@@ -79,32 +80,32 @@ public class OkrServiceImpl implements OkrService {
         OkrWeekData weekData = weekDataService.getWeekByDate(now);
         List<Integer> months = DateUtils.getMonthsByQuarter(objectInfo.getQuarter());
         //根据月份数据获取周
-        Map<Integer, Object> weeks = weekDataService.getWeeksByMonths(objectInfo.getYear(),months);
-        Map<String,Object> timeMap = new HashMap<>();
-        timeMap.put("year",objectInfo.getYear());
-        timeMap.put("quarter",objectInfo.getQuarter());
+        Map<Integer, Object> weeks = weekDataService.getWeeksByMonths(objectInfo.getYear(), months);
+        Map<String, Object> timeMap = new HashMap<>();
+        timeMap.put("year", objectInfo.getYear());
+        timeMap.put("quarter", objectInfo.getQuarter());
         Integer month = DateUtils.getMonth();
         Integer week = DateUtils.getWeekByDate(new Date());
-        timeMap.put("currentMonth",month);
-        timeMap.put("currentWeek",week);
-        timeMap.put("months",months);
-        timeMap.put("weeks",weeks);
+        timeMap.put("currentMonth", month);
+        timeMap.put("currentWeek", week);
+        timeMap.put("months", months);
+        timeMap.put("weeks", weeks);
         result.put("time", timeMap);
-        result.put("taskInfoList",transformTaskInfo(setTaskList, 1));
-        result.put("taskFourWeekList",transformTaskInfo(setTaskFourWeekList, 2));
-        result.put("okr",okrList);
+        result.put("taskInfoList", transformTaskInfo(setTaskList, 1));
+        result.put("taskFourWeekList", transformTaskInfo(setTaskFourWeekList, 2));
+        result.put("okr", okrList);
         result.put("status", contentStatusList);
         return result;
     }
 
     private List<OkrTaskInfo> checkTaskInfo(List<OkrTaskInfo> taskInfoList, String openId) {
-        List<OkrTaskInfo>setList = new ArrayList<>();
-        if(null!=taskInfoList&&!taskInfoList.isEmpty()){
+        List<OkrTaskInfo> setList = new ArrayList<>();
+        if (null != taskInfoList && !taskInfoList.isEmpty()) {
             setList = new ArrayList<>();
-            for(OkrTaskInfo taskInfo:taskInfoList){
+            for (OkrTaskInfo taskInfo : taskInfoList) {
                 //1:查询当前kr使用可以被展示
-                OkrTaskInfo getTaskInfo = okrTaskInfoService.checkShow(taskInfo,openId);
-                if(null!=getTaskInfo){
+                OkrTaskInfo getTaskInfo = okrTaskInfoService.checkShow(taskInfo, openId);
+                if (null != getTaskInfo) {
                     setList.add(getTaskInfo);
                 }
             }
@@ -114,17 +115,17 @@ public class OkrServiceImpl implements OkrService {
 
 
     @Override
-    public void insertOkrMember(List<String> memberList){
+    public void insertOkrMember(List<String> memberList) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
-        okrMemberMapper.deleteOkrMemberByUserId(userId,year,quarter);
+        okrMemberMapper.deleteOkrMemberByUserId(userId, year, quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
     }
 
     @Override
-    public void insertOkrMember2(List<String> memberList){
+    public void insertOkrMember2(List<String> memberList) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
@@ -133,15 +134,16 @@ public class OkrServiceImpl implements OkrService {
     }
 
     @Override
-    public void deleteOkrMember(String memberId){
+    public void deleteOkrMember(String memberId) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
         okrMemberMapper.deleteOkrMemberByUserId2(userId, memberId, year, quarter);
     }
+
     @Override
-    public List<UserInfoDto> getMemberListByUserId(String name){
+    public List<UserInfoDto> getMemberListByUserId(String name) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
@@ -151,15 +153,15 @@ public class OkrServiceImpl implements OkrService {
     //保存任务
 
     @Override
-    public void insertTaskInfo(OkrTaskInfo taskInfo){
+    public void insertTaskInfo(OkrTaskInfo taskInfo) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String now = DateUtils.formatDate();
         OkrWeekData weekData = null;
-        if(null == taskInfo.getWeek()||null == taskInfo.getYear()){
+        if (null == taskInfo.getWeek() || null == taskInfo.getYear()) {
             weekData = weekDataService.getWeekByDate(now);
-        }else{
-            weekData = weekDataService.getWeekByYearAndWeek(taskInfo.getYear(),taskInfo.getWeek());
+        } else {
+            weekData = weekDataService.getWeekByYearAndWeek(taskInfo.getYear(), taskInfo.getWeek());
         }
         taskInfo.setUserId(userId);
         taskInfo.setYear(weekData.getYear());
@@ -168,29 +170,30 @@ public class OkrServiceImpl implements OkrService {
         taskInfo.setMonth(weekData.getMonth());
         okrTaskInfoService.insertTaskInfo(taskInfo);
 
-        insertTaskPublicIds(taskInfo,taskInfo.getPublicIds());
-        insertTaskRemindIds(sysUser.getName(),taskInfo,taskInfo.getRemindIds());
+        insertTaskPublicIds(taskInfo, taskInfo.getPublicIds());
+        insertTaskRemindIds(sysUser.getName(), taskInfo, taskInfo.getRemindIds());
         //日志留存
         Integer opration;
-        if(taskInfo.getType() == 1){
+        if (taskInfo.getType() == 1) {
             opration = 3;
-        }else{
+        } else {
             opration = 4;
         }
-        okrLogService.insertOkrLog(1,opration,taskInfo.getId(),weekData.getYear(),weekData.getQuarter(),JSONObject.toJSONString(taskInfo),userId);
+        okrLogService.insertOkrLog(1, opration, taskInfo.getId(), weekData.getYear(), weekData.getQuarter(), JSONObject.toJSONString(taskInfo), userId);
     }
-    private void insertTaskPublicIds(OkrTaskInfo taskInfo,List<String>publicIds){
-        if(null!=publicIds&&!publicIds.isEmpty()){
-            for(String publicId:publicIds){
+
+    private void insertTaskPublicIds(OkrTaskInfo taskInfo, List<String> publicIds) {
+        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){
+                if (ids.length == 1) {
                     disclosure.setPublicType(1);
                 }
-                if(ids.length == 2){
+                if (ids.length == 2) {
                     disclosure.setPublicType(2);
                 }
                 disclosure.setPublicId(ids[0]);
@@ -199,31 +202,32 @@ public class OkrServiceImpl implements OkrService {
             }
         }
     }
-    private void insertTaskRemindIds(String userName,OkrTaskInfo taskInfo,List<String>remindIds){
-        if(null!=remindIds&&!remindIds.isEmpty()){
-            for(String remindId:remindIds){
+
+    private void insertTaskRemindIds(String userName, OkrTaskInfo taskInfo, List<String> remindIds) {
+        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){
+                if (ids.length == 1) {
                     remind.setRemindType(1);
                     Long departId = Long.parseLong(ids[0]);
-                    List<String>wechatIds;
+                    List<String> wechatIds;
                     //@所有人
-                    if(null!=departId&&departId == 10086){
+                    if (null != departId && departId == 10086) {
                         wechatIds = qyWxDepartInfoService.getAllUserId();
-                    }else {
+                    } else {
                         wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
                     }
-                    CorpWexinUtils.sendMessage(wechatIds,userName+"在okr中@了你: "+taskInfo.getTaskTitle());
+                    CorpWexinUtils.sendMessage(wechatIds, userName + "在okr中@了你: " + taskInfo.getTaskTitle());
                 }
-                if(ids.length == 2){
+                if (ids.length == 2) {
                     remind.setRemindType(2);
                     QYWxUserInfo userInfo = wxUserInfoService.getByOpenId(ids[0]);
-                    if(null!=userInfo){
-                        CorpWexinUtils.sendMessageByWeChatId(userInfo.getUserid(),userName+"在okr中@了你: "+taskInfo.getTaskTitle());
+                    if (null != userInfo) {
+                        CorpWexinUtils.sendMessageByWeChatId(userInfo.getUserid(), userName + "在okr中@了你: " + taskInfo.getTaskTitle());
                     }
                 }
                 remind.setRemindId(ids[0]);
@@ -236,49 +240,63 @@ public class OkrServiceImpl implements OkrService {
 
     @Autowired
     private QYWxDepartInfoService qyWxDepartInfoService;
+
     //更新任务
     @Override
-    public void updateTaskInfo(OkrTaskInfo taskInfo){
+    public void updateTaskInfo(OkrTaskInfo taskInfo) {
         //1:查询taskInfo
         OkrTaskInfo getTask = okrTaskInfoService.getById(taskInfo.getId());
-        if(null!=taskInfo.getTaskTitle()&&!"".equals(taskInfo.getTaskTitle())){
+        if (null != taskInfo.getTaskTitle() && !"".equals(taskInfo.getTaskTitle())) {
             getTask.setTaskTitle(taskInfo.getTaskTitle());
         }
-        if(null!=taskInfo.getTaskInfo()&&!"".equals(taskInfo.getTaskInfo())){
+        if (null != taskInfo.getTaskInfo() && !"".equals(taskInfo.getTaskInfo())) {
             getTask.setTaskInfo(taskInfo.getTaskInfo());
         }
-        if(null!=taskInfo.getPermission()){
+        if (null != taskInfo.getPermission()) {
             getTask.setPermission(taskInfo.getPermission());
         }
-        if(null!=taskInfo.getPriority()&&!"".equals(taskInfo.getPriority())){
+        if (null != taskInfo.getPriority() && !"".equals(taskInfo.getPriority())) {
             getTask.setPriority(taskInfo.getPriority());
         }
-        if(null!=taskInfo.getStatus()){
+        if (null != taskInfo.getStatus()) {
             getTask.setStatus(taskInfo.getStatus());
         }
         okrTaskInfoService.updateById(getTask);
-        if(taskInfo.getStatus() == 2){
-            if(getTask.getType() == 2){
+        if (taskInfo.getStatus() == 2) {
+            if (getTask.getType() == 2) {
                 //月份信息数据
                 getTask.setStatus(1);
-                int month = getTask.getMonth()+1;
+                int month = getTask.getMonth() + 1;
+                Integer checkMonth = null;
+                Integer checkYear = null;
                 int quarter = DateUtils.getQuarterByMonthNum(month);
-                if(month == 12){
+                if (month <= 12) {
                     getTask.setMonth(month);
-                }else{
-                    getTask.setMonth(month%12);
+                    checkMonth = month;
+                    checkYear = getTask.getYear();
+                } else {
+                    checkMonth = month % 12;
+                    checkYear = getTask.getYear() + 1;
+                    getTask.setMonth(checkMonth);
+                    getTask.setYear(checkYear);
                 }
                 getTask.setQuarter(quarter);
                 getTask.setId(null);
-                okrTaskInfoService.insertTaskInfo(getTask);
-            }else{
-                OkrWeekData getNextWeek = weekDataService.getWeekByYearAndWeek(getTask.getYear(),getTask.getWeek()+1);
+                Integer count = okrTaskInfoService.checkTaskByMonth(checkYear, checkMonth, getTask.getTaskTitle(),getTask.getUserId());
+                if (count == 0) {
+                    okrTaskInfoService.insertTaskInfo(getTask);
+                }
+            } else {
+                OkrWeekData getNextWeek = weekDataService.getWeekByYearAndWeek(getTask.getYear(), getTask.getWeek() + 1);
                 getTask.setStatus(1);
                 getTask.setWeek(getNextWeek.getWeek());
                 getTask.setMonth(getNextWeek.getMonth());
                 getTask.setYear(getNextWeek.getYear());
                 getTask.setId(null);
-                okrTaskInfoService.insertTaskInfo(getTask);
+                Integer count = okrTaskInfoService.checkTaskByWeek(getNextWeek.getYear(), getNextWeek.getMonth(), getNextWeek.getWeek(), getTask.getTaskTitle(),getTask.getUserId());
+                if (count == 0) {
+                    okrTaskInfoService.insertTaskInfo(getTask);
+                }
             }
         }
         /**
@@ -289,15 +307,16 @@ public class OkrServiceImpl implements OkrService {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         getTask.setStatus(taskInfo.getStatus());
         getTask.setId(taskInfo.getId());
-        List<String>publicIds = taskInfo.getPublicIds();
-        List<String>remindIds = taskInfo.getRemindIds();
-        insertTaskPublicIds(getTask,publicIds);
-        insertTaskRemindIds(sysUser.getName(),getTask,remindIds);
+        List<String> publicIds = taskInfo.getPublicIds();
+        List<String> remindIds = taskInfo.getRemindIds();
+        insertTaskPublicIds(getTask, publicIds);
+        insertTaskRemindIds(sysUser.getName(), getTask, remindIds);
     }
     //保存任务
 
+
     @Override
-    public void insertContentStatus(OkrContentStatus content){
+    public void insertContentStatus(OkrContentStatus content) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         content.setUserId(userId);
@@ -306,70 +325,70 @@ public class OkrServiceImpl implements OkrService {
         okrContentStatusMapper.insertContentStatus(content);
 
         //日志留存
-        okrLogService.insertOkrLog(1,5,content.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(content),userId);
+        okrLogService.insertOkrLog(1, 5, content.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(content), userId);
     }
     //更新任务
 
     @Override
-    public void updateContentStatus(OkrContentStatus content){
+    public void updateContentStatus(OkrContentStatus content) {
         okrContentStatusMapper.updateContentStatus(content);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         //日志留存
-        okrLogService.insertOkrLog(2,5,content.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(content),userId);
+        okrLogService.insertOkrLog(2, 5, content.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(content), userId);
     }
     //同时保存O和krList
 
     @Override
-    public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList){
+    public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
-        okrObjectInfoService.insertObjectInfo(objectInfo,userId,year,quarter);
+        okrObjectInfoService.insertObjectInfo(objectInfo, userId, year, quarter);
         //日志留存
-        okrLogService.insertOkrLog(1,1,objectInfo.getId(),year,quarter,JSONObject.toJSONString(objectInfo),userId);
+        okrLogService.insertOkrLog(1, 1, objectInfo.getId(), year, quarter, JSONObject.toJSONString(objectInfo), userId);
 
-        for(OkrKrInfo krInfo:krList){
+        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(sysUser.getName(),krInfo,krInfo.getRemindIds());
+            insertKrPublicIds(krInfo, krInfo.getPublicIds());
+            insertKrRemindIds(sysUser.getName(), krInfo, krInfo.getRemindIds());
             //日志留存
-            okrLogService.insertOkrLog(1,2,krInfo.getId(),year,quarter,JSONObject.toJSONString(krInfo),userId);
+            okrLogService.insertOkrLog(1, 2, krInfo.getId(), year, quarter, JSONObject.toJSONString(krInfo), userId);
         }
     }
 
-    private void insertKrRemindIds(String username,OkrKrInfo krInfo,List<String>remindIds){
-        if(null!=remindIds&&!remindIds.isEmpty()){
-            for(String remindId:remindIds){
+    private void insertKrRemindIds(String username, 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){
+                if (ids.length == 1) {
                     remind.setRemindType(1);
                     Long departId = Long.parseLong(ids[0]);
-                    List<String>wechatIds;
+                    List<String> wechatIds;
                     //@所有人
-                    if(null!=departId&&departId == 10086){
+                    if (null != departId && departId == 10086) {
                         wechatIds = qyWxDepartInfoService.getAllUserId();
-                    }else {
+                    } else {
                         wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
                     }
-                    if(null!=wechatIds&&!wechatIds.isEmpty()){
-                        CorpWexinUtils.sendMessage(wechatIds,username+"在OKR中@你了: "+krInfo.getKrInfo());
+                    if (null != wechatIds && !wechatIds.isEmpty()) {
+                        CorpWexinUtils.sendMessage(wechatIds, username + "在OKR中@你了: " + krInfo.getKrInfo());
                     }
                 }
-                if(ids.length == 2){
+                if (ids.length == 2) {
                     remind.setRemindType(2);
                     QYWxUserInfo userInfo = wxUserInfoService.getByOpenId(ids[0]);
-                    if(null!=userInfo){
-                        CorpWexinUtils.sendMessageByWeChatId(userInfo.getUserid(),username+"在OKR中@你了: "+krInfo.getKrInfo());
+                    if (null != userInfo) {
+                        CorpWexinUtils.sendMessageByWeChatId(userInfo.getUserid(), username + "在OKR中@你了: " + krInfo.getKrInfo());
                     }
                 }
                 remind.setRemindId(ids[0]);
@@ -378,18 +397,19 @@ public class OkrServiceImpl implements OkrService {
             }
         }
     }
-    private void insertKrPublicIds(OkrKrInfo krInfo,List<String>publicIds){
-        if(null!=publicIds&&!publicIds.isEmpty()){
-            for(String publicId:publicIds){
+
+    private void insertKrPublicIds(OkrKrInfo krInfo, List<String> publicIds) {
+        if (null != publicIds && !publicIds.isEmpty()) {
+            for (String publicId : publicIds) {
                 OkrObjectInfoDisclosure disclosure = new OkrObjectInfoDisclosure();
                 disclosure.setExtraId(publicId);
                 String[] ids = publicId.split("##");
                 disclosure.setKrId(krInfo.getId());
                 //部门
-                if(ids.length == 1){
+                if (ids.length == 1) {
                     disclosure.setPublicType(1);
                 }
-                if(ids.length == 2){
+                if (ids.length == 2) {
                     disclosure.setPublicType(2);
                 }
                 disclosure.setPublicId(ids[0]);
@@ -398,44 +418,46 @@ public class OkrServiceImpl implements OkrService {
             }
         }
     }
+
     @Override
-    public void updateObject(OkrObjectInfo objectInfo){
+    public void updateObject(OkrObjectInfo objectInfo) {
         okrObjectInfoService.updateObjectInfo(objectInfo);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         //日志留存
-        okrLogService.insertOkrLog(2,1,objectInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(objectInfo),userId);
+        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();
+    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());
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
-        insertKrPublicIds(krInfo,publicIds);
-        insertKrRemindIds(sysUser.getName(),krInfo,remindIds);
+        insertKrPublicIds(krInfo, publicIds);
+        insertKrRemindIds(sysUser.getName(), krInfo, remindIds);
 
         //日志留存
-        okrLogService.insertOkrLog(2,2,krInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(krInfo),userId);
+        okrLogService.insertOkrLog(2, 2, krInfo.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(krInfo), userId);
     }
     //获取本季度同步给我OKR的同事的列表
 
     @Override
-    public Map<String, Object> getSyncUserListByMemberId(JSONObject data){
+    public Map<String, Object> getSyncUserListByMemberId(JSONObject data) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String openId = sysUser.getOpenId();
         Integer pageSize = data.getInteger("pageSize");
-        if(null == pageSize||pageSize == 0){
+        if (null == pageSize || pageSize == 0) {
             pageSize = 16;
         }
         Integer pageNumber = data.getInteger("pageNumber");
-        if(null == pageNumber||pageNumber == 0){
+        if (null == pageNumber || pageNumber == 0) {
             pageNumber = 1;
         }
         Integer year = data.getInteger("year");
@@ -446,42 +468,42 @@ public class OkrServiceImpl implements OkrService {
         Integer todayQuarter = DateUtils.getQuarter(new Date());
         Integer todayYear = DateUtils.getYear(new Date());
         Integer isCurrentQuarter = 0;
-        if(year ==null){
+        if (year == null) {
             year = todayYear;
         }
-        if(null == quarter||quarter == 0){
+        if (null == quarter || quarter == 0) {
             quarter = todayQuarter;
         }
 
         //如果不是当年当季度,返回O和KR的信息;是当季度,直接返回OKR四象限信息
-        if(todayYear.equals(year) && todayQuarter.equals(quarter)){
+        if (todayYear.equals(year) && todayQuarter.equals(quarter)) {
             isCurrentQuarter = 1;
-        }else{
+        } else {
             isCurrentQuarter = 0;
         }
 
         List<Map<String, Object>> mapList = new ArrayList<>();
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getAllQuarterObject(name,year, quarter,(pageNumber-1)*pageSize,pageSize);
-        for(OkrObjectInfo object:OkrObjectInfoList){
-            Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getAllQuarterObject(name, year, quarter, (pageNumber - 1) * pageSize, pageSize);
+        for (OkrObjectInfo object : OkrObjectInfoList) {
+            Map<String, Object> okrmap = getOkrMap(object, openId, year, quarter);
             mapList.add(okrmap);
         }
 
-        map.put("isCurrentQuarter",isCurrentQuarter);
-        map.put("list",mapList);
-        map.put("year",year);
-        map.put("quarter",quarter);
+        map.put("isCurrentQuarter", isCurrentQuarter);
+        map.put("list", mapList);
+        map.put("year", year);
+        map.put("quarter", quarter);
         return map;
     }
 
-    List<OkrKrInfo>checkKrList(List<OkrKrInfo> krList,String openId){
-        List<OkrKrInfo>setList = new ArrayList<>();
-        if(null!=krList&&!krList.isEmpty()){
+    List<OkrKrInfo> checkKrList(List<OkrKrInfo> krList, String openId) {
+        List<OkrKrInfo> setList = new ArrayList<>();
+        if (null != krList && !krList.isEmpty()) {
             setList = new ArrayList<>();
-            for(OkrKrInfo krInfo:krList){
+            for (OkrKrInfo krInfo : krList) {
                 //1:查询当前kr使用可以被展示
-                OkrKrInfo getKrInfo = krInfoservice.checkShow(krInfo,openId);
-                if(null!=getKrInfo){
+                OkrKrInfo getKrInfo = krInfoservice.checkShow(krInfo, openId);
+                if (null != getKrInfo) {
                     setList.add(getKrInfo);
                 }
             }
@@ -490,15 +512,15 @@ public class OkrServiceImpl implements OkrService {
     }
 
     @Override
-    public Map<String, Object> getMyFollowList(JSONObject data){
+    public Map<String, Object> getMyFollowList(JSONObject data) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String openId = sysUser.getOpenId();
         Integer pageSize = data.getInteger("pageSize");
-        if(null == pageSize||pageSize == 0){
+        if (null == pageSize || pageSize == 0) {
             pageSize = 16;
         }
         Integer pageNumber = data.getInteger("pageNumber");
-        if(null == pageNumber||pageNumber == 0){
+        if (null == pageNumber || pageNumber == 0) {
             pageNumber = 1;
         }
         Integer year = data.getInteger("year");
@@ -509,50 +531,51 @@ public class OkrServiceImpl implements OkrService {
         Integer todayQuarter = DateUtils.getQuarter(new Date());
         Integer todayYear = DateUtils.getYear(new Date());
         Integer isCurrentQuarter = 0;
-        if(year ==null){
+        if (year == null) {
             year = todayYear;
         }
-        if(null == quarter||quarter == 0){
+        if (null == quarter || quarter == 0) {
             quarter = todayQuarter;
         }
 
         //如果不是当年当季度,返回O和KR的信息;是当季度,直接返回OKR四象限信息
-        if(todayYear.equals(year) && todayQuarter.equals(quarter)){
+        if (todayYear.equals(year) && todayQuarter.equals(quarter)) {
             isCurrentQuarter = 1;
-        }else{
+        } else {
             isCurrentQuarter = 0;
         }
 
         List<Map<String, Object>> mapList = new ArrayList<>();
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getFollowQuarterObject(openId,name,year, quarter,(pageNumber-1)*pageSize,pageSize);
-        for(OkrObjectInfo object:OkrObjectInfoList){
-            Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getFollowQuarterObject(openId, name, year, quarter, (pageNumber - 1) * pageSize, pageSize);
+        for (OkrObjectInfo object : OkrObjectInfoList) {
+            Map<String, Object> okrmap = getOkrMap(object, openId, year, quarter);
             mapList.add(okrmap);
         }
 
-        map.put("isCurrentQuarter",isCurrentQuarter);
-        map.put("list",mapList);
-        map.put("year",year);
-        map.put("quarter",quarter);
+        map.put("isCurrentQuarter", isCurrentQuarter);
+        map.put("list", mapList);
+        map.put("year", year);
+        map.put("quarter", quarter);
         return map;
     }
 
     private Map<String, Object> getOkrMap(OkrObjectInfo object, String openId, Integer year, Integer quarter) {
-        Map<String,Object>okrmap = new HashMap<>();
+        Map<String, Object> okrmap = new HashMap<>();
         List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(object.getId(), object.getUserId(), year, quarter);
-        List<OkrKrInfo>setList =checkKrList(krList,openId);
+        List<OkrKrInfo> setList = checkKrList(krList, openId);
         QYWxUserInfo userInfo = wxUserInfoService.getByOpenId(object.getUserId());
-        OkrFocusInfo focusInfo = focusInfoService.getByParams(object.getUserId(),openId);
-        if(null == focusInfo){
-            okrmap.put("follow",false);
-        }else{
-            okrmap.put("follow",true);
+        OkrFocusInfo focusInfo = focusInfoService.getByParams(object.getUserId(), openId);
+        if (null == focusInfo) {
+            okrmap.put("follow", false);
+        } else {
+            okrmap.put("follow", true);
         }
         okrmap.put("krList", setList);
         okrmap.put("object", object);
-        okrmap.put("name",userInfo.getName());
+        okrmap.put("name", userInfo.getName());
         return okrmap;
     }
+
     @Autowired
     private IOkrFocusInfoService focusInfoService;
 
@@ -562,11 +585,11 @@ public class OkrServiceImpl implements OkrService {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String openId = sysUser.getOpenId();
         Integer pageSize = data.getInteger("pageSize");
-        if(null == pageSize||pageSize == 0){
+        if (null == pageSize || pageSize == 0) {
             pageSize = 16;
         }
         Integer pageNumber = data.getInteger("pageNumber");
-        if(null == pageNumber||pageNumber == 0){
+        if (null == pageNumber || pageNumber == 0) {
             pageNumber = 1;
         }
         Integer year = data.getInteger("year");
@@ -577,36 +600,38 @@ public class OkrServiceImpl implements OkrService {
         Integer todayQuarter = DateUtils.getQuarter(new Date());
         Integer todayYear = DateUtils.getYear(new Date());
         Integer isCurrentQuarter = 0;
-        if(year ==null){
+        if (year == null) {
             year = todayYear;
         }
-        if(null == quarter||quarter == 0){
+        if (null == quarter || quarter == 0) {
             quarter = todayQuarter;
         }
 
         //如果不是当年当季度,返回O和KR的信息;是当季度,直接返回OKR四象限信息
-        if(todayYear.equals(year) && todayQuarter.equals(quarter)){
+        if (todayYear.equals(year) && todayQuarter.equals(quarter)) {
             isCurrentQuarter = 1;
-        }else{
+        } else {
             isCurrentQuarter = 0;
         }
 
         List<Map<String, Object>> mapList = new ArrayList<>();
         //1:查询自己所属部门下的用户信息
-        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getDepartmentQuarterObject(openId,name,year, quarter,(pageNumber-1)*pageSize,pageSize);
-        for(OkrObjectInfo object:OkrObjectInfoList){
-            Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getDepartmentQuarterObject(openId, name, year, quarter, (pageNumber - 1) * pageSize, pageSize);
+        for (OkrObjectInfo object : OkrObjectInfoList) {
+            Map<String, Object> okrmap = getOkrMap(object, openId, year, quarter);
             mapList.add(okrmap);
         }
 
-        map.put("isCurrentQuarter",isCurrentQuarter);
-        map.put("list",mapList);
-        map.put("year",year);
-        map.put("quarter",quarter);
+        map.put("isCurrentQuarter", isCurrentQuarter);
+        map.put("list", mapList);
+        map.put("year", year);
+        map.put("quarter", quarter);
         return map;
     }
+
     @Autowired
     private IOkrWeekDataService weekDataService;
+
     @Override
     public Map<String, Object> getOkrDetail(JSONObject data) {
         Map<String, Object> result = new HashMap<>();
@@ -615,11 +640,11 @@ public class OkrServiceImpl implements OkrService {
         Integer year = data.getInteger("year");
         Integer quarter = data.getInteger("quarter");
         Integer currentYear = DateUtils.getYear(new Date());
-        if(null == year||year == 0){
+        if (null == year || year == 0) {
             year = currentYear;
         }
         Integer currentQuarter = DateUtils.getQuarter(new Date());
-        if(null == quarter||quarter == 0){
+        if (null == quarter || quarter == 0) {
             quarter = currentQuarter;
         }
         String now = DateUtils.formatDate();
@@ -627,65 +652,65 @@ public class OkrServiceImpl implements OkrService {
         OkrWeekData weekData = weekDataService.getWeekByDate(now);
         List<Integer> months = DateUtils.getMonthsByQuarter(quarter);
         //根据月份数据获取周
-        Map<Integer, Object> weeks = weekDataService.getWeeksByMonths(year,months);
-        Map<String,Object> timeMap = new HashMap<>();
+        Map<Integer, Object> weeks = weekDataService.getWeeksByMonths(year, months);
+        Map<String, Object> timeMap = new HashMap<>();
         timeMap.put("year", year);
-        timeMap.put("quarter",quarter);
-        timeMap.put("currentYear",weekData.getYear());
-        timeMap.put("currentQuarter",weekData.getQuarter());
-        timeMap.put("currentMonth",weekData.getMonth());
-        timeMap.put("currentWeek",weekData.getWeek());
-        timeMap.put("currentDate",weekData.getStartDate()+"至"+weekData.getEndDate());
-        timeMap.put("months",months);
-        timeMap.put("weeks",weeks);
+        timeMap.put("quarter", quarter);
+        timeMap.put("currentYear", weekData.getYear());
+        timeMap.put("currentQuarter", weekData.getQuarter());
+        timeMap.put("currentMonth", weekData.getMonth());
+        timeMap.put("currentWeek", weekData.getWeek());
+        timeMap.put("currentDate", weekData.getStartDate() + "至" + weekData.getEndDate());
+        timeMap.put("months", months);
+        timeMap.put("weeks", weeks);
         result.put("time", timeMap);
 
-        OkrObjectInfo objectInfo =objectInfoService.getByParams(currentUserId,year,quarter);
-        if(null == objectInfo){
+        OkrObjectInfo objectInfo = objectInfoService.getByParams(currentUserId, year, quarter);
+        if (null == objectInfo) {
             return result;
         }
 
         //周任务信息
         List<OkrTaskInfo> taskInfoList = okrTaskInfoService.getTaskInfo(objectInfo.getUserId(), year, quarter, 1);
-        List<OkrTaskInfo> setTaskList =checkTaskInfo(taskInfoList,currentUserId);
+        List<OkrTaskInfo> setTaskList = checkTaskInfo(taskInfoList, currentUserId);
 
         //月度任务信息
         List<OkrTaskInfo> taskFourWeekList = okrTaskInfoService.getTaskInfo(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter(), 2);
-        List<OkrTaskInfo> settaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
+        List<OkrTaskInfo> settaskFourWeekList = checkTaskInfo(taskFourWeekList, currentUserId);
 
         //OKR信息
         List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoService.getQuarterObject(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
         List<Map<String, Object>> okrList = new ArrayList<>();
-        for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
+        for (OkrObjectInfo okrObjectInfo : OkrObjectInfoList) {
             Map<String, Object> okrMap = new HashMap<>();
-            List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(okrObjectInfo.getId(),objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
-            List<OkrKrInfo>setKrList =checkKrList(krList,currentUserId);
-            okrMap.put("objectInfo",okrObjectInfo);
-            okrMap.put("krList",setKrList);
+            List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(okrObjectInfo.getId(), objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
+            List<OkrKrInfo> setKrList = checkKrList(krList, currentUserId);
+            okrMap.put("objectInfo", okrObjectInfo);
+            okrMap.put("krList", setKrList);
             okrList.add(okrMap);
         }
 
         //状态信息
         List<OkrContentStatus> contentStatusList = okrContentStatusMapper.getContentStatusList(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
 
-        result.put("taskInfoList",transformTaskInfo(setTaskList, 1));
-        result.put("taskFourWeekList",transformTaskInfo(settaskFourWeekList, 2));
-        result.put("okr",okrList);
+        result.put("taskInfoList", transformTaskInfo(setTaskList, 1));
+        result.put("taskFourWeekList", transformTaskInfo(settaskFourWeekList, 2));
+        result.put("okr", okrList);
         result.put("status", contentStatusList);
         return result;
     }
 
 
-    public Map<Integer, List<OkrTaskInfo>> transformTaskInfo(List<OkrTaskInfo> taskInfoList, Integer type){
+    public Map<Integer, List<OkrTaskInfo>> transformTaskInfo(List<OkrTaskInfo> taskInfoList, Integer type) {
 
         Map<Integer, List<OkrTaskInfo>> resultMap = new HashMap<>();
         // 1周  2月
-        if(type == 1){
+        if (type == 1) {
             taskInfoList.forEach(taskInfo -> {
                 Integer key = Check.isNull(taskInfo.getWeek()) ? 0 : taskInfo.getWeek();
-                if(resultMap.containsKey(key)){
+                if (resultMap.containsKey(key)) {
                     resultMap.get(key).add(taskInfo);
-                }else{
+                } else {
                     List<OkrTaskInfo> list = new ArrayList<>();
                     list.add(taskInfo);
                     resultMap.put(key, list);
@@ -693,12 +718,12 @@ public class OkrServiceImpl implements OkrService {
             });
         }
 
-        if(type == 2){
+        if (type == 2) {
             taskInfoList.forEach(taskInfo -> {
                 Integer key = Check.isNull(taskInfo.getMonth()) ? 0 : taskInfo.getMonth();
-                if(resultMap.containsKey(key)){
+                if (resultMap.containsKey(key)) {
                     resultMap.get(key).add(taskInfo);
-                }else{
+                } else {
                     List<OkrTaskInfo> list = new ArrayList<>();
                     list.add(taskInfo);
                     resultMap.put(key, list);
@@ -712,33 +737,34 @@ public class OkrServiceImpl implements OkrService {
     }
 
     @Override
-    public void deleteObjectInfoById(OkrObjectInfo objectInfo){
+    public void deleteObjectInfoById(OkrObjectInfo objectInfo) {
         okrObjectInfoService.deleteObjectInfoById(objectInfo);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         //日志留存
-        okrLogService.insertOkrLog(3,1,objectInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(objectInfo),userId);
+        okrLogService.insertOkrLog(3, 1, objectInfo.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(objectInfo), userId);
     }
 
     @Override
-    public void deleteKrById(OkrKrInfo krInfo){
+    public void deleteKrById(OkrKrInfo krInfo) {
         okrKrInfoMapper.deleteKrById(krInfo);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         //日志留存
-        okrLogService.insertOkrLog(3,2,krInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(krInfo),userId);
+        okrLogService.insertOkrLog(3, 2, krInfo.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(krInfo), userId);
     }
 
     @Override
-    public void deleteContentStatusById(OkrContentStatus content){
+    public void deleteContentStatusById(OkrContentStatus content) {
         okrContentStatusMapper.deleteContentStatuaById(content);
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         //日志留存
-        okrLogService.insertOkrLog(3,5,content.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(content),userId);
+        okrLogService.insertOkrLog(3, 5, content.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(content), userId);
     }
+
     @Override
-    public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
+    public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo) {
         okrTaskInfoService.deleteTaskInfoById(okrTaskInfo);
 
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -746,15 +772,16 @@ public class OkrServiceImpl implements OkrService {
         //日志留存
         Integer opetation = 1;
         //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        if(okrTaskInfoService.selectById(okrTaskInfo.getId()).getType()==1){
+        if (okrTaskInfoService.selectById(okrTaskInfo.getId()).getType() == 1) {
             opetation = 3;
-        }else{
+        } else {
             opetation = 4;
         }
-        okrLogService.insertOkrLog(3,opetation,okrTaskInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(okrTaskInfo),userId);
+        okrLogService.insertOkrLog(3, opetation, okrTaskInfo.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(okrTaskInfo), userId);
     }
+
     @Override
-    public void keepTaskInfoById(OkrTaskInfo okrTaskInfo){
+    public void keepTaskInfoById(OkrTaskInfo okrTaskInfo) {
         okrTaskInfoService.keepTaskInfoById(okrTaskInfo);
 
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -762,19 +789,21 @@ public class OkrServiceImpl implements OkrService {
         //日志留存
         Integer opetation = 1;
         //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
-        if(okrTaskInfoService.selectById(okrTaskInfo.getId()).getType()==1){
+        if (okrTaskInfoService.selectById(okrTaskInfo.getId()).getType() == 1) {
             opetation = 3;
-        }else{
+        } else {
             opetation = 4;
         }
-        okrLogService.insertOkrLog(4,opetation,okrTaskInfo.getId(),DateUtils.getYear(new Date()),DateUtils.getQuarter(new Date()),JSONObject.toJSONString(okrTaskInfo),userId);
+        okrLogService.insertOkrLog(4, opetation, okrTaskInfo.getId(), DateUtils.getYear(new Date()), DateUtils.getQuarter(new Date()), JSONObject.toJSONString(okrTaskInfo), userId);
     }
+
     @Autowired
     private IOkrObjectInfoDisclosureService okrObjectInfoDisclosureService;
     @Autowired
     private IOkrObjectInfoRemindService okrObjectInfoRemindService;
+
     @Override
-    public void insertOkrKrInfo(OkrKrInfo krInfo){
+    public void insertOkrKrInfo(OkrKrInfo krInfo) {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
@@ -784,19 +813,18 @@ public class OkrServiceImpl implements OkrService {
         krInfo.setUserId(userId);
         okrKrInfoMapper.insertOkrKrInfo(krInfo);
 
-        insertKrPublicIds(krInfo,krInfo.getPublicIds());
-        insertKrRemindIds(sysUser.getName(),krInfo,krInfo.getRemindIds());
+        insertKrPublicIds(krInfo, krInfo.getPublicIds());
+        insertKrRemindIds(sysUser.getName(), krInfo, krInfo.getRemindIds());
 
         //日志留存
-        okrLogService.insertOkrLog(1,2,krInfo.getId(),year,quarter,JSONObject.toJSONString(krInfo),userId);
+        okrLogService.insertOkrLog(1, 2, krInfo.getId(), year, quarter, JSONObject.toJSONString(krInfo), userId);
 
     }
 
     @Override
-    public List<Integer> getObjectYear(){
+    public List<Integer> getObjectYear() {
         return okrObjectInfoService.getObjectYear();
     }
 
 
-
 }

+ 22 - 11
src/main/java/cn/com/ctop/okr/service/impl/OkrTaskInfoServiceImpl.java

@@ -20,9 +20,10 @@ import java.util.List;
 public class OkrTaskInfoServiceImpl extends ServiceImpl<OkrTaskInfoMapper, OkrTaskInfo> implements IOkrTaskInfoService {
     @Resource
     private OkrTaskInfoMapper okrTaskInfoMapper;
+
     @Override
     public List<OkrTaskInfo> getTaskInfo(String userId, Integer year, Integer quarter, int type) {
-        return okrTaskInfoMapper.getTaskInfo(userId,year,quarter,type);
+        return okrTaskInfoMapper.getTaskInfo(userId, year, quarter, type);
     }
 
     @Override
@@ -44,8 +45,8 @@ public class OkrTaskInfoServiceImpl extends ServiceImpl<OkrTaskInfoMapper, OkrTa
     public void keepTaskInfoById(OkrTaskInfo okrTaskInfo) {
         this.updateById(okrTaskInfo);
         okrTaskInfoMapper.deleteTaskInfoById(okrTaskInfo);
-        if(!Check.isNull(okrTaskInfo.getWeek())){
-            okrTaskInfo.setWeek(okrTaskInfo.getWeek()+1);
+        if (!Check.isNull(okrTaskInfo.getWeek())) {
+            okrTaskInfo.setWeek(okrTaskInfo.getWeek() + 1);
             okrTaskInfoMapper.insertTaskInfo(okrTaskInfo);
         }
     }
@@ -63,7 +64,7 @@ public class OkrTaskInfoServiceImpl extends ServiceImpl<OkrTaskInfoMapper, OkrTa
     @Override
     public OkrTaskInfo checkShow(OkrTaskInfo taskInfo, String openId) {
         String getOpenId = taskInfo.getUserId();
-        if(openId.equals(getOpenId)){
+        if (openId.equals(getOpenId)) {
             //表示是本人的OKR信息  展示所有
             //查询相关@信息
             List<RemindVO> remindVOS = remindService.getRemindVOByTaskId(taskInfo.getId());
@@ -72,17 +73,17 @@ public class OkrTaskInfoServiceImpl extends ServiceImpl<OkrTaskInfoMapper, OkrTa
             taskInfo.setPublicVOS(publicVOS);
             return taskInfo;
 
-        }else{
+        } else {
             Integer permission = taskInfo.getPermission();
-            if(permission == 2){
+            if (permission == 2) {
                 //私密
                 return null;
             }
-            if(permission == 3){
+            if (permission == 3) {
                 //对某人公开
-                OkrTaskInfoDisclosure disclosureStaff = disclosureService.checkStaffByParams(taskInfo.getId(),openId,2);
-                OkrTaskInfoDisclosure disclosureDepart = disclosureService.checkDepartByParams(taskInfo.getId(),openId,1);
-                if(null == disclosureDepart&&disclosureStaff == null){
+                OkrTaskInfoDisclosure disclosureStaff = disclosureService.checkStaffByParams(taskInfo.getId(), openId, 2);
+                OkrTaskInfoDisclosure disclosureDepart = disclosureService.checkDepartByParams(taskInfo.getId(), openId, 1);
+                if (null == disclosureDepart && disclosureStaff == null) {
                     return null;
                 }
                 //查询相关@信息
@@ -90,7 +91,7 @@ public class OkrTaskInfoServiceImpl extends ServiceImpl<OkrTaskInfoMapper, OkrTa
                 taskInfo.setRemindVOS(vos);
                 return taskInfo;
             }
-            if(permission == 1){
+            if (permission == 1) {
                 //公开
                 //查询相关@信息
                 List<RemindVO> vos = remindService.getRemindVOByTaskId(taskInfo.getId());
@@ -100,4 +101,14 @@ public class OkrTaskInfoServiceImpl extends ServiceImpl<OkrTaskInfoMapper, OkrTa
             return null;
         }
     }
+
+    @Override
+    public Integer checkTaskByMonth(Integer checkYear, Integer checkMonth, String taskTitle,String userId) {
+        return okrTaskInfoMapper.checkTaskByMonth(checkYear, checkMonth, taskTitle,userId);
+    }
+
+    @Override
+    public Integer checkTaskByWeek(Integer year, Integer month, Integer week, String taskTitle,String userId) {
+        return okrTaskInfoMapper.checkTaskByWeek(year, month, week, taskTitle,userId);
+    }
 }