#

whycq

2023-09-09 34f99d106551b51bf2af3bbd40c64624a3af25eb

#

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

@@ -115,6 +115,7 @@
            Map<String, Object> map = new HashMap<>();
            map.put("id", company.getId());
            map.put("value", company.getId());
            map.put("name", company.getName());
            result.add(map);
        }
        return R.ok(result);

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

@@ -12,6 +12,7 @@
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.entity.OrderFoll;
import com.zy.crm.manager.service.OrderFollService;
@@ -122,6 +123,7 @@
            Map<String, Object> map = new HashMap<>();
            map.put("id", order.getId());
            map.put("value", order.getId());
            map.put("name", order.getName());
            result.add(map);
        }
        return R.ok(result);
@@ -264,6 +266,24 @@
        return R.ok("添加成功");
    }

    @RequestMapping(value = "/order/followers/add/json")
    @ManagerAuth
    @Transactional
    public R cstmrFollowersAddJson(@RequestBody() Map map) {
        long cstmrId = Long.valueOf(String.valueOf(map.get("orderId")));
        long followerIds = Long.valueOf(String.valueOf(map.get("followerIds")));
        if (Cools.isEmpty(cstmrId, followerIds)) {
            return R.parse(BaseRes.PARAM);
        }
        OrderFoll orderFoll = new OrderFoll();
        orderFoll.setOrderId(cstmrId);
        orderFoll.setUserId(followerIds);
        if (!orderFollService.insert(orderFoll)) {
            throw new CoolException("添加失败，请联系管理员");
        }
        return R.ok("添加成功");
    }

    @RequestMapping(value = "/order/followers/remove/auth")
    @ManagerAuth
    public R orderFollowersRemove(@RequestParam("orderId") Long orderId,

 src/main/webapp/static/js/plan/plan.js

@@ -303,6 +303,7 @@
                                    method: 'GET',
                                    success: function (res0) {
                                        let planType = res0.data.planType;
                                        console.log(planType.html)
                                        if (res0.code === 200) {
                                            admin.open({
                                                type: 1,
@@ -326,6 +327,7 @@
                                                    });
                                                    layDateRender();
                                                    form.on('submit(editSubmit)', function (data) {
                                                        console.log(data)
                                                        data.field.planType = planType.id;
                                                        data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
                                                        data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
@@ -861,7 +863,7 @@
                        if (res.code === 200) {
                            cb(res.data)
                        } else {
                            cb([]);
                            cb([]);Query/auth
                            layer.msg(res.msg, {icon: 2});
                        }
                    }
@@ -914,7 +916,6 @@
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    console.log(planNeedXmlSelData)
                    planNeedXmlSel.update({
                        initValue: planNeedXmlSelData,
                        data: res.data

 src/main/webapp/views/plan/plan.html

@@ -276,7 +276,7 @@
                    <div class="layui-form-item">
                        <label class="layui-form-label  layui-form-required">规划员: </label>
                        <div class="layui-input-block">
                            <input class="layui-input" name="planner$" placeholder="请输入规划员"  lay-verify="required" disabled>
                            <input class="layui-input" name="planner$" placeholder="请输入规划员"  lay-verify="required">
                        </div>
                    </div>
                    <div class="layui-form-item">