diff --git a/src/main/java/com/rebuild/server/Application.java b/src/main/java/com/rebuild/server/Application.java index f392da94b..06f0730ff 100644 --- a/src/main/java/com/rebuild/server/Application.java +++ b/src/main/java/com/rebuild/server/Application.java @@ -29,11 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import com.rebuild.server.bizz.privileges.UserStore; import com.rebuild.server.helper.cache.RecordOwningCache; import com.rebuild.server.metadata.DynamicMetadataFactory; -import com.rebuild.server.query.QueryFactory; import com.rebuild.server.service.CommonService; import com.rebuild.server.service.SQLExecutor; import com.rebuild.server.service.base.GeneralEntityService; import com.rebuild.server.service.notification.NotificationService; +import com.rebuild.server.service.query.QueryFactory; import com.rebuild.web.OnlineSessionStore; import cn.devezhao.persist4j.PersistManagerFactory; diff --git a/src/main/java/com/rebuild/server/bizz/privileges/EntityQueryFilter.java b/src/main/java/com/rebuild/server/bizz/privileges/EntityQueryFilter.java index d87ceee4a..0bdce54e9 100644 --- a/src/main/java/com/rebuild/server/bizz/privileges/EntityQueryFilter.java +++ b/src/main/java/com/rebuild/server/bizz/privileges/EntityQueryFilter.java @@ -130,11 +130,11 @@ public class EntityQueryFilter implements Filter, QueryFilter { if (de == BizzDepthEntry.PRIVATE) { return appendShareFilter(entity, toMasterField, - String.format(ownFormat, EntityHelper.owningUser, user.getIdentity())); + String.format(ownFormat, EntityHelper.OwningUser, user.getIdentity())); } Department dept = user.getOwningDept(); - String deptSql = String.format(ownFormat, EntityHelper.owningDept, dept.getIdentity()); + String deptSql = String.format(ownFormat, EntityHelper.OwningDept, dept.getIdentity()); if (de == BizzDepthEntry.LOCAL) { return appendShareFilter(entity, toMasterField, deptSql); @@ -145,7 +145,7 @@ public class EntityQueryFilter implements Filter, QueryFilter { sqls.add(deptSql); for (BusinessUnit child : dept.getAllChildren()) { - sqls.add(String.format(ownFormat, EntityHelper.owningDept, child.getIdentity())); + sqls.add(String.format(ownFormat, EntityHelper.OwningDept, child.getIdentity())); } return appendShareFilter(entity, toMasterField, "(" + StringUtils.join(sqls, " or ") + ")"); } diff --git a/src/main/java/com/rebuild/server/business/charts/ChartData.java b/src/main/java/com/rebuild/server/business/charts/ChartData.java index 93ca5add4..165adef28 100644 --- a/src/main/java/com/rebuild/server/business/charts/ChartData.java +++ b/src/main/java/com/rebuild/server/business/charts/ChartData.java @@ -32,7 +32,7 @@ import com.rebuild.server.helper.manager.PickListManager; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.entityhub.DisplayType; import com.rebuild.server.metadata.entityhub.EasyMeta; -import com.rebuild.server.query.AdvFilterParser; +import com.rebuild.server.service.query.AdvFilterParser; import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.engine.ID; diff --git a/src/main/java/com/rebuild/server/helper/manager/DataListManager.java b/src/main/java/com/rebuild/server/helper/manager/DataListManager.java index 1c8d6e5c8..b1736e122 100644 --- a/src/main/java/com/rebuild/server/helper/manager/DataListManager.java +++ b/src/main/java/com/rebuild/server/helper/manager/DataListManager.java @@ -61,13 +61,13 @@ public class DataListManager extends LayoutManager { columnList.add(formattedColumn(namedField)); String namedFieldName = namedField.getName(); - if (!StringUtils.equalsIgnoreCase(namedFieldName, EntityHelper.createdBy) - && entityMeta.containsField(EntityHelper.createdBy)) { - columnList.add(formattedColumn(entityMeta.getField(EntityHelper.createdBy))); + if (!StringUtils.equalsIgnoreCase(namedFieldName, EntityHelper.CreatedBy) + && entityMeta.containsField(EntityHelper.CreatedBy)) { + columnList.add(formattedColumn(entityMeta.getField(EntityHelper.CreatedBy))); } - if (!StringUtils.equalsIgnoreCase(namedFieldName, EntityHelper.createdOn) - && entityMeta.containsField(EntityHelper.createdOn)) { - columnList.add(formattedColumn(entityMeta.getField(EntityHelper.createdOn))); + if (!StringUtils.equalsIgnoreCase(namedFieldName, EntityHelper.CreatedOn) + && entityMeta.containsField(EntityHelper.CreatedOn)) { + columnList.add(formattedColumn(entityMeta.getField(EntityHelper.CreatedOn))); } } else { JSONArray config = (JSONArray) cfgs[1]; diff --git a/src/main/java/com/rebuild/server/helper/manager/FormManager.java b/src/main/java/com/rebuild/server/helper/manager/FormManager.java index 530dc1d11..906869801 100644 --- a/src/main/java/com/rebuild/server/helper/manager/FormManager.java +++ b/src/main/java/com/rebuild/server/helper/manager/FormManager.java @@ -235,11 +235,11 @@ public class FormManager extends LayoutManager { else { if (!fieldMeta.isCreatable()) { el.put("readonly", true); - if (fieldName.equals(EntityHelper.createdOn) || fieldName.equals(EntityHelper.modifiedOn)) { + if (fieldName.equals(EntityHelper.CreatedOn) || fieldName.equals(EntityHelper.ModifiedOn)) { el.put("value", CalendarUtils.getUTCDateTimeFormat().format(now)); - } else if (fieldName.equals(EntityHelper.createdBy) || fieldName.equals(EntityHelper.modifiedBy) || fieldName.equals(EntityHelper.owningUser)) { + } else if (fieldName.equals(EntityHelper.CreatedBy) || fieldName.equals(EntityHelper.ModifiedBy) || fieldName.equals(EntityHelper.OwningUser)) { el.put("value", new Object[] { currentUser.getIdentity().toString(), currentUser.getFullName(), "User" }); - } else if (fieldName.equals(EntityHelper.owningDept)) { + } else if (fieldName.equals(EntityHelper.OwningDept)) { el.put("value", new Object[] { currentUser.getOwningDept().getIdentity().toString(), currentUser.getOwningDept().getName(), "Department" }); } } diff --git a/src/main/java/com/rebuild/server/metadata/DynamicMetadataFactory.java b/src/main/java/com/rebuild/server/metadata/DynamicMetadataFactory.java index c6f3ef7c6..751b3ac38 100644 --- a/src/main/java/com/rebuild/server/metadata/DynamicMetadataFactory.java +++ b/src/main/java/com/rebuild/server/metadata/DynamicMetadataFactory.java @@ -113,7 +113,7 @@ public class DynamicMetadataFactory extends ConfigurationMetadataFactory { .addAttribute("default-value", (String) custom[10]) .addAttribute("ref-entity", (String) custom[11]) .addAttribute("cascade", (String) custom[12]); - if (fieldName.equals(EntityHelper.autoId)) { + if (fieldName.equals(EntityHelper.AutoId)) { field.addAttribute("auto-value", "true"); } diff --git a/src/main/java/com/rebuild/server/metadata/EntityHelper.java b/src/main/java/com/rebuild/server/metadata/EntityHelper.java index ac3a362f2..def2fadc4 100644 --- a/src/main/java/com/rebuild/server/metadata/EntityHelper.java +++ b/src/main/java/com/rebuild/server/metadata/EntityHelper.java @@ -45,7 +45,7 @@ public class EntityHelper { * @return */ public static boolean hasPrivilegesField(Entity entity) { - if (entity.containsField(owningUser) && entity.containsField(owningDept)) { + if (entity.containsField(OwningUser) && entity.containsField(OwningDept)) { return true; } return false; @@ -117,13 +117,14 @@ public class EntityHelper { // 公共字段 - public static final String autoId = "autoId"; - public static final String createdOn = "createdOn"; - public static final String createdBy = "createdBy"; - public static final String modifiedOn = "modifiedOn"; - public static final String modifiedBy = "modifiedBy"; - public static final String owningUser = "owningUser"; - public static final String owningDept = "owningDept"; + public static final String AutoId = "autoId"; + public static final String QuickCode = "quickCode"; + public static final String CreatedOn = "createdOn"; + public static final String CreatedBy = "createdBy"; + public static final String ModifiedOn = "modifiedOn"; + public static final String ModifiedBy = "modifiedBy"; + public static final String OwningUser = "owningUser"; + public static final String OwningDept = "owningDept"; // 系统实体 diff --git a/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java b/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java index e7817fa7e..c0626b4fb 100644 --- a/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java +++ b/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java @@ -62,25 +62,25 @@ public class ExtRecordCreator extends JSONRecordCreator { final Entity entity = r.getEntity(); final User editor = Application.getUserStore().getUser(r.getEditor()); - if (entity.containsField(EntityHelper.modifiedOn)) { - r.setDate(EntityHelper.modifiedOn, now); + if (entity.containsField(EntityHelper.ModifiedOn)) { + r.setDate(EntityHelper.ModifiedOn, now); } - if (entity.containsField(EntityHelper.modifiedBy)) { - r.setID(EntityHelper.modifiedBy, (ID) editor.getIdentity()); + if (entity.containsField(EntityHelper.ModifiedBy)) { + r.setID(EntityHelper.ModifiedBy, (ID) editor.getIdentity()); } if (isNew) { - if (entity.containsField(EntityHelper.createdOn)) { - r.setDate(EntityHelper.createdOn, now); + if (entity.containsField(EntityHelper.CreatedOn)) { + r.setDate(EntityHelper.CreatedOn, now); } - if (entity.containsField(EntityHelper.createdBy)) { - r.setID(EntityHelper.createdBy, (ID) editor.getIdentity()); + if (entity.containsField(EntityHelper.CreatedBy)) { + r.setID(EntityHelper.CreatedBy, (ID) editor.getIdentity()); } - if (entity.containsField(EntityHelper.owningUser)) { - r.setID(EntityHelper.owningUser, (ID) editor.getIdentity()); + if (entity.containsField(EntityHelper.OwningUser)) { + r.setID(EntityHelper.OwningUser, (ID) editor.getIdentity()); } - if (entity.containsField(EntityHelper.owningDept)) { - r.setID(EntityHelper.owningDept, (ID) editor.getOwningDept().getIdentity()); + if (entity.containsField(EntityHelper.OwningDept)) { + r.setID(EntityHelper.OwningDept, (ID) editor.getOwningDept().getIdentity()); } } } diff --git a/src/main/java/com/rebuild/server/metadata/MetadataHelper.java b/src/main/java/com/rebuild/server/metadata/MetadataHelper.java index 85d89922d..56d322161 100644 --- a/src/main/java/com/rebuild/server/metadata/MetadataHelper.java +++ b/src/main/java/com/rebuild/server/metadata/MetadataHelper.java @@ -136,8 +136,8 @@ public class MetadataHelper { if (hasName != null) { return hasName; } - if (entity.containsField(EntityHelper.createdOn)) { - return entity.getField(EntityHelper.createdOn); + if (entity.containsField(EntityHelper.CreatedOn)) { + return entity.getField(EntityHelper.CreatedOn); } return entity.getPrimaryField(); } diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/EasyMeta.java b/src/main/java/com/rebuild/server/metadata/entityhub/EasyMeta.java index 3da5c713d..9c507765e 100644 --- a/src/main/java/com/rebuild/server/metadata/entityhub/EasyMeta.java +++ b/src/main/java/com/rebuild/server/metadata/entityhub/EasyMeta.java @@ -49,13 +49,14 @@ public class EasyMeta implements BaseMeta { private static final Set BUILTIN_FIELD = new HashSet<>(); private static final Map SYSENTITY_EXTMETA = new HashMap<>(); static { - BUILTIN_FIELD.add(EntityHelper.autoId); - BUILTIN_FIELD.add(EntityHelper.createdOn); - BUILTIN_FIELD.add(EntityHelper.createdBy); - BUILTIN_FIELD.add(EntityHelper.modifiedOn); - BUILTIN_FIELD.add(EntityHelper.modifiedBy); - BUILTIN_FIELD.add(EntityHelper.owningUser); - BUILTIN_FIELD.add(EntityHelper.owningDept); + BUILTIN_FIELD.add(EntityHelper.AutoId); + BUILTIN_FIELD.add(EntityHelper.QuickCode); + BUILTIN_FIELD.add(EntityHelper.CreatedOn); + BUILTIN_FIELD.add(EntityHelper.CreatedBy); + BUILTIN_FIELD.add(EntityHelper.ModifiedOn); + BUILTIN_FIELD.add(EntityHelper.ModifiedBy); + BUILTIN_FIELD.add(EntityHelper.OwningUser); + BUILTIN_FIELD.add(EntityHelper.OwningDept); SYSENTITY_EXTMETA.put("User", new String[] { "account", "系统内建" }); SYSENTITY_EXTMETA.put("Department", new String[] { "accounts", "系统内建" }); diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java b/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java index 033bef3e5..1d37a4abe 100644 --- a/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java +++ b/src/main/java/com/rebuild/server/metadata/entityhub/Entity2Schema.java @@ -96,20 +96,20 @@ public class Entity2Schema extends Field2Schema { if (isSlave) { record.setString("masterEntity", masterEntity); } - record.setString("nameField", EntityHelper.createdOn); + record.setString("nameField", EntityHelper.CreatedOn); record = Application.getCommonService().create(record); tempMetaId.add(record.getPrimary()); - Entity tempEntity = new UnsafeEntity(entityName, physicalName, entityLabel, typeCode, EntityHelper.createdOn); + Entity tempEntity = new UnsafeEntity(entityName, physicalName, entityLabel, typeCode, EntityHelper.CreatedOn); String primaryFiled = entityName + "Id"; createBuiltinField(tempEntity, primaryFiled, "ID", DisplayType.ID, null, null, null); - createBuiltinField(tempEntity, EntityHelper.autoId, "AUTOID", DisplayType.NUMBER, null, null, null); + createBuiltinField(tempEntity, EntityHelper.AutoId, "AUTOID", DisplayType.NUMBER, null, null, null); - createBuiltinField(tempEntity, EntityHelper.createdBy, "创建人", DisplayType.REFERENCE, null, "User", null); - createBuiltinField(tempEntity, EntityHelper.createdOn, "创建时间", DisplayType.DATETIME, null, null, null); - createBuiltinField(tempEntity, EntityHelper.modifiedBy, "修改人", DisplayType.REFERENCE, null, "User", null); - createBuiltinField(tempEntity, EntityHelper.modifiedOn, "修改时间", DisplayType.DATETIME, null, null, null); + createBuiltinField(tempEntity, EntityHelper.CreatedBy, "创建人", DisplayType.REFERENCE, null, "User", null); + createBuiltinField(tempEntity, EntityHelper.CreatedOn, "创建时间", DisplayType.DATETIME, null, null, null); + createBuiltinField(tempEntity, EntityHelper.ModifiedBy, "修改人", DisplayType.REFERENCE, null, "User", null); + createBuiltinField(tempEntity, EntityHelper.ModifiedOn, "修改时间", DisplayType.DATETIME, null, null, null); // 明细实体关联字段 // 明细实体无所属用户或部门，使用主实体的 @@ -118,8 +118,8 @@ public class Entity2Schema extends Field2Schema { String masterField = masterEntity + "Id"; createBuiltinField(tempEntity, masterField, masterLabel, DisplayType.REFERENCE, "引用主记录(" + masterLabel + ")", masterEntity, CascadeModel.Delete); } else { - createBuiltinField(tempEntity, EntityHelper.owningUser, "所属用户", DisplayType.REFERENCE, null, "User", null); - createBuiltinField(tempEntity, EntityHelper.owningDept, "所属部门", DisplayType.REFERENCE, null, "Department", null); + createBuiltinField(tempEntity, EntityHelper.OwningUser, "所属用户", DisplayType.REFERENCE, null, "User", null); + createBuiltinField(tempEntity, EntityHelper.OwningDept, "所属部门", DisplayType.REFERENCE, null, "Department", null); } boolean schemaReady = schema2Database(tempEntity); diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java b/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java index bae478351..a88e53609 100644 --- a/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java +++ b/src/main/java/com/rebuild/server/metadata/entityhub/Field2Schema.java @@ -213,7 +213,7 @@ public class Field2Schema { record = Application.getCommonService().create(record); tempMetaId.add(record.getPrimary()); - boolean autoValue = EntityHelper.autoId.equals(fieldName); + boolean autoValue = EntityHelper.AutoId.equals(fieldName); Field unsafeField = new FieldImpl( fieldName, physicalName, fieldLabel, entity, displayType.getFieldType(), CascadeModel.Ignore, maxLength, nullable, creatable, updatable, true, 6, null, autoValue); diff --git a/src/main/java/com/rebuild/server/service/base/BulkOperator.java b/src/main/java/com/rebuild/server/service/base/BulkOperator.java index bf7a5ef37..bd45d8338 100644 --- a/src/main/java/com/rebuild/server/service/base/BulkOperator.java +++ b/src/main/java/com/rebuild/server/service/base/BulkOperator.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.helper.BulkTask; import com.rebuild.server.metadata.MetadataHelper; -import com.rebuild.server.query.AdvFilterParser; +import com.rebuild.server.service.query.AdvFilterParser; import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.engine.ID; diff --git a/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java b/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java index 38c05fb7e..5c7a642a8 100644 --- a/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java +++ b/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java @@ -169,8 +169,8 @@ public class GeneralEntityService extends BaseService { User toUser = Application.getUserStore().getUser(to); Record assigned = EntityHelper.forUpdate(record, (ID) toUser.getIdentity()); - assigned.setID(EntityHelper.owningUser, (ID) toUser.getIdentity()); - assigned.setID(EntityHelper.owningDept, (ID) toUser.getOwningDept().getIdentity()); + assigned.setID(EntityHelper.OwningUser, (ID) toUser.getIdentity()); + assigned.setID(EntityHelper.OwningDept, (ID) toUser.getOwningDept().getIdentity()); super.update(assigned); Application.getRecordOwningCache().cleanOwningUser(record); diff --git a/src/main/java/com/rebuild/server/service/notification/NotificationObserver.java b/src/main/java/com/rebuild/server/service/notification/NotificationObserver.java index 6d044a6fd..2a560ba59 100644 --- a/src/main/java/com/rebuild/server/service/notification/NotificationObserver.java +++ b/src/main/java/com/rebuild/server/service/notification/NotificationObserver.java @@ -35,7 +35,7 @@ public class NotificationObserver extends OperateObserver { @Override public void onAssign(OperateContext context) { ID from = context.getOperator(); - ID to = context.getAfterRecord().getID(EntityHelper.owningUser); + ID to = context.getAfterRecord().getID(EntityHelper.OwningUser); ID relatedRecordId = context.getRecordId(); String text = "@%s 分派了 1 条%s记录给你"; diff --git a/src/main/java/com/rebuild/server/query/AdvFilterManager.java b/src/main/java/com/rebuild/server/service/query/AdvFilterManager.java similarity index 99% rename from src/main/java/com/rebuild/server/query/AdvFilterManager.java rename to src/main/java/com/rebuild/server/service/query/AdvFilterManager.java index 0c93e7644..7ea0ba31d 100644 --- a/src/main/java/com/rebuild/server/query/AdvFilterManager.java +++ b/src/main/java/com/rebuild/server/service/query/AdvFilterManager.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.query; +package com.rebuild.server.service.query; import java.util.Date; import java.util.Iterator; diff --git a/src/main/java/com/rebuild/server/query/AdvFilterParser.java b/src/main/java/com/rebuild/server/service/query/AdvFilterParser.java similarity index 99% rename from src/main/java/com/rebuild/server/query/AdvFilterParser.java rename to src/main/java/com/rebuild/server/service/query/AdvFilterParser.java index 083048bca..603ff2273 100644 --- a/src/main/java/com/rebuild/server/query/AdvFilterParser.java +++ b/src/main/java/com/rebuild/server/service/query/AdvFilterParser.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.query; +package com.rebuild.server.service.query; import java.util.ArrayList; import java.util.HashSet; @@ -176,7 +176,7 @@ public class AdvFilterParser { } else if ("SFB".equalsIgnoreCase(op)) { Department dept = UserHelper.getDept(Application.currentCallerUser()); if (dept != null && fieldMeta.getReferenceEntities()[0].getEntityCode() == EntityHelper.User) { - sb.insert(sb.indexOf(" "), "." + EntityHelper.owningDept); + sb.insert(sb.indexOf(" "), "." + EntityHelper.OwningDept); } } else if ("SFD".equalsIgnoreCase(op)) { Department dept = UserHelper.getDept(Application.currentCallerUser()); diff --git a/src/main/java/com/rebuild/server/query/QueryFactory.java b/src/main/java/com/rebuild/server/service/query/QueryFactory.java similarity index 98% rename from src/main/java/com/rebuild/server/query/QueryFactory.java rename to src/main/java/com/rebuild/server/service/query/QueryFactory.java index 5e2616edd..1da25547b 100644 --- a/src/main/java/com/rebuild/server/query/QueryFactory.java +++ b/src/main/java/com/rebuild/server/service/query/QueryFactory.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.query; +package com.rebuild.server.service.query; import org.springframework.util.Assert; diff --git a/src/main/java/com/rebuild/web/base/entity/AdvFilterControll.java b/src/main/java/com/rebuild/web/base/entity/AdvFilterControll.java index d62deedf9..78b09763a 100644 --- a/src/main/java/com/rebuild/web/base/entity/AdvFilterControll.java +++ b/src/main/java/com/rebuild/web/base/entity/AdvFilterControll.java @@ -34,8 +34,8 @@ import com.rebuild.server.Application; import com.rebuild.server.bizz.UserHelper; import com.rebuild.server.helper.manager.LayoutManager; import com.rebuild.server.metadata.EntityHelper; -import com.rebuild.server.query.AdvFilterManager; -import com.rebuild.server.query.AdvFilterParser; +import com.rebuild.server.service.query.AdvFilterManager; +import com.rebuild.server.service.query.AdvFilterParser; import com.rebuild.utils.JSONUtils; import com.rebuild.web.BaseControll; import com.rebuild.web.LayoutConfig; diff --git a/src/main/java/com/rebuild/web/base/entity/QuickFilterControll.java b/src/main/java/com/rebuild/web/base/entity/QuickFilterControll.java index 51bc5a950..6cde5d561 100644 --- a/src/main/java/com/rebuild/web/base/entity/QuickFilterControll.java +++ b/src/main/java/com/rebuild/web/base/entity/QuickFilterControll.java @@ -40,7 +40,7 @@ import com.rebuild.server.helper.manager.LayoutManager; import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.MetadataSorter; -import com.rebuild.server.query.AdvFilterManager; +import com.rebuild.server.service.query.AdvFilterManager; import com.rebuild.web.BaseControll; import com.rebuild.web.LayoutConfig; diff --git a/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java b/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java index 8c52fde4b..d6254a10d 100644 --- a/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java +++ b/src/main/java/com/rebuild/web/base/entity/RelatedListControll.java @@ -129,7 +129,7 @@ public class RelatedListControll extends BaseControll { if (count) { baseSql = String.format(baseSql, "count(" + primaryField.getName() + ")"); } else { - baseSql = String.format(baseSql, primaryField.getName() + "," + namedField.getName() + "," + EntityHelper.modifiedOn); + baseSql = String.format(baseSql, primaryField.getName() + "," + namedField.getName() + "," + EntityHelper.ModifiedOn); baseSql += " order by modifiedOn desc"; } return baseSql; diff --git a/src/main/java/com/rebuild/web/base/entity/datalist/JSONQueryParser.java b/src/main/java/com/rebuild/web/base/entity/datalist/JSONQueryParser.java index 556a81d9d..5d90c1bbd 100644 --- a/src/main/java/com/rebuild/web/base/entity/datalist/JSONQueryParser.java +++ b/src/main/java/com/rebuild/web/base/entity/datalist/JSONQueryParser.java @@ -31,8 +31,8 @@ import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.entityhub.DisplayType; import com.rebuild.server.metadata.entityhub.EasyMeta; -import com.rebuild.server.query.AdvFilterManager; -import com.rebuild.server.query.AdvFilterParser; +import com.rebuild.server.service.query.AdvFilterManager; +import com.rebuild.server.service.query.AdvFilterParser; import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.Field; @@ -159,10 +159,10 @@ public class JSONQueryParser { String sortNode = queryElement.getString("sort"); if (StringUtils.isNotBlank(sortNode)) { sqlSort.append(parseSort(sortNode)); - } else if (entity.containsField(EntityHelper.modifiedOn)) { - sqlSort.append(EntityHelper.modifiedOn + " desc"); - } else if (entity.containsField(EntityHelper.createdOn)) { - sqlSort.append(EntityHelper.createdOn + " desc"); + } else if (entity.containsField(EntityHelper.ModifiedOn)) { + sqlSort.append(EntityHelper.ModifiedOn + " desc"); + } else if (entity.containsField(EntityHelper.CreatedOn)) { + sqlSort.append(EntityHelper.CreatedOn + " desc"); } sqlBase.append(sqlSort); diff --git a/src/main/resources/application-ctx.xml b/src/main/resources/application-ctx.xml index 9dbfedb6b..90f06ddb4 100644 --- a/src/main/resources/application-ctx.xml +++ b/src/main/resources/application-ctx.xml @@ -54,7 +54,7 @@ - +