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

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC005.java

@@ -33,6 +33,7 @@ public class HGSC005 extends DaoEPBase {
 	public static final String FIELD_commit_status = "commitStatus";    		/* 提交状态  0:未提交；2:已提交*/
 	public static final String FIELD_finish_date = "finishDate";    		/* 完工日期*/
 	public static final String FIELD_finish_rate = "finish_rate";    		/* 完工进度*/
+	public static final String FIELD_is_schedule = "is_schedule";    		/* 是否排产 0，否 1，是*/
 	public static final String FIELD_account_code = "accountCode";    		/* 帐套*/
 	public static final String FIELD_dep_code = "depCode";    		/* 部门编码*/
 	public static final String FIELD_dep_name = "depName";    		/* 部门名称*/
@@ -52,7 +53,8 @@ public class HGSC005 extends DaoEPBase {
 	public static final String COL_plan_code = "plan_code";    		/* 计划编码*/
 	public static final String COL_commit_status = "commit_status";    		/* 提交状态  0:未提交；2:已提交*/
 	public static final String COL_finish_date = "finish_date";    		/* 完工日期*/
-//	public static final String COL_finish_rate = "finish_rate";    		/* 完工进度*/
+	public static final String COL_is_schedule = "is_schedule";    		/* 是否排产 0，否 1，是*/
+	//	public static final String COL_finish_rate = "finish_rate";    		/* 完工进度*/
 	public static final String COL_account_code = "account_code";    		/* 帐套*/
 	public static final String COL_dep_code = "dep_code";    		/* 部门编码*/
 	public static final String COL_dep_name = "dep_name";    		/* 部门名称*/
@@ -78,6 +80,7 @@ public class HGSC005 extends DaoEPBase {
 	private String planCode = " ";		/* 计划编码*/
 	private Integer commitStatus = new Integer(0);		/* 提交状态  0:未提交；2:已提交*/
 	private String finishDate = " ";		/* 完工日期*/
+	public Integer isSchedule = new Integer(0);    		/* 是否排产 0，否 1，是*/
 	private Double finishRate = new Double(0);
 	private String accountCode = " ";		/* 帐套*/
 	private String depCode = " ";		/* 部门编码*/
@@ -134,6 +137,10 @@ public class HGSC005 extends DaoEPBase {
 		eiColumn.setDescName("完工日期");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_is_schedule);
+		eiColumn.setDescName("是否排产");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_finish_rate);
 		eiColumn.setDescName("完工进度");
 		eiMetadata.addMeta(eiColumn);
@@ -329,6 +336,14 @@ public class HGSC005 extends DaoEPBase {
 		this.finishDate = finishDate;
 	}
 
+	public Integer getIsSchedule() {
+		return isSchedule;
+	}
+
+	public void setIsSchedule(Integer isSchedule) {
+		this.isSchedule = isSchedule;
+	}
+
 	public Double getFinishRate() {
 		return finishRate;
 	}
@@ -507,6 +522,7 @@ public class HGSC005 extends DaoEPBase {
 		setPlanCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_plan_code)), planCode));
 		setCommitStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_commit_status)), commitStatus));
 		setFinishDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_finish_date)), finishDate));
+		setIsSchedule(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_is_schedule)), isSchedule));
 		setFinishRate(NumberUtils.toDouble(StringUtils.toString(map.get(FIELD_finish_rate)), finishRate));
 		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_account_code)), accountCode));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_dep_code)), depCode));
@@ -535,6 +551,7 @@ public class HGSC005 extends DaoEPBase {
 		map.put(FIELD_plan_code, StringUtils.toString(planCode, eiMetadata.getMeta(FIELD_plan_code)));
 		map.put(FIELD_commit_status, StringUtils.toString(commitStatus, eiMetadata.getMeta(FIELD_commit_status)));
 		map.put(FIELD_finish_date, StringUtils.toString(finishDate, eiMetadata.getMeta(FIELD_finish_date)));
+		map.put(FIELD_is_schedule, StringUtils.toString(isSchedule, eiMetadata.getMeta(FIELD_is_schedule)));
 		map.put(FIELD_finish_rate,StringUtils.toString(finishRate, eiMetadata.getMeta(FIELD_finish_rate)));
 		map.put(FIELD_account_code, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_account_code)));
 		map.put(FIELD_dep_code, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_dep_code)));

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

@@ -55,6 +55,9 @@
 		<isNotEmpty prepend=" AND " property="finishDate">
 			finish_date = #finishDate#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="isSchedule">
+			is_schedule = #isSchedule#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="accountCode">
 			account_code = #accountCode#
 		</isNotEmpty>
@@ -95,6 +98,7 @@
 				proj_name	as "projName",  <!-- 项目名称 -->
 				plan_code	as "planCode",  <!-- 计划编码 -->
 				commit_status	as "commitStatus",  <!-- 提交状态  0:未提交；2:已提交 -->
+				is_schedule	as "isSchedule", <!-- 是否排产  0:否；1:是 -->
 				finish_date	as "finishDate",  <!-- 完工日期 -->
 				account_code	as "accountCode",  <!-- 帐套 -->
 				dep_code	as "depCode",  <!-- 部门编码 -->
@@ -190,6 +194,7 @@
 										plan_code,  <!-- 计划编码 -->
 										commit_status,  <!-- 提交状态  0:未提交；2:已提交 -->
 										finish_date,  <!-- 完工日期 -->
+										is_schedule, <!-- 是否排产  0:否；1:是 -->
 										account_code,  <!-- 帐套 -->
 										dep_code,  <!-- 部门编码 -->
 										dep_name,  <!-- 部门名称 -->
@@ -200,7 +205,7 @@
 										updated_name,  <!-- 修改人名称 -->
 										updated_time  <!-- 更新时间 -->
 										)
-	    VALUES (#id#, #matId#, #companyCode#, #companyName#, #projCode#, #projName#, #planCode#, #commitStatus#, #finishDate#, #accountCode#, #depCode#, #depName#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
+	    VALUES (#id#, #matId#, #companyCode#, #companyName#, #projCode#, #projName#, #planCode#, #commitStatus#, #finishDate#, #isSchedule#, #accountCode#, #depCode#, #depName#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
 	</insert>
 
 	<delete id="delete">
@@ -219,6 +224,7 @@
 					plan_code	= #planCode#,   <!-- 计划编码 -->
 					commit_status	= #commitStatus#,   <!-- 提交状态  0:未提交；2:已提交 -->
 					finish_date	= #finishDate#,   <!-- 完工日期 -->
+					is_schedule = #isSchedule#,	  <!-- 是否排产  0:否；1:是 -->
 					account_code	= #accountCode#,   <!-- 帐套 -->
 					dep_code	= #depCode#,   <!-- 部门编码 -->
 					dep_name	= #depName#,   <!-- 部门名称 -->