teamwork扩展字段服务

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/factory/CustomExtFieldReleFactory.java

@@ -52,6 +52,21 @@ public class CustomExtFieldReleFactory extends AbstractFactory {
 		cq.orderBy( cb.desc( root.get( CustomExtFieldRele_.updateTime ) ) );
 		return em.createQuery(cq.where(p)).getResultList();
 	}
+	
+	/**
+	 * 列示所有扩展属性信息列表
+	 * @return
+	 * @throws Exception
+	 */
+	public List<CustomExtFieldRele> listAllFieldReleObj() throws Exception {
+		
+		EntityManager em = this.entityManagerContainer().get(CustomExtFieldRele.class);
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<CustomExtFieldRele> cq = cb.createQuery(CustomExtFieldRele.class);
+		Root<CustomExtFieldRele> root = cq.from(CustomExtFieldRele.class);
+		cq.orderBy( cb.asc( root.get( CustomExtFieldRele_.order ) ) );
+		return em.createQuery(cq).getResultList();
+	}
 
 	/**
 	 * 根据关联ID列示扩展属性ID信息列表

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionSave.java

@@ -113,18 +113,20 @@ public class ActionSave extends BaseAction {
 				}
 			}
 		}
-		
+
 		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty(  fieldName )) {
 				//备用属性已经用完了，无法再添加新的属性
 				check = false;
-				Exception exception = new CustomExtFieldRelePersistException( "扩展属性不足(备用属性已用完)，系统无法为该对象分配["+ customExtFieldRele.getDisplayType() +"]。"  );
-				result.error(exception);
+				wo.setUseable(false);
+				/*Exception exception = new CustomExtFieldRelePersistException( "扩展属性不足(备用属性已用完)，系统无法为该对象分配["+ customExtFieldRele.getDisplayType() +"]。"  );
+				result.error(exception);*/
 			}else {
 				customExtFieldRele.setExtFieldName( fieldName );
 			}
 		}
 
+		
 		if( Boolean.TRUE.equals( check ) ){
 			try {
 				
@@ -246,6 +248,17 @@ public class ActionSave extends BaseAction {
 		
 		@FieldDescribe("操作引起的动态内容")
 		List<WoDynamic> dynamics = new ArrayList<>();
+		
+		@FieldDescribe("备用属性是否可用")
+		Boolean useable = true;
+		
+		public Boolean getUseable(){
+			return useable;
+		}
+		
+		public void setUseable(Boolean useable){
+			this.useable = useable;
+		}
 
 		public List<WoDynamic> getDynamics() {
 			return dynamics;

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/CustomExtFieldReleQueryService.java

@@ -56,9 +56,9 @@ public class CustomExtFieldReleQueryService {
 	 * @throws Exception
 	 */
 	public List<CustomExtFieldRele> listReleWithCorrelation( String correlationId ) throws Exception {
-		if (StringUtils.isEmpty(correlationId)) {
+		/*if (StringUtils.isEmpty(correlationId)) {
 			return new ArrayList<>();
-		}
+		}*/
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			return customExtFieldReleService.listReleWithCorrelation(emc, correlationId);
 		} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/CustomExtFieldReleService.java

@@ -44,7 +44,11 @@ class CustomExtFieldReleService {
 	 */
 	protected List<CustomExtFieldRele> listReleWithCorrelation(EntityManagerContainer emc, String correlationId ) throws Exception {
 		Business business = new Business( emc );
-		return business.customExtFieldReleFactory().listFieldReleObjByCorrelation( correlationId );
+		if(StringUtils.isEmpty(correlationId)){
+			return business.customExtFieldReleFactory().listAllFieldReleObj();
+		}else{
+			return business.customExtFieldReleFactory().listFieldReleObjByCorrelation( correlationId );
+		}
 	}
 	
 	/**

o2server/x_teamwork_core_entity/src/main/java/com/x/teamwork/core/entity/Review.java

@@ -126,7 +126,7 @@ public class Review extends SliceJpaObject {
 	
 	public static final String priority_FIELDNAME = "priority";
 	@FieldDescribe("工作等级：普通、紧急、特急")
-	@Column( length = JpaObject.length_32B, name = ColumnNamePrefix + priority_FIELDNAME)
+	@Column( length = JpaObject.length_255B, name = ColumnNamePrefix + priority_FIELDNAME)
 	@Index(name = TABLE + IndexNameMiddle + priority_FIELDNAME)
 	@CheckPersist( allowEmpty = true )
 	private String priority = "普通";