#

1

2 天以前 e0bb1d56001d44d7b46c4698b4d1e9ea425de07c

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

@@ -39,11 +39,60 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<BasArmMastSign> wrapper = new EntityWrapper<>();

        // ===================== 1. 手动处理 binding_tags 的精确匹配（字符串形式） =====================
        if (param.containsKey("create_time")) {
            String tag = String.valueOf(param.get("create_time")).trim();
            if (!tag.isEmpty()) {
                wrapper.eq("create_time", tag);
                System.out.println("手动添加精确条件: create_time = " + tag);
            }
            // 可选：移除原 param，防止 allLike 再次干扰（如果 allLike 会重复加条件）
            // param.remove("binding_tags");
        }

        // ===================== 2. 其他原有处理逻辑（模糊搜索等） =====================
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasArmMastSign.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basArmMastSignService.selectPage(new Page<>(curr, limit), wrapper));

        // 排序
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        wrapper.orderBy("create_time", false);

        // 分页查询
        Page<BasArmMastSign> page = new Page<>(curr, limit);
        Page<BasArmMastSign> resultPage = basArmMastSignService.selectPage(page, wrapper);

        // ===================== 3. 返回数据处理（转字符串，防止前端精度丢失） =====================
        List<Map<String, Object>> newRecords = new ArrayList<>();
        for (BasArmMastSign item : resultPage.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", item.getId() != null ? item.getId().toString() : null);  // 建议转字符串
            map.put("status", item.getStatus());
            map.put("matnr", item.getMatnr());
            map.put("sku", item.getSku());
            map.put("po", item.getPo());
            map.put("upc", item.getUpc());
            map.put("supplier", item.getSupplier());
            map.put("orderNo", item.getOrderNo());
            map.put("createTime", item.getCreateTime() != null ? item.getCreateTime().toString() : null);
            map.put("status$", item.getStatus$());

            newRecords.add(map);
        }

        // 构造返回结构
        Map<String, Object> resultMap = new HashMap<>();
        resultMap.put("total", resultPage.getTotal());
        resultMap.put("size", resultPage.getSize());
        resultMap.put("current", resultPage.getCurrent());
        resultMap.put("pages", resultPage.getPages());
        resultMap.put("records", newRecords);

        return R.ok(resultMap);
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -53,6 +102,9 @@
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else if (entry.getKey().equals("create_time")){
                long aLong = Long.parseLong(val);
                wrapper.ge(entry.getKey(), aLong);
            } else {
                wrapper.like(entry.getKey(), val);
            }