#

1

昨天 7a27f5e7896cace9e519f6343c76e91d5c43800a

#

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

@@ -42,7 +42,11 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasCrnErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basCrnErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -42,7 +42,11 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -32,17 +32,23 @@

    @RequestMapping(value = "/basRgvErrorLog/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(required = false)String condition,
                  @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(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<BasRgvErrorLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasRgvErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}

        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }

        return R.ok(basRgvErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/resources/mapper/WrkMastMapper.xml

@@ -72,7 +72,7 @@
        or (wrk_sts=15 and take_none = '1' and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
        or (wrk_sts=15 and dateadd(mi,3,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_no in (9997,9996) and wrk_sts = 5)
        or (wrk_no in (9997,9996) and wrk_sts = 15)
        order by io_time,wrk_no asc
    </select>