#

wang..123

2022-03-08 0621dc7f7121a8b2a2a785687ec1fc8d0a8d3d45

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

@@ -51,7 +51,7 @@
            }
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }else {
            wrapper.orderBy("modi_time", false).orderBy("wrk_no", false);
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -64,11 +64,19 @@
                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_type")) {
                   wrapper.eq("io_type", val);
                } else if(entry.getKey().equals("wrk_sts")){
                    wrapper.eq("wrk_sts", val);
                } else {
                    wrapper.like(entry.getKey(), val);
                }

            }
        }
    }


    @RequestMapping(value = "/wrkMastLog/add/auth")
    @ManagerAuth(memo = "工作历史档添加")
    public R add(WrkMastLog wrkMastLog) {