#pda料箱组托和换码

lty

3 天以前 8e943b7104561c3b14cf223016698709c5ade4b5

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

@@ -51,32 +51,37 @@
            }
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }else {
            wrapper.orderBy("io_time", false);
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
                if (entry.getKey().equals("manu_type")) {
                    wrapper.like(entry.getKey(), val);
                } else {
                    wrapper.eq(entry.getKey(), val);
                }
            }
        }
    }

    @RequestMapping(value = "/wrkMastLog/add/auth")
    @ManagerAuth(memo = "工作历史档添加")
    @ManagerAuth(memo = "response.work_history_add")
    public R add(WrkMastLog wrkMastLog) {
        wrkMastLogService.insert(wrkMastLog);
        return R.ok();
    }

   @RequestMapping(value = "/wrkMastLog/update/auth")
   @ManagerAuth(memo = "工作历史档修改")
   @ManagerAuth(memo = "response.work_history_update")
    public R update(WrkMastLog wrkMastLog){
        if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
            return R.error();
@@ -86,7 +91,7 @@
    }

    @RequestMapping(value = "/wrkMastLog/delete/auth")
    @ManagerAuth(memo = "工作历史档删除")
    @ManagerAuth(memo = "response.work_history_delete")
    public R delete(@RequestParam String param){
        List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
        if (Cools.isEmpty(list)){
@@ -99,7 +104,7 @@
    }

    @RequestMapping(value = "/wrkMastLog/export/auth")
    @ManagerAuth(memo = "工作历史档导出")
    @ManagerAuth(memo = "response.work_history_export")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
@@ -130,7 +135,9 @@
    public R query(@RequestBody JSONObject param) {
        Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != wrkMastLogService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
            R r = R.parse(BaseRes.REPEAT);
            r.put("data", getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
            return r;
        }
        return R.ok();
    }