diff --git a/uapbd/src/public/nccloud/api/uapbd/materialmanage/material/MaterialManageMaterial.java b/uapbd/src/public/nccloud/api/uapbd/materialmanage/material/MaterialManageMaterial.java index ec799a8b..99d6c455 100644 --- a/uapbd/src/public/nccloud/api/uapbd/materialmanage/material/MaterialManageMaterial.java +++ b/uapbd/src/public/nccloud/api/uapbd/materialmanage/material/MaterialManageMaterial.java @@ -564,18 +564,43 @@ public class MaterialManageMaterial extends AbstractNCCRestResource { } JSONObject data = jObject.getJSONObject("data"); - String ts = data.getString("ts"); + String createdate = data.getString("createdate"); + String ts_mts = data.getString("ts_mts"); + String ts_mtp = data.getString("ts_mtp"); + String ts_mt = data.getString("ts_mt"); + String createdate_mtp = data.getString("createdate_mtp"); + String createdate_mt = data.getString("createdate_mt"); + String enablestate = data.getString("enablestate"); Map param = new HashMap(); - if (StringUtils.isNotBlank(ts)) { - param.put("CREATEDATE", ts); + if (StringUtils.isNotBlank(createdate)) { + param.put("CREATEDATE", createdate); + } + if (StringUtils.isNotBlank(ts_mts)) { + param.put("TS_MTS", ts_mts); + } + if (StringUtils.isNotBlank(ts_mtp)) { + param.put("TS_MTP", ts_mtp); + } + if (StringUtils.isNotBlank(ts_mt)) { + param.put("TS_MT", ts_mt); + } + if (StringUtils.isNotBlank(createdate_mtp)) { + param.put("CREATEDATE_MTP", createdate_mtp); + } + if (StringUtils.isNotBlank(createdate_mt)) { + param.put("CREATEDATE_MT", createdate_mt); + } + if (StringUtils.isNotBlank(enablestate)) { + param.put("ENABLESTATE", enablestate); } try { ApiResourceParamUtils ApiResourceParamUtils = new ApiResourceParamUtils(); String condition = ApiResourceParamUtils.parseParmToSqlByCode(new MaterialVO(), param); - - String sql = "select * from BD_MATERIAL_C047 where " + condition; + String condition1 = condition.replace("=", ">="); + String condition2 = condition1.replaceFirst("ENABLESTATE .", "ENABLESTATE "); + String sql = "select * from BD_MATERIAL_C047 where " + condition2; List> rows = (List>) (new BaseDAO()).executeQuery(sql, new MapListProcessor()); return ResultMessageUtil.toJSON(rows, "查询物料视图信息成功");