Ver Fonte

okr@所有人;kr信息添加描述

syh há 4 anos atrás
pai
commit
7504620d2a

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

@@ -334,14 +334,10 @@ public class OkrController {
 
     /**
      * 更新状态指标
-     * @param request
-     * @param response
      * @return
      */
     @RequestMapping(value = "/updateKr")
-    public Result<List<UserInfoDto>> updateKr(@RequestBody OkrDto dto,
-                                                  HttpServletRequest request,
-                                                  HttpServletResponse response){
+    public Result<List<UserInfoDto>> updateKr(@RequestBody OkrDto dto){
         Result<List<UserInfoDto>> result = new Result();
         if(dto == null || dto.getKrInfo()==null ){
             result.setSuccess(false);
@@ -400,7 +396,6 @@ public class OkrController {
      */
     @RequestMapping(value = "/deleteKrById")
     public Result<List<UserInfoDto>> deleteKrById(@RequestBody OkrDto dto){
-        logger.info("/okr/deleteKrById 方法开始");
         Result<List<UserInfoDto>> result = new Result();
         if(dto == null || dto.getKrInfo()==null ){
             result.setSuccess(false);

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

@@ -25,6 +25,7 @@ public class OkrKrInfo {
     private Integer completion;
     private Date createTime;
     private Date updateTime;
+    private String krDesc;
     /**
      * 1:公开
      * 2:私密

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

@@ -16,4 +16,6 @@ public interface QYWxDepartInfoMapper extends BaseMapper<QYWxDepartInfo> {
     List<QYWxDepartInfoVO> getDepartInfoVo();
 
     List<String> getUserIdByDepartId(Long departId);
+
+    List<String> getAllUserId();
 }

+ 4 - 2
src/main/java/cn/com/ctop/okr/mapper/xml/OkrKrInfoMapper.xml

@@ -55,7 +55,8 @@
                 year,
                 quarter,
                 status,
-                completion
+                completion,
+                kr_desc
             )
         values
             (
@@ -65,7 +66,8 @@
                 #{kr.year},
                 #{kr.quarter},
                 1,
-                #{kr.completion}
+                #{kr.completion},
+                #{kr.krDesc}
             )
     </insert>
 

+ 3 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/QYWxDepartInfoMapper.xml

@@ -26,6 +26,9 @@
     <select id="getUserIdByDepartId" resultType="java.lang.String">
         select userid from wx_user_depart_map where depart_id = #{departId}
     </select>
+    <select id="getAllUserId" resultType="java.lang.String">
+        select userid from wx_user_info where status = 1 and open_id = 'obQGf1bRW0rqk0PUJJuKj0RkZUJ0'
+    </select>
 
 
 </mapper>

+ 3 - 0
src/main/java/cn/com/ctop/okr/service/QYWxDepartInfoService.java

@@ -8,4 +8,7 @@ public interface QYWxDepartInfoService {
     List<TagInfoTreeModel> queryTreeList();
 
     List<String>getUserIdByDepartId(Long departId);
+
+    List<String> getAllUserId();
+
 }

+ 16 - 3
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -192,7 +192,14 @@ public class OkrServiceImpl implements OkrService {
                 //部门
                 if(ids.length == 1){
                     remind.setRemindType(1);
-                    List<String>wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
+                    Long departId = Long.parseLong(ids[0]);
+                    List<String>wechatIds;
+                    //@所有人
+                    if(null!=departId&&departId == 10086){
+                        wechatIds = qyWxDepartInfoService.getAllUserId();
+                    }else {
+                        wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
+                    }
                     CorpWexinUtils.sendMessage(wechatIds,userName+"在okr中@了你: "+taskInfo.getTaskTitle());
                 }
                 if(ids.length == 2){
@@ -297,7 +304,14 @@ public class OkrServiceImpl implements OkrService {
                 //部门
                 if(ids.length == 1){
                     remind.setRemindType(1);
-                    List<String>wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
+                    Long departId = Long.parseLong(ids[0]);
+                    List<String>wechatIds;
+                    //@所有人
+                    if(null!=departId&&departId == 10086){
+                        wechatIds = qyWxDepartInfoService.getAllUserId();
+                    }else {
+                        wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
+                    }
                     if(null!=wechatIds&&!wechatIds.isEmpty()){
                         CorpWexinUtils.sendMessage(wechatIds,username+"在OKR中@你了: "+krInfo.getKrInfo());
                     }
@@ -641,7 +655,6 @@ public class OkrServiceImpl implements OkrService {
         String userId = sysUser.getOpenId();
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
-
         krInfo.setYear(year);
         krInfo.setQuarter(quarter);
         krInfo.setUserId(userId);

+ 16 - 3
src/main/java/cn/com/ctop/okr/service/impl/QYWxDepartInfoServiceImpl.java

@@ -23,11 +23,19 @@ public class QYWxDepartInfoServiceImpl extends ServiceImpl<QYWxDepartInfoMapper,
     private QYWxUserInfoMapper qyWxUserInfoMapper;
     @Override
     public List<TagInfoTreeModel> queryTreeList() {
+        List<QYWxDepartInfoVO> all = new ArrayList<>();
+        QYWxDepartInfoVO vo = new QYWxDepartInfoVO();
+        vo.setId("10086");
+        vo.setValue("10086");
+        vo.setLabel("所有人");
+        vo.setParentId(1L);
+        all.add(vo);
         List<QYWxDepartInfoVO> list = qyWxDepartInfoMapper.getDepartInfoVo();
+        all.addAll(list);
         List<QYWxDepartInfoVO> userList = qyWxUserInfoMapper.getDepartInfoVo();
-        list.addAll(userList);
+        all.addAll(userList);
         // 调用wrapTreeDataToTreeList方法生成树状数据
-        return this.wrapTreeDataToTreeList(list);
+        return this.wrapTreeDataToTreeList(all);
     }
 
     /**
@@ -118,7 +126,7 @@ public class QYWxDepartInfoServiceImpl extends ServiceImpl<QYWxDepartInfoMapper,
 
         for (int i = 0; i < treeList.size(); i++) {
             TagInfoTreeModel model = treeList.get(i);
-            if (model.getChildren().size() == 0) {
+            if (null == model.getChildren()||model.getChildren().isEmpty()) {
                 model.setChildren(null);
                 model.setLeaf(true);
             }else{
@@ -133,4 +141,9 @@ public class QYWxDepartInfoServiceImpl extends ServiceImpl<QYWxDepartInfoMapper,
     public List<String>getUserIdByDepartId(Long departId){
         return qyWxDepartInfoMapper.getUserIdByDepartId(departId);
     }
+
+    @Override
+    public List<String> getAllUserId() {
+        return qyWxDepartInfoMapper.getAllUserId();
+    }
 }