Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs

lty

2025-03-24 b59ec69cc3d75df8ad115c22edc9c07312351169

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

@@ -35,21 +35,24 @@

    @RequestMapping(value = "/wrkDetl/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) {
        excludeTrash(param);
        EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(WrkDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("appe_time", false);
        }
//        if (!Cools.isEmpty(ioTime)) {
//            wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
//        }
        return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -83,7 +86,11 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                if (entry.getKey().equals("io_time")) {
                    wrapper.eq("io_time", DateUtils.convert(val, DateUtils.yyyyMMddHHmmsssss_F));
                }else {
                    wrapper.like(entry.getKey(), val);
                }
            }
        }
    }