Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java =================================================================== diff -u -r30873 -r30934 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 30873) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 30934) @@ -767,10 +767,10 @@ } String sql = packingManager.getPackingRecordSql(taskGroup, tousseName, orgUnitName, tousseBarcode, packer, startTimeSearch, endTimeSearch); String select = " select po "; - String where = String.format(" from PackingRecord po %s ", sql); + String where = String.format(" from "+ PackingRecord.class.getSimpleName() +" po %s ", sql); ExtJsEntity entity = ExtJsUtil.buildSQLEntity(select, where, ""); // JSONObject result = extGridUtils.getPagedResult(entity); - JSONObject result = extGridUtils.getPagedResultByHql( entity, PackingRecord.class, null); + JSONObject result = extGridUtils.getPagedResultByHql( entity, null); //增加其他信息 if(result != null){ JSONArray rows = result.optJSONArray("rows"); Index: forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java =================================================================== diff -u -r19006 -r30934 --- forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java (.../ExtGridUtils.java) (revision 19006) +++ forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java (.../ExtGridUtils.java) (revision 30934) @@ -100,48 +100,29 @@ return this.getPagedResult(StrutsParamUtils.getRequest(), extJsEntity, paras); } - /** - * 通过hql来获得对应的结果(RESULT是一个list map类型的json字符串)(支持struts2) + * 通过hql来获得对应的结果(RESULT是一个list 实体类类型的json字符串)(支持struts2) * * @param extJsEntity {@link ExtJsEntity} * @param paras 预编译参数(可以不填或者填null) * @return 查询结果, 返回结果可以参数参照 * @see ExtGridUtils#getPagedResult(HttpServletRequest, ExtJsEntity, Object...) */ public JSONObject getPagedResultByHql(ExtJsEntity extJsEntity, Object... paras) { - return this.getPagedResultByHql(StrutsParamUtils.getRequest(), extJsEntity, null, paras); + return this.getPagedResultByHql(StrutsParamUtils.getRequest(), extJsEntity, paras); } - /** - * 通过hql来获得对应的结果(RESULT是一个list 实体类类型的json字符串)(支持struts2) - * - * @param extJsEntity {@link ExtJsEntity} - * @param clazz 查询标识符 - * @param paras 预编译参数(可以不填或者填null) - * @return 查询结果, 返回结果可以参数参照 - * @see ExtGridUtils#getPagedResult(HttpServletRequest, ExtJsEntity, Object...) - */ - public JSONObject getPagedResultByHql(ExtJsEntity extJsEntity, Class clazz, Object... paras) { - return this.getPagedResultByHql(StrutsParamUtils.getRequest(), extJsEntity, clazz, paras); - } - /** * 通过hql来获得对应的结果(支持springmvc和struts2) * * @param request {@link HttpServletRequest} * @param extJsEntity {@link ExtJsEntity} - * @param clazz 这里只是一个标识,用来判断是整个类查询还是只查询部分属性 - *