|
@@ -8,7 +8,6 @@ import cn.com.ctop.okr.utils.DateUtils;
|
|
|
import cn.com.ctop.okr.utils.ResultMapUtils;
|
|
|
import cn.com.ctop.okr.utils.StatusCode;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.xxl.job.core.util.DateUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -24,17 +23,23 @@ public class OkrServiceImpl implements OkrService {
|
|
|
@Autowired
|
|
|
private OkrKrInfoMapper okrKrInfoMapper;
|
|
|
@Autowired
|
|
|
- private OkrLogMapper okrLogMapper;
|
|
|
- @Autowired
|
|
|
private OkrMemberMapper okrMemberMapper;
|
|
|
@Autowired
|
|
|
- private OkrObjectInfoMapper okrObjectInfoMapper;
|
|
|
+ private IOkrObjectInfoService okrObjectInfoService;
|
|
|
@Autowired
|
|
|
private IOkrTaskInfoService okrTaskInfoService;
|
|
|
@Autowired
|
|
|
private QYWxUserInfoMapper wxUserInfoMapper;
|
|
|
@Autowired
|
|
|
+ private IOkrTaskInfoDisclosureService okrTaskInfoDisclosureService;
|
|
|
+ @Autowired
|
|
|
+ private IOkrTaskInfoRemindService okrTaskInfoRemindService;
|
|
|
+ @Autowired
|
|
|
private IOkrObjectInfoService objectInfoService;
|
|
|
+ @Autowired
|
|
|
+ IOkrLogService okrLogService;
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public Map<String, Object> getOkrInfo(UserInfoDto data){
|
|
|
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>settaskFourWeekList =checkTaskInfo(taskInfoList,currentUserId);
|
|
|
+ List<OkrTaskInfo>setTaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
|
|
|
|
|
|
//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<>();
|
|
|
for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
|
|
|
Map<String, Object> okrMap = new HashMap<>();
|
|
@@ -74,7 +79,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
timeMap.put("quarter",objectInfo.getQuarter());
|
|
|
result.put("time", timeMap);
|
|
|
result.put("taskInfoList",setTaskList);
|
|
|
- result.put("taskFourWeekList",settaskFourWeekList);
|
|
|
+ result.put("taskFourWeekList",setTaskFourWeekList);
|
|
|
result.put("okr",okrList);
|
|
|
result.put("status", contentStatusList);
|
|
|
return result;
|
|
@@ -100,11 +105,8 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void insertOkrMember(List<String> memberList){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = sysUser.getOpenId();
|
|
|
- //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
-
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
|
-
|
|
|
okrMemberMapper.deleteOkrMemberByUserId(userId,year,quarter);
|
|
|
okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
|
|
|
}
|
|
@@ -113,12 +115,8 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void insertOkrMember2(List<String> memberList){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = sysUser.getOpenId();
|
|
|
- //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
-
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
|
-
|
|
|
- //okrMemberMapper.deleteOkrMemberByUserId2(userId,memyear,quarter);
|
|
|
okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
|
|
|
}
|
|
|
|
|
@@ -126,31 +124,20 @@ public class OkrServiceImpl implements OkrService {
|
|
|
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){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = sysUser.getOpenId();
|
|
|
- //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
-
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
|
-
|
|
|
return okrMemberMapper.getMemberListByUserId(userId, name, year, quarter);
|
|
|
}
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private IOkrTaskInfoDisclosureService okrTaskInfoDisclosureService;
|
|
|
- @Autowired
|
|
|
- private IOkrTaskInfoRemindService okrTaskInfoRemindService;
|
|
|
//保存任务
|
|
|
+
|
|
|
@Override
|
|
|
public void insertTaskInfo(OkrTaskInfo taskInfo){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
@@ -161,8 +148,20 @@ public class OkrServiceImpl implements OkrService {
|
|
|
taskInfo.setYear(year);
|
|
|
taskInfo.setQuarter(quarter);
|
|
|
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){
|
|
|
OkrTaskInfoDisclosure disclosure = new OkrTaskInfoDisclosure();
|
|
|
disclosure.setExtraId(publicId);
|
|
@@ -180,8 +179,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
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){
|
|
|
OkrTaskInfoRemind remind = new OkrTaskInfoRemind();
|
|
|
remind.setExtraId(remindId);
|
|
@@ -199,25 +199,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
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
|
|
|
public void updateTaskInfo(OkrTaskInfo taskInfo){
|
|
|
List<String>publicIds = taskInfo.getRemindIds();
|
|
@@ -229,184 +213,90 @@ public class OkrServiceImpl implements OkrService {
|
|
|
taskInfo = okrTaskInfoService.selectById(taskInfo.getId());
|
|
|
okrTaskInfoDisclosureService.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();
|
|
|
String userId = sysUser.getOpenId();
|
|
|
- //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
- OkrLog okrLog = new OkrLog();
|
|
|
- //操作:1.创建2.修改3.删除
|
|
|
- okrLog.setType(2);
|
|
|
+ Integer operation;
|
|
|
if(taskInfo.getType() == 1){
|
|
|
- //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
- okrLog.setOperation(3);
|
|
|
+ operation = 3;
|
|
|
}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
|
|
|
public void insertContentStatus(OkrContentStatus content){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = sysUser.getOpenId();
|
|
|
- //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
content.setUserId(userId);
|
|
|
content.setYear(DateUtils.getYear(new Date()));
|
|
|
content.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
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
|
|
|
public void updateContentStatus(OkrContentStatus content){
|
|
|
okrContentStatusMapper.updateContentStatus(content);
|
|
|
-
|
|
|
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(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
|
|
|
+
|
|
|
@Override
|
|
|
public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = sysUser.getOpenId();
|
|
|
- //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
-
|
|
|
Integer quarter = DateUtils.getQuarter(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()){
|
|
|
for(String publicId:publicIds){
|
|
|
OkrObjectInfoDisclosure disclosure = new OkrObjectInfoDisclosure();
|
|
@@ -425,48 +315,42 @@ public class OkrServiceImpl implements OkrService {
|
|
|
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();
|
|
|
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的同事的列表
|
|
|
+
|
|
|
@Override
|
|
|
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){
|
|
|
- pageSize = 12;
|
|
|
+ pageSize = 16;
|
|
|
}
|
|
|
Integer pageNumber = data.getInteger("pageNumber");
|
|
|
if(null == pageNumber||pageNumber == 0){
|
|
@@ -495,7 +379,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
}
|
|
|
|
|
|
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){
|
|
|
Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
|
|
|
mapList.add(okrmap);
|
|
@@ -529,7 +413,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
String openId = sysUser.getOpenId();
|
|
|
Integer pageSize = data.getInteger("pageSize");
|
|
|
if(null == pageSize||pageSize == 0){
|
|
|
- pageSize = 12;
|
|
|
+ pageSize = 16;
|
|
|
}
|
|
|
Integer pageNumber = data.getInteger("pageNumber");
|
|
|
if(null == pageNumber||pageNumber == 0){
|
|
@@ -558,7 +442,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
}
|
|
|
|
|
|
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){
|
|
|
Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
|
|
|
mapList.add(okrmap);
|
|
@@ -587,17 +471,17 @@ public class OkrServiceImpl implements OkrService {
|
|
|
okrmap.put("name",userInfo.getName());
|
|
|
return okrmap;
|
|
|
}
|
|
|
-
|
|
|
@Autowired
|
|
|
private IOkrFocusInfoService focusInfoService;
|
|
|
|
|
|
+
|
|
|
@Override
|
|
|
public Map<String, Object> getMyDepartmentList(JSONObject data) {
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String openId = sysUser.getOpenId();
|
|
|
Integer pageSize = data.getInteger("pageSize");
|
|
|
if(null == pageSize||pageSize == 0){
|
|
|
- pageSize = 12;
|
|
|
+ pageSize = 16;
|
|
|
}
|
|
|
Integer pageNumber = data.getInteger("pageNumber");
|
|
|
if(null == pageNumber||pageNumber == 0){
|
|
@@ -627,7 +511,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
List<Map<String, Object>> mapList = new ArrayList<>();
|
|
|
//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){
|
|
|
Map<String, Object> okrmap = getOkrMap(object,openId,year,quarter);
|
|
|
mapList.add(okrmap);
|
|
@@ -661,7 +545,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
List<OkrTaskInfo>settaskFourWeekList =checkTaskInfo(taskFourWeekList,currentUserId);
|
|
|
|
|
|
//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<>();
|
|
|
for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
|
|
|
Map<String, Object> okrMap = new HashMap<>();
|
|
@@ -688,83 +572,45 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
@Override
|
|
|
public void deleteObjectInfoById(OkrObjectInfo objectInfo){
|
|
|
- okrObjectInfoMapper.deleteObjectInfoById(objectInfo);
|
|
|
-
|
|
|
+ okrObjectInfoService.deleteObjectInfoById(objectInfo);
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
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
|
|
|
public void deleteKrById(OkrKrInfo krInfo){
|
|
|
okrKrInfoMapper.deleteKrById(krInfo);
|
|
|
-
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
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
|
|
|
public void deleteContentStatusById(OkrContentStatus content){
|
|
|
okrContentStatusMapper.deleteContentStatuaById(content);
|
|
|
-
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
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
|
|
|
public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
|
|
|
okrTaskInfoService.deleteTaskInfoById(okrTaskInfo);
|
|
|
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
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){
|
|
|
- okrLog.setOperation(3); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
+ opetation = 3;
|
|
|
}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
|
|
|
private IOkrObjectInfoDisclosureService okrObjectInfoDisclosureService;
|
|
@@ -782,61 +628,17 @@ public class OkrServiceImpl implements OkrService {
|
|
|
krInfo.setUserId(userId);
|
|
|
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
|
|
|
public List<Integer> getObjectYear(){
|
|
|
- return okrObjectInfoMapper.getObjectYear();
|
|
|
+ return okrObjectInfoService.getObjectYear();
|
|
|
}
|
|
|
|
|
|
|