#

LSH

2023-10-10 197dd8160fb3c1270e2d11b14eabd8e55c35ef70

#

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

@@ -55,6 +55,8 @@
    private OrderService orderService;
    @Autowired
    private SmsCodeService smsCodeService;
    @Autowired
    private ProcessPermissionsService processPermissionsService;

    String PZH=" ————————————————— ";

@@ -677,12 +679,24 @@
        wrapper.like("name", condition);
        wrapper.eq("status",1);

        int type =1;
        if (getUser().getNickname().equals("李世豪2级")){
            type=2;

        ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-1"));//2：核价流程
        User manager1 = userService.selectById(processPermissions1.getUserId());       // 获取核价流程节点1确认人

        ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2：核价流程
        User manager2 = userService.selectById(processPermissions2.getUserId());       // 获取核价流程节点1确认人


        int type =0;
        if (getUserId().equals(manager1.getId())){
            type=1;//(货架)
        }else if (getUserId().equals(manager2.getId())){
            type = 2;//(集成)
        }else {
            return R.error("你不是核价员,无权接任务");
        }

        List<Long> typeList = new ArrayList<>();
            List<Long> typeList = new ArrayList<>();
        List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
        for (PlanType planType : planTypes){
            typeList.add(planType.getId());

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

@@ -129,6 +129,26 @@
        return R.ok(result);
    }

//    @RequestMapping(value = "/processPermissionsProcessMemoQuery/auth")
//    @ManagerAuth
//    public R queryProcessMemo(String condition) {
//        List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<>());
//        List<Map<String, Object>> result = new ArrayList<>();
//        List<Integer> processMemoInt = new ArrayList<>();
//        for (ProcessPermissions processPermissions : processPermissionsList){
//            if (!processMemoInt.contains(processPermissions.getProcessMemo())){
//                processMemoInt.add(processPermissions.getProcessMemo());
//            }else {
//                continue;
//            }
//            Map<String, Object> map = new HashMap<>();
//            map.put("id", processPermissions.getProcessMemo());
//            map.put("value", processPermissions.getProcessMemo$());
//            result.add(map);
//        }
//        return R.ok(result);
//    }

    @RequestMapping(value = "/processPermissions/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {

 src/main/webapp/views/processPermissions/processPermissions.html

@@ -23,6 +23,18 @@
                            <input class="layui-input" type="text" name="user_name" placeholder="姓名" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <label class="layui-form-label">权限类型: </label>-->
<!--                        <div class="layui-input-inline cool-auto-complete">-->
<!--                            <input id="process_memo" class="layui-input" name="process_memo" type="text" placeholder="请选择权限类型" autocomplete="off" style="display: none" >-->
<!--                            <input id="processMemo1$" name="process_memo" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="权限类型" onfocus=this.blur()>-->
<!--                            <div class="cool-auto-complete-window">-->
<!--                                <input class="cool-auto-complete-window-input" data-key="processPermissionsProcessMemoQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                                <select class="cool-auto-complete-window-select" data-key="processPermissionsProcessMemoQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                                </select>-->
<!--                            </div>-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <label class="layui-form-label">权限类型: </label>
                        <div class="layui-input-block">
@@ -43,6 +55,7 @@
                            <select name="process">
                                <option value="">请选择状态</option>
                                <option value="1-1">1-1</option>
                                <option value="1-2">1-2</option>
                                <option value="2-1">2-1</option>
                                <option value="2-2">2-2</option>
                                <option value="3-1">3-1</option>
@@ -160,6 +173,18 @@
<!--                        <input class="layui-input" name="standby6" placeholder="请输入备用字段6">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">权限类型: </label>-->
<!--                    <div class="layui-input-inline cool-auto-complete">-->
<!--                        <input class="layui-input" name="processMemo" type="text" placeholder="请选择权限类型" autocomplete="off" style="display: none"  lay-verify="required">-->
<!--                        <input name="processMemo" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="权限类型" onfocus=this.blur()>-->
<!--                        <div class="cool-auto-complete-window">-->
<!--                            <input class="cool-auto-complete-window-input" data-key="processPermissionsProcessMemoQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                            <select class="cool-auto-complete-window-select" data-key="processPermissionsProcessMemoQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                            </select>-->
<!--                        </div>-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">权限类型: </label>
                    <div class="layui-input-block">
@@ -169,6 +194,7 @@
                            <option value="2">报价流程</option>
                            <option value="3">报销流程</option>
                            <option value="4">出差流程</option>
                            <option value="5">核价流程</option>
                            <option value="7">合同管理</option>
                        </select>
                    </div>
@@ -179,6 +205,7 @@
                        <select name="process" lay-vertype="tips" lay-verify="required">
                            <option value="">请选择状态</option>
                            <option value="1-1">1-1</option>
                            <option value="1-2">1-2</option>
                            <option value="2-1">2-1</option>
                            <option value="3-1">3-1</option>
                            <option value="3-2">3-2</option>