13

zhang

2 天以前 82de5a307466894bbb0258f8a63a26a7bb96d80d

 src/main/java/com/zy/asrs/controller/WaitPakinLogController.java

@@ -35,25 +35,26 @@

    @RequestMapping(value = "/waitPakinLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<WaitPakinLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
            wrapper.orderBy("id", false);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private void convert(Map<String, Object> map, EntityWrapper wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -70,10 +71,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/waitPakinLog/update/auth")
   @ManagerAuth
    public R update(WaitPakinLog waitPakinLog){
        if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
    @RequestMapping(value = "/waitPakinLog/update/auth")
    @ManagerAuth
    public R update(WaitPakinLog waitPakinLog) {
        if (Cools.isEmpty(waitPakinLog)) {
            return R.error();
        }
        waitPakinLogService.updateById(waitPakinLog);
@@ -82,12 +83,12 @@

    @RequestMapping(value = "/waitPakinLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam String param){
    public R delete(@RequestParam String param) {
        List<WaitPakinLog> list = JSONArray.parseArray(param, WaitPakinLog.class);
        if (Cools.isEmpty(list)){
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (WaitPakinLog entity : list){
        for (WaitPakinLog entity : list) {
            waitPakinLogService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -95,7 +96,7 @@

    @RequestMapping(value = "/waitPakinLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<WaitPakinLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakinLog"));
@@ -111,10 +112,10 @@
        wrapper.like("id", condition);
        Page<WaitPakinLog> page = waitPakinLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (WaitPakinLog waitPakinLog : page.getRecords()){
        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);
@@ -124,7 +125,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<WaitPakinLog> wrapper = new EntityWrapper<WaitPakinLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != waitPakinLogService.selectOne(wrapper)){
        if (null != waitPakinLogService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(WaitPakinLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();