Junjie
2023-05-24 99f220b7ee2b021418321071307c6b3d33ca59b8
wrkDetl
2个文件已修改
25 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/WrkDetlController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/wrkMast/wrkDetl.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -53,6 +53,28 @@
        return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }
    @RequestMapping(value = "/wrkDetl/list/{wrkNo}/auth")
    @ManagerAuth
    public R listByWrkNo(@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,
                         @PathVariable("wrkNo") Integer wrkNo) {
        excludeTrash(param);
        EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(WrkDetl.class, param.keySet(), wrapper, condition);
        wrapper.eq("wrk_no", wrkNo);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("appe_time", false);
        }
        return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
src/main/webapp/views/wrkMast/wrkDetl.html
@@ -46,8 +46,7 @@
        tableIns1 = table.render({
            elem: '#wrkDetlByMast',
            headers: {token: localStorage.getItem('token')},
            url: baseUrl+'/wrkDetl/list/auth',
            where: {wrk_no: parent.wrkNo},
            url: baseUrl+'/wrkDetl/list/' + parent.wrkNo + '/auth',
            page: true,
            limit: 16,
            limits: [16, 30, 50, 100, 200, 500],