| | |
| | | convert(param, wrapper); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | else { |
| | | wrapper.orderBy("id", false); |
| | | wrapper.orderBy("modi_time", false); |
| | | } |
| | | return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | |
| | | @RequestMapping(value = "/waitPakinLog/update/auth") |
| | | @ManagerAuth |
| | | public R update(WaitPakinLog waitPakinLog){ |
| | | if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){ |
| | | if (Cools.isEmpty(waitPakinLog)){ |
| | | return R.error(); |
| | | } |
| | | waitPakinLogService.updateById(waitPakinLog); |
| | |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | for (WaitPakinLog waitPakinLog : page.getRecords()){ |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("id", waitPakinLog.getId()); |
| | | map.put("value", waitPakinLog.getId()); |
| | | map.put("id", waitPakinLog.getZpallet()); |
| | | map.put("value", waitPakinLog.getZpallet()); |
| | | result.add(map); |
| | | } |
| | | return R.ok(result); |