|
@@ -1,8 +1,10 @@
|
|
package cn.com.ctop.okr.controller;
|
|
package cn.com.ctop.okr.controller;
|
|
|
|
|
|
import cn.com.ctop.okr.entity.OkrKrInfo;
|
|
import cn.com.ctop.okr.entity.OkrKrInfo;
|
|
|
|
+import cn.com.ctop.okr.entity.QYWxUserInfo;
|
|
import cn.com.ctop.okr.service.IKrAlignInfoService;
|
|
import cn.com.ctop.okr.service.IKrAlignInfoService;
|
|
import cn.com.ctop.okr.service.IKrInfoservice;
|
|
import cn.com.ctop.okr.service.IKrInfoservice;
|
|
|
|
+import cn.com.ctop.okr.service.IQYWxUserInfoService;
|
|
import cn.com.ctop.okr.utils.StringUtils;
|
|
import cn.com.ctop.okr.utils.StringUtils;
|
|
import cn.com.ctop.okr.vo.Result;
|
|
import cn.com.ctop.okr.vo.Result;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -13,24 +15,28 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
|
+import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/kr")
|
|
@RequestMapping("/kr")
|
|
public class OkrKrController {
|
|
public class OkrKrController {
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private IQYWxUserInfoService qyWxUserInfoService;
|
|
|
|
+ @Autowired
|
|
private IKrAlignInfoService alignInfoService;
|
|
private IKrAlignInfoService alignInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
private IKrInfoservice krInfoservice;
|
|
private IKrInfoservice krInfoservice;
|
|
|
|
+
|
|
@PostMapping("alignList")
|
|
@PostMapping("alignList")
|
|
public Map<String,Object>alignList(Long originId){
|
|
public Map<String,Object>alignList(Long originId){
|
|
return alignInfoService.alignListByParams(originId);
|
|
return alignInfoService.alignListByParams(originId);
|
|
}
|
|
}
|
|
-
|
|
|
|
@PostMapping("addAlign")
|
|
@PostMapping("addAlign")
|
|
public Map<String,Object>addAlign(Long originId, String alignId){
|
|
public Map<String,Object>addAlign(Long originId, String alignId){
|
|
return alignInfoService.addAlign(originId,alignId);
|
|
return alignInfoService.addAlign(originId,alignId);
|
|
}
|
|
}
|
|
|
|
+
|
|
@PostMapping("deleteAlign")
|
|
@PostMapping("deleteAlign")
|
|
public Map<String,Object>deleteAlign(Long originId,Long alignId){
|
|
public Map<String,Object>deleteAlign(Long originId,Long alignId){
|
|
return alignInfoService.deleteAlign(originId,alignId);
|
|
return alignInfoService.deleteAlign(originId,alignId);
|
|
@@ -42,7 +48,6 @@ public class OkrKrController {
|
|
* @param krInfo
|
|
* @param krInfo
|
|
* @param pageNo
|
|
* @param pageNo
|
|
* @param pageSize
|
|
* @param pageSize
|
|
- * @param req
|
|
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/list")
|
|
@GetMapping(value = "/list")
|
|
@@ -58,6 +63,16 @@ public class OkrKrController {
|
|
queryWrapper.eq("quarter",krInfo.getQuarter());
|
|
queryWrapper.eq("quarter",krInfo.getQuarter());
|
|
Page<OkrKrInfo> page = new Page<>(pageNo, pageSize);
|
|
Page<OkrKrInfo> page = new Page<>(pageNo, pageSize);
|
|
IPage<OkrKrInfo> pageList = krInfoservice.page(page, queryWrapper);
|
|
IPage<OkrKrInfo> pageList = krInfoservice.page(page, queryWrapper);
|
|
|
|
+ List<OkrKrInfo>details = pageList.getRecords();
|
|
|
|
+ if(null!=details&&!details.isEmpty()){
|
|
|
|
+ details.forEach(detail->{
|
|
|
|
+ QYWxUserInfo userInfo = qyWxUserInfoService.getByOpenId(detail.getUserId());
|
|
|
|
+ if(null!=userInfo){
|
|
|
|
+ detail.setUserName(userInfo.getName());
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ pageList.setRecords(details);
|
|
|
|
+ }
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
return result;
|
|
return result;
|