| | |
| | | excludeTrash(param); |
| | | convert(param, wrapper); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | wrapper.orderDesc(Collections.singleton("create_time")); |
| | | return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | |
| | | @RequestMapping(value = "/taskWrkLog/update/auth") |
| | | @ManagerAuth |
| | | public R update(TaskWrkLog taskWrkLog){ |
| | | if (Cools.isEmpty(taskWrkLog) || null==taskWrkLog.getId()){ |
| | | if (Cools.isEmpty(taskWrkLog)){ |
| | | return R.error(); |
| | | } |
| | | taskWrkLogService.updateById(taskWrkLog); |
| | |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | for (TaskWrkLog taskWrkLog : page.getRecords()){ |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("id", taskWrkLog.getId()); |
| | | map.put("value", taskWrkLog.getId()); |
| | | map.put("id", taskWrkLog.getTaskNo()); |
| | | map.put("value", taskWrkLog.getTaskNo()); |
| | | result.add(map); |
| | | } |
| | | return R.ok(result); |