1

zhang

6 天以前 99b819fb7354c86ef4111a1b3465f63d6d263fd7

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

@@ -43,7 +43,7 @@
        EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(WrkMastDetlLog.class, param.keySet(), wrapper, condition);
        //allLike(WrkMastDetlLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
@@ -118,8 +118,8 @@
    }

    @RequestMapping(value = "/wrkMastDetlLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param) {
    @ManagerAuth(memo = "工作历史档明细导出")
    public synchronized R export(@RequestBody JSONObject param) {
        EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastDetlLog"));