| | |
| | | plan.setCreateTime(now); |
| | | plan.setUpdateBy(getUserId()); |
| | | plan.setUpdateTime(now); |
| | | plan.setStatus(1); |
| | | plan.setStatus(0); |
| | | |
| | | plan.setForm(JSON.toJSONString(param)); // 自定义表单内容 |
| | | plan.setSettle(1); // 1.开始 |
| | |
| | | plan.setSettleMsg(JSON.toJSONString(list1)); |
| | | // 修改规划单状态 |
| | | plan.setSettle(4); // 审批通过 |
| | | plan.setStatus(1); // 审批通过 |
| | | plan.setUpdateBy(getUserId()); |
| | | plan.setUpdateTime(new Date()); |
| | | |
| | |
| | | return R.ok(result); |
| | | } |
| | | |
| | | @RequestMapping(value = "/planQueryNameToRob/auth") |
| | | @ManagerAuth |
| | | public R planQueryNameToRob(String condition) { |
| | | EntityWrapper<Plan> wrapper = new EntityWrapper<>(); |
| | | wrapper.like("name", condition); |
| | | wrapper.eq("status",1); |
| | | |
| | | int type =1; |
| | | if (getUser().getNickname().equals("李世豪3级")){ |
| | | type=2; |
| | | } |
| | | |
| | | List<Long> typeList = new ArrayList<>(); |
| | | List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type)); |
| | | for (PlanType planType : planTypes){ |
| | | typeList.add(planType.getId()); |
| | | } |
| | | wrapper.in("plan_type",typeList); |
| | | |
| | | // Page<Plan> page = planService.selectPage(new Page<>(0, 10), wrapper); |
| | | List<Plan> plans = planService.selectList(wrapper); |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | // for (Plan plan : page.getRecords()){ |
| | | for (Plan plan : plans){ |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("id", plan.getId()); |
| | | // map.put("value", plan.getName()+"---"+plan.getId()); |
| | | map.put("value", plan.getName()); |
| | | result.add(map); |
| | | } |
| | | return R.ok(result); |
| | | } |
| | | |
| | | @RequestMapping(value = "/plan/check/column/auth") |
| | | @ManagerAuth |
| | | public R query(@RequestBody JSONObject param) { |