Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/common/ProductTypeEnum.java

+package com.baosight.hggp.common;
+
+import com.baosight.iplat4j.core.ei.EiBlock;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum ProductTypeEnum {
+	STRUCT(1,"构建"),
+    PART(2,"零件");
+
+    private Integer code;
+
+    private String value;
+
+	ProductTypeEnum(Integer code, String value) {
+		this.code = code;
+		this.value = value;
+	}
+	
+	public static EiBlock generatorEiBlock() {
+		EiBlock block = new EiBlock("product_type_block_id");
+		List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
+			add(new HashMap<String, Object>() {{
+				put(HGConstants.TEXT_FIELD, STRUCT.code + "-" + STRUCT.value);
+				put(HGConstants.VALUE_FIELD, STRUCT.code);
+			}});
+			add(new HashMap<String, Object>() {{
+				put(HGConstants.TEXT_FIELD, PART.code + "-" + PART.value);
+				put(HGConstants.VALUE_FIELD, PART.code);
+			}});
+		}};
+		block.setRows(rows);
+		return block;
+	}
+	
+    public Integer getCode() {
+	    return code;
+    }
+	
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC005A.xml

@@ -170,7 +170,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				id asc
+				product_type asc ,plan_start_date asc
 			</isEmpty>
 		</dynamic>