浏览代码

同步人接口增加两个,一个是单纯删除的接口,一个是单纯增加的接口,旧接口和前端联调之后移除

hcst_sunzhen 4 年之前
父节点
当前提交
1b2b78debb

+ 55 - 2
src/main/java/cn/com/ctop/okr/controller/OkrController.java

@@ -125,7 +125,7 @@ public class OkrController {
     public Result saveOkrMember(@RequestBody UserInfoDto dto,
     public Result saveOkrMember(@RequestBody UserInfoDto dto,
                              HttpServletRequest request,
                              HttpServletRequest request,
                              HttpServletResponse response){
                              HttpServletResponse response){
-        logger.info("/okr/getOkrInfo 方法开始");
+        logger.info("/okr/saveOkrMember 方法开始");
         Result result = new Result();
         Result result = new Result();
         List<String> userIdList = dto.getUserIdList();
         List<String> userIdList = dto.getUserIdList();
         if(userIdList == null || userIdList.size() == 0){
         if(userIdList == null || userIdList.size() == 0){
@@ -141,7 +141,60 @@ public class OkrController {
             result.setSuccess(false);
             result.setSuccess(false);
             result.setMessage("error");
             result.setMessage("error");
         }finally{
         }finally{
-            logger.info("/okr/getOkrInfo 方法结束");
+            logger.info("/okr/saveOkrMember 方法结束");
+        }
+
+        return result;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/deleteOkrMember")
+    public Result deleteOkrMember(@RequestBody UserInfoDto dto,
+                                HttpServletRequest request,
+                                HttpServletResponse response){
+        logger.info("/okr/deleteOkrMember 方法开始");
+        Result result = new Result();
+        if(dto == null || StringUtils.isBlank(dto.getMemberId())){
+            result.setSuccess(false);
+            result.setMessage("需要删除的同步人不能为空");
+            return result;
+        }
+
+        try {
+            okrService.deleteOkrMember(dto.getMemberId());
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/deleteOkrMember 方法结束");
+        }
+
+        return result;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/saveOkrMember2")
+    public Result saveOkrMember2(@RequestBody UserInfoDto dto,
+                                HttpServletRequest request,
+                                HttpServletResponse response){
+        logger.info("/okr/saveOkrMember2 方法开始");
+        Result result = new Result();
+        List<String> userIdList = dto.getUserIdList();
+        if(userIdList == null || userIdList.size() == 0){
+            result.setSuccess(false);
+            result.setMessage("同步人员不能为空");
+            return result;
+        }
+
+        try {
+            okrService.insertOkrMember2(userIdList);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("error");
+        }finally{
+            logger.info("/okr/saveOkrMember2 方法结束");
         }
         }
 
 
         return result;
         return result;

+ 1 - 0
src/main/java/cn/com/ctop/okr/dto/UserInfoDto.java

@@ -13,5 +13,6 @@ public class UserInfoDto {
     private List<String> userIdList;
     private List<String> userIdList;
     private Integer year;
     private Integer year;
     private Integer quarter;
     private Integer quarter;
+    private String memberId;
 
 
 }
 }

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

@@ -8,7 +8,9 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.List;
 
 
 public interface OkrMemberMapper extends BaseMapper<OkrContentStatus> {
 public interface OkrMemberMapper extends BaseMapper<OkrContentStatus> {
-    void deleteOkrMemberByUserId(@Param("userId")String userId);
+    void deleteOkrMemberByUserId(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
+
+    void deleteOkrMemberByUserId2(@Param("userId")String userId, @Param("memberId")String memberId,@Param("year")Integer year, @Param("quarter")Integer quarter);
 
 
     void insertOkrMember(@Param("userId")String userId, @Param("memberList") List<String> memberList, @Param("year")Integer year, @Param("quarter")Integer quarter);
     void insertOkrMember(@Param("userId")String userId, @Param("memberList") List<String> memberList, @Param("year")Integer year, @Param("quarter")Integer quarter);
 
 

+ 12 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrMemberMapper.xml

@@ -25,6 +25,18 @@
         from
         from
         okr_member
         okr_member
         where user_id = #{userId}
         where user_id = #{userId}
+        and year = #{year}
+        and quarter = #{quarter}
+    </delete>
+
+    <delete id="deleteOkrMemberByUserId2">
+        delete
+        from
+        okr_member
+        where user_id = #{userId}
+        and member_id = #{memberId}
+        and year = #{year}
+        and quarter = #{quarter}
     </delete>
     </delete>
 
 
     <insert id="insertOkrMember">
     <insert id="insertOkrMember">

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

@@ -16,6 +16,10 @@ public interface OkrService{
 
 
     void insertOkrMember(List<String> memberList);
     void insertOkrMember(List<String> memberList);
 
 
+    void deleteOkrMember(String memberId);
+
+    void insertOkrMember2(List<String> memberList);
+
     List<UserInfoDto> getMemberListByUserId(String name);
     List<UserInfoDto> getMemberListByUserId(String name);
 
 
     Map<String, Object> getSyncUserListByMemberId(Integer year, Integer quarter, String name);
     Map<String, Object> getSyncUserListByMemberId(Integer year, Integer quarter, String name);

+ 26 - 1
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -89,11 +89,36 @@ public class OkrServiceImpl implements OkrService {
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer quarter = DateUtils.getQuarter(new Date());
         Integer year = DateUtils.getYear(new Date());
         Integer year = DateUtils.getYear(new Date());
 
 
-        okrMemberMapper.deleteOkrMemberByUserId(userId);
+        okrMemberMapper.deleteOkrMemberByUserId(userId,year,quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
         okrMemberMapper.insertOkrMember(userId, memberList, year, quarter);
     }
     }
 
 
     @Override
     @Override
+    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);
+    }
+
+    @Override
+    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();
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String userId = sysUser.getOpenId();