#

18516761980

2021-11-05 acdc4b3427cbd2a6dc811aed202fbd3e9c309d69

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

@@ -73,6 +73,8 @@
        allLike(LocNormal.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("appe_time", false);
        }
        if (Cools.isEmpty(param.get("state"))) {
            wrapper.in("state", "1,2");
@@ -324,7 +326,7 @@
    public R normalReportExport(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        @SuppressWarnings("unchecked")
        List<LocNormalReport> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalReport.class);
        List<LocNormalLog> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalLog.class);
        return R.ok(exportSupport(list, fields));
    }
}