#

luxiaotao1123

2022-11-24 d1317008f330b6716d12d867b5a9f6f2ad33eb9f

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -116,19 +116,29 @@
        plan.setForm(JSON.toJSONString(param));     // 自定义表单内容
        plan.setSettle(1);  // 1.开始

        planService.insert(plan);
        if (!planService.insert(plan)) {
            throw new CoolException("保持失败，请重试");
        }
        return R.ok();
    }

   @RequestMapping(value = "/plan/update/auth")
   @ManagerAuth
    public R update(Plan plan){
        if (Cools.isEmpty(plan) || null==plan.getId()){
    public R update(@RequestParam Map<String, Object> param){
        if (Cools.isEmpty(param) || Cools.isEmpty(param.get("id"))){
            return R.error();
        }
        // pre
        Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
        param.entrySet().removeIf(next -> this.fields.contains(next.getKey()));
        plan.setUpdateBy(getUserId());
        plan.setUpdateTime(new Date());
        planService.updateById(plan);

        plan.setForm(JSON.toJSONString(param));     // 自定义表单内容

        if (!planService.updateById(plan)) {
            throw new CoolException("保持失败，请重试");
        }
        return R.ok();
    }

@@ -228,8 +238,8 @@

    @RequestMapping(value = "/plan/followers/table/auth")
    @ManagerAuth
    public R planFollowersTable(@RequestParam("orderId") Long orderId) {
        List<PlanFoll> planFolls = planFollService.selectList(new EntityWrapper<PlanFoll>().eq("plan_id", orderId).orderBy("id", false));
    public R planFollowersTable(@RequestParam("planId") Long planId) {
        List<PlanFoll> planFolls = planFollService.selectList(new EntityWrapper<PlanFoll>().eq("plan_id", planId).orderBy("id", false));
        List<FollowerTableVo> result = new ArrayList<>();
        for (PlanFoll planFoll : planFolls) {
            User user = userService.selectById(planFoll.getUserId());
@@ -244,15 +254,15 @@
    @RequestMapping(value = "/plan/followers/add/auth")
    @ManagerAuth
    @Transactional
    public R planFollowersAdd(@RequestParam("orderId") Long orderId,
    public R planFollowersAdd(@RequestParam("planId") Long planId,
                               @RequestParam("followerIds[]") Long[] followerIds) {
        if (Cools.isEmpty(orderId, followerIds)) {
        if (Cools.isEmpty(planId, followerIds)) {
            return R.parse(BaseRes.PARAM);
        }
        for (Long userId : followerIds) {
            if (planFollService.selectCount(new EntityWrapper<PlanFoll>().eq("plan_id", orderId).eq("user_id", userId)) == 0) {
            if (planFollService.selectCount(new EntityWrapper<PlanFoll>().eq("plan_id", planId).eq("user_id", userId)) == 0) {
                PlanFoll planFoll = new PlanFoll();
                planFoll.setPlanId(orderId);
                planFoll.setPlanId(planId);
                planFoll.setUserId(userId);
                if (!planFollService.insert(planFoll)) {
                    throw new CoolException("添加失败，请联系管理员");
@@ -264,12 +274,12 @@

    @RequestMapping(value = "/plan/followers/remove/auth")
    @ManagerAuth
    public R planFollowersRemove(@RequestParam("orderId") Long orderId,
    public R planFollowersRemove(@RequestParam("planId") Long planId,
                                  @RequestParam("userId") Long userId) {
        if (Cools.isEmpty(orderId, userId)) {
        if (Cools.isEmpty(planId, userId)) {
            return R.parse(BaseRes.PARAM);
        }
        if (!planFollService.delete(new EntityWrapper<PlanFoll>().eq("plan_id", orderId).eq("user_id", userId))) {
        if (!planFollService.delete(new EntityWrapper<PlanFoll>().eq("plan_id", planId).eq("user_id", userId))) {
            throw new CoolException("删除失败，请联系管理员");
        }
        return R.ok("删除成功");