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

src/main/java/com/baosight/hggp/hg/sc/constant/HgScSqlConstant.java

@@ -20,6 +20,12 @@ public class HgScSqlConstant {
 		public static final String UPDATE_FOR_DC = "HGSC001.updateForDc";
 		// 修改项目名称
 		public static final String UPDATE_PROJ_NAME = "HGSC001.updateProjName";
+		// 批量删除
+		public static final String BATCH_DELETE = "HGSC001.batch_delete";
+		// 批量完成
+		public static final String BATCH_COMPLETE = "HGSC001.batch_complete";
+		// 批量提交
+		public static final String BATCH_COMMIT = "HGSC001.batch_commit";
 	}
 	
 	/**

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

 package com.baosight.hggp.hg.sc.domain;
 
-
 import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
@@ -16,13 +15,20 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-07 17:23:17 create
+ * @history 2024-10-14 10:18:37 create
  */
 public class HGSC001 extends DaoEPBase {
 	
 	private static final long serialVersionUID = 1L;
 	
 	public static final String FIELD_id = "id";
+	public static final String FIELD_account_code = "accountCode";    		/* 帐套*/
+	public static final String FIELD_created_by = "createdBy";    		/* 创建人*/
+	public static final String FIELD_created_name = "createdName";    		/* 创建人名称*/
+	public static final String FIELD_created_time = "createdTime";    		/* 创建时间*/
+	public static final String FIELD_updated_by = "updatedBy";    		/* 更新人*/
+	public static final String FIELD_updated_name = "updatedName";    		/* 修改人名称*/
+	public static final String FIELD_updated_time = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_company_code = "companyCode";    		/* 公司编码*/
 	public static final String FIELD_company_name = "companyName";    		/* 公司名称*/
 	public static final String FIELD_dep_code = "depCode";    		/* 部门编码*/
@@ -33,26 +39,27 @@ public class HGSC001 extends DaoEPBase {
 	public static final String FIELD_genral_contract_name = "genralContractName";    		/* 总包商名称*/
 	public static final String FIELD_party_pm_name = "partyPmName";    		/* 甲方项目经理名称*/
 	public static final String FIELD_party_pm_hpone = "partyPmHpone";    		/* 甲方项目经理联系电话*/
-	public static final String FIELD_CONTRACT_NO = "contractNo";    		/* 合同号*/
+	public static final String FIELD_contract_no = "contractNo";    		/* 合同号*/
 	public static final String FIELD_contract_name = "contractName";    		/* 合同名称*/
 	public static final String FIELD_contract_work_txt = "contractWorkTxt";    		/* 合同工作量*/
 	public static final String FIELD_proj_code = "projCode";    		/* 项目编码*/
 	public static final String FIELD_proj_name = "projName";    		/* 项目名称*/
 	public static final String FIELD_proj_type = "projType";    		/* 项目性质*/
-	public static final String FIELD_proj_status = "projStatus";    		/* 项目状态\t0:在建；1:完工*/
-	public static final String FIELD_approval_status = "approvalStatus";    		/* 审批状态\t0:待审；1:审核中；2:已审*/
+	public static final String FIELD_proj_status = "projStatus";    		/* 项目状态    0:在建；1:完工*/
+	public static final String FIELD_approval_status = "approvalStatus";    		/* 审批状态    0:待审；1:审核中；2:已审*/
 	public static final String FIELD_permiss_start_date = "permissStartDate";    		/* 准许开工日期*/
 	public static final String FIELD_start_date = "startDate";    		/* 开工日期*/
 	public static final String FIELD_end_date = "endDate";    		/* 完工日期*/
-	public static final String FIELD_account_code = "accountCode";    		/* 帐套*/
-	public static final String FIELD_created_by = "createdBy";    		/* 创建人*/
-	public static final String FIELD_created_name = "createdName";    		/* 创建人名称*/
-	public static final String FIELD_created_time = "createdTime";    		/* 创建时间*/
-	public static final String FIELD_updated_by = "updatedBy";    		/* 更新人*/
-	public static final String FIELD_updated_name = "updatedName";    		/* 修改人名称*/
-	public static final String FIELD_updated_time = "updatedTime";    		/* 更新时间*/
+	public static final String FIELD_project_source = "projectSource";    		/* 项目来源*/
 	
 	public static final String COL_id = "id";
+	public static final String COL_account_code = "account_code";    		/* 帐套*/
+	public static final String COL_created_by = "created_by";    		/* 创建人*/
+	public static final String COL_created_name = "created_name";    		/* 创建人名称*/
+	public static final String COL_created_time = "created_time";    		/* 创建时间*/
+	public static final String COL_updated_by = "updated_by";    		/* 更新人*/
+	public static final String COL_updated_name = "updated_name";    		/* 修改人名称*/
+	public static final String COL_updated_time = "updated_time";    		/* 更新时间*/
 	public static final String COL_company_code = "company_code";    		/* 公司编码*/
 	public static final String COL_company_name = "company_name";    		/* 公司名称*/
 	public static final String COL_dep_code = "dep_code";    		/* 部门编码*/
@@ -63,64 +70,55 @@ public class HGSC001 extends DaoEPBase {
 	public static final String COL_genral_contract_name = "genral_contract_name";    		/* 总包商名称*/
 	public static final String COL_party_pm_name = "party_pm_name";    		/* 甲方项目经理名称*/
 	public static final String COL_party_pm_hpone = "party_pm_hpone";    		/* 甲方项目经理联系电话*/
-	public static final String COL_CONTRACT_NO = "CONTRACT_NO";    		/* 合同号*/
+	public static final String COL_contract_no = "contract_no";    		/* 合同号*/
 	public static final String COL_contract_name = "contract_name";    		/* 合同名称*/
 	public static final String COL_contract_work_txt = "contract_work_txt";    		/* 合同工作量*/
 	public static final String COL_proj_code = "proj_code";    		/* 项目编码*/
 	public static final String COL_proj_name = "proj_name";    		/* 项目名称*/
 	public static final String COL_proj_type = "proj_type";    		/* 项目性质*/
-	public static final String COL_proj_status = "proj_status";    		/* 项目状态\t0:在建；1:完工*/
-	public static final String COL_approval_status = "approval_status";    		/* 审批状态\t0:待审；1:审核中；2:已审*/
+	public static final String COL_proj_status = "proj_status";    		/* 项目状态    0:在建；1:完工*/
+	public static final String COL_approval_status = "approval_status";    		/* 审批状态    0:待审；1:审核中；2:已审*/
 	public static final String COL_permiss_start_date = "permiss_start_date";    		/* 准许开工日期*/
 	public static final String COL_start_date = "start_date";    		/* 开工日期*/
 	public static final String COL_end_date = "end_date";    		/* 完工日期*/
-	public static final String COL_account_code = "account_code";    		/* 帐套*/
-	public static final String COL_created_by = "created_by";    		/* 创建人*/
-	public static final String COL_created_name = "created_name";    		/* 创建人名称*/
-	public static final String COL_created_time = "created_time";    		/* 创建时间*/
-	public static final String COL_updated_by = "updated_by";    		/* 更新人*/
-	public static final String COL_updated_name = "updated_name";    		/* 修改人名称*/
-	public static final String COL_updated_time = "updated_time";    		/* 更新时间*/
+	public static final String COL_project_source = "project_source";    		/* 项目来源*/
 	
 	public static final String QUERY = "HGSC001.query";
 	public static final String COUNT = "HGSC001.count";
 	public static final String INSERT = "HGSC001.insert";
 	public static final String UPDATE = "HGSC001.update";
 	public static final String DELETE = "HGSC001.delete";
-	public static final String BATCH_DELETE = "HGSC001.batch_delete";
-	public static final String BATCH_COMPLETE = "HGSC001.batch_complete";
-	public static final String BATCH_COMMIT = "HGSC001.batch_commit";
-
 	
 	private Long id = new Long(0);
-	private String companyCode = "";		/* 公司编码*/
-	private String companyName = "";		/* 公司名称*/
-	private String depCode = "";		/* 部门编码*/
-	private String depName = "";		/* 部门名称*/
-	private String subcontractCode = "";		/* 分包商编码*/
-	private String subcontractName = "";		/* 分包商名称*/
-	private String genralContractCode = "";		/* 总包商编码*/
-	private String genralContractName = "";		/* 总包商名称*/
-	private String partyPmName = "";		/* 甲方项目经理名称*/
-	private String partyPmHpone = "";		/* 甲方项目经理联系电话*/
-	private String contractNo = "";		/* 合同号*/
-	private String contractName = "";		/* 合同名称*/
-	private String contractWorkTxt = "";		/* 合同工作量*/
-	private String projCode = "";		/* 项目编码*/
-	private String projName = "";		/* 项目名称*/
-	private String projType = "";		/* 项目性质*/
-	private Integer projStatus = new Integer(0);		/* 项目状态\t0:在建；1:完工*/
-	private Integer approvalStatus = new Integer(0);		/* 审批状态\t0:待审；1:审核中；2:已审*/
-	private String permissStartDate = "";		/* 准许开工日期*/
-	private String startDate = "";		/* 开工日期*/
-	private String endDate = "";		/* 完工日期*/
-	private String accountCode = "";		/* 帐套*/
-	private String createdBy = "";		/* 创建人*/
-	private String createdName = "";		/* 创建人名称*/
-	private String createdTime = "";		/* 创建时间*/
-	private String updatedBy = "";		/* 更新人*/
-	private String updatedName = "";		/* 修改人名称*/
-	private String updatedTime = "";		/* 更新时间*/
+	private String accountCode = " ";		/* 帐套*/
+	private String createdBy = " ";		/* 创建人*/
+	private String createdName = " ";		/* 创建人名称*/
+	private String createdTime = " ";		/* 创建时间*/
+	private String updatedBy = " ";		/* 更新人*/
+	private String updatedName = " ";		/* 修改人名称*/
+	private String updatedTime = " ";		/* 更新时间*/
+	private String companyCode = " ";		/* 公司编码*/
+	private String companyName = " ";		/* 公司名称*/
+	private String depCode = " ";		/* 部门编码*/
+	private String depName = " ";		/* 部门名称*/
+	private String subcontractCode = " ";		/* 分包商编码*/
+	private String subcontractName = " ";		/* 分包商名称*/
+	private String genralContractCode = " ";		/* 总包商编码*/
+	private String genralContractName = " ";		/* 总包商名称*/
+	private String partyPmName = " ";		/* 甲方项目经理名称*/
+	private String partyPmHpone = " ";		/* 甲方项目经理联系电话*/
+	private String contractNo = " ";		/* 合同号*/
+	private String contractName = " ";		/* 合同名称*/
+	private String contractWorkTxt = " ";		/* 合同工作量*/
+	private String projCode = " ";		/* 项目编码*/
+	private String projName = " ";		/* 项目名称*/
+	private String projType = " ";		/* 项目性质*/
+	private Integer projStatus = new Integer(0);		/* 项目状态    0:在建；1:完工*/
+	private Integer approvalStatus = new Integer(0);		/* 审批状态    0:待审；1:审核中；2:已审*/
+	private String permissStartDate = " ";		/* 准许开工日期*/
+	private String startDate = " ";		/* 开工日期*/
+	private String endDate = " ";		/* 完工日期*/
+	private String projectSource = " ";		/* 项目来源*/
 	
 	/**
 	 * initialize the metadata.
@@ -130,7 +128,35 @@ public class HGSC001 extends DaoEPBase {
 		
 		eiColumn = new EiColumn(FIELD_id);
 		eiColumn.setPrimaryKey(true);
-		eiColumn.setDescName("");
+		eiColumn.setDescName(" ");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_account_code);
+		eiColumn.setDescName("帐套");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_created_by);
+		eiColumn.setDescName("创建人");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_created_name);
+		eiColumn.setDescName("创建人名称");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_created_time);
+		eiColumn.setDescName("创建时间");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_updated_by);
+		eiColumn.setDescName("更新人");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_updated_name);
+		eiColumn.setDescName("修改人名称");
+		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_updated_time);
+		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_company_code);
@@ -173,7 +199,7 @@ public class HGSC001 extends DaoEPBase {
 		eiColumn.setDescName("甲方项目经理联系电话");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_CONTRACT_NO);
+		eiColumn = new EiColumn(FIELD_contract_no);
 		eiColumn.setDescName("合同号");
 		eiMetadata.addMeta(eiColumn);
 		
@@ -198,11 +224,11 @@ public class HGSC001 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_proj_status);
-		eiColumn.setDescName("项目状态\t0:在建；1:完工");
+		eiColumn.setDescName("项目状态    0:在建；1:完工");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_approval_status);
-		eiColumn.setDescName("审批状态\t0:待审；1:审核中；2:已审");
+		eiColumn.setDescName("审批状态    0:待审；1:审核中；2:已审");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_permiss_start_date);
@@ -217,32 +243,8 @@ public class HGSC001 extends DaoEPBase {
 		eiColumn.setDescName("完工日期");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_account_code);
-		eiColumn.setDescName("帐套");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_created_by);
-		eiColumn.setDescName("创建人");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_created_name);
-		eiColumn.setDescName("创建人名称");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_created_time);
-		eiColumn.setDescName("创建时间");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_updated_by);
-		eiColumn.setDescName("更新人");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_updated_name);
-		eiColumn.setDescName("修改人名称");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_updated_time);
-		eiColumn.setDescName("更新时间");
+		eiColumn = new EiColumn(FIELD_project_source);
+		eiColumn.setDescName("项目来源");
 		eiMetadata.addMeta(eiColumn);
 		
 		
@@ -272,6 +274,118 @@ public class HGSC001 extends DaoEPBase {
 		this.id = id;
 	}
 	/**
+	 * get the accountCode - 帐套.
+	 * @return the accountCode
+	 */
+	public String getAccountCode() {
+		return this.accountCode;
+	}
+	
+	/**
+	 * set the accountCode - 帐套.
+	 *
+	 * @param accountCode - 帐套
+	 */
+	public void setAccountCode(String accountCode) {
+		this.accountCode = accountCode;
+	}
+	/**
+	 * get the createdBy - 创建人.
+	 * @return the createdBy
+	 */
+	public String getCreatedBy() {
+		return this.createdBy;
+	}
+	
+	/**
+	 * set the createdBy - 创建人.
+	 *
+	 * @param createdBy - 创建人
+	 */
+	public void setCreatedBy(String createdBy) {
+		this.createdBy = createdBy;
+	}
+	/**
+	 * get the createdName - 创建人名称.
+	 * @return the createdName
+	 */
+	public String getCreatedName() {
+		return this.createdName;
+	}
+	
+	/**
+	 * set the createdName - 创建人名称.
+	 *
+	 * @param createdName - 创建人名称
+	 */
+	public void setCreatedName(String createdName) {
+		this.createdName = createdName;
+	}
+	/**
+	 * get the createdTime - 创建时间.
+	 * @return the createdTime
+	 */
+	public String getCreatedTime() {
+		return this.createdTime;
+	}
+	
+	/**
+	 * set the createdTime - 创建时间.
+	 *
+	 * @param createdTime - 创建时间
+	 */
+	public void setCreatedTime(String createdTime) {
+		this.createdTime = createdTime;
+	}
+	/**
+	 * get the updatedBy - 更新人.
+	 * @return the updatedBy
+	 */
+	public String getUpdatedBy() {
+		return this.updatedBy;
+	}
+	
+	/**
+	 * set the updatedBy - 更新人.
+	 *
+	 * @param updatedBy - 更新人
+	 */
+	public void setUpdatedBy(String updatedBy) {
+		this.updatedBy = updatedBy;
+	}
+	/**
+	 * get the updatedName - 修改人名称.
+	 * @return the updatedName
+	 */
+	public String getUpdatedName() {
+		return this.updatedName;
+	}
+	
+	/**
+	 * set the updatedName - 修改人名称.
+	 *
+	 * @param updatedName - 修改人名称
+	 */
+	public void setUpdatedName(String updatedName) {
+		this.updatedName = updatedName;
+	}
+	/**
+	 * get the updatedTime - 更新时间.
+	 * @return the updatedTime
+	 */
+	public String getUpdatedTime() {
+		return this.updatedTime;
+	}
+	
+	/**
+	 * set the updatedTime - 更新时间.
+	 *
+	 * @param updatedTime - 更新时间
+	 */
+	public void setUpdatedTime(String updatedTime) {
+		this.updatedTime = updatedTime;
+	}
+	/**
 	 * get the companyCode - 公司编码.
 	 * @return the companyCode
 	 */
@@ -432,6 +546,22 @@ public class HGSC001 extends DaoEPBase {
 		this.partyPmHpone = partyPmHpone;
 	}
 	/**
+	 * get the contractNo - 合同号.
+	 * @return the contractNo
+	 */
+	public String getContractNo() {
+		return this.contractNo;
+	}
+	
+	/**
+	 * set the contractNo - 合同号.
+	 *
+	 * @param contractNo - 合同号
+	 */
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	/**
 	 * get the contractName - 合同名称.
 	 * @return the contractName
 	 */
@@ -512,7 +642,7 @@ public class HGSC001 extends DaoEPBase {
 		this.projType = projType;
 	}
 	/**
-	 * get the projStatus - 项目状态\t0:在建；1:完工.
+	 * get the projStatus - 项目状态    0:在建；1:完工.
 	 * @return the projStatus
 	 */
 	public Integer getProjStatus() {
@@ -520,15 +650,15 @@ public class HGSC001 extends DaoEPBase {
 	}
 	
 	/**
-	 * set the projStatus - 项目状态\t0:在建；1:完工.
+	 * set the projStatus - 项目状态    0:在建；1:完工.
 	 *
-	 * @param projStatus - 项目状态\t0:在建；1:完工
+	 * @param projStatus - 项目状态    0:在建；1:完工
 	 */
 	public void setProjStatus(Integer projStatus) {
 		this.projStatus = projStatus;
 	}
 	/**
-	 * get the approvalStatus - 审批状态\t0:待审；1:审核中；2:已审.
+	 * get the approvalStatus - 审批状态    0:待审；1:审核中；2:已审.
 	 * @return the approvalStatus
 	 */
 	public Integer getApprovalStatus() {
@@ -536,9 +666,9 @@ public class HGSC001 extends DaoEPBase {
 	}
 	
 	/**
-	 * set the approvalStatus - 审批状态\t0:待审；1:审核中；2:已审.
+	 * set the approvalStatus - 审批状态    0:待审；1:审核中；2:已审.
 	 *
-	 * @param approvalStatus - 审批状态\t0:待审；1:审核中；2:已审
+	 * @param approvalStatus - 审批状态    0:待审；1:审核中；2:已审
 	 */
 	public void setApprovalStatus(Integer approvalStatus) {
 		this.approvalStatus = approvalStatus;
@@ -592,127 +722,22 @@ public class HGSC001 extends DaoEPBase {
 		this.endDate = endDate;
 	}
 	/**
-	 * get the accountCode - 帐套.
-	 * @return the accountCode
+	 * get the projectSource - 项目来源.
+	 * @return the projectSource
 	 */
-	public String getAccountCode() {
-		return this.accountCode;
+	public String getProjectSource() {
+		return this.projectSource;
 	}
 	
 	/**
-	 * set the accountCode - 帐套.
+	 * set the projectSource - 项目来源.
 	 *
-	 * @param accountCode - 帐套
+	 * @param projectSource - 项目来源
 	 */
-	public void setAccountCode(String accountCode) {
-		this.accountCode = accountCode;
+	public void setProjectSource(String projectSource) {
+		this.projectSource = projectSource;
 	}
 	/**
-	 * get the createdBy - 创建人.
-	 * @return the createdBy
-	 */
-	public String getCreatedBy() {
-		return this.createdBy;
-	}
-
-	/**
-	 * set the createdBy - 创建人.
-	 *
-	 * @param createdBy - 创建人
-	 */
-	public void setCreatedBy(String createdBy) {
-		this.createdBy = createdBy;
-	}
-	/**
-	 * get the createdName - 创建人名称.
-	 * @return the createdName
-	 */
-	public String getCreatedName() {
-		return this.createdName;
-	}
-
-	/**
-	 * set the createdName - 创建人名称.
-	 *
-	 * @param createdName - 创建人名称
-	 */
-	public void setCreatedName(String createdName) {
-		this.createdName = createdName;
-	}
-	/**
-	 * get the createdTime - 创建时间.
-	 * @return the createdTime
-	 */
-	public String getCreatedTime() {
-		return this.createdTime;
-	}
-
-	/**
-	 * set the createdTime - 创建时间.
-	 *
-	 * @param createdTime - 创建时间
-	 */
-	public void setCreatedTime(String createdTime) {
-		this.createdTime = createdTime;
-	}
-	/**
-	 * get the updatedBy - 更新人.
-	 * @return the updatedBy
-	 */
-	public String getUpdatedBy() {
-		return this.updatedBy;
-	}
-
-	/**
-	 * set the updatedBy - 更新人.
-	 *
-	 * @param updatedBy - 更新人
-	 */
-	public void setUpdatedBy(String updatedBy) {
-		this.updatedBy = updatedBy;
-	}
-	/**
-	 * get the updatedName - 修改人名称.
-	 * @return the updatedName
-	 */
-	public String getUpdatedName() {
-		return this.updatedName;
-	}
-
-	/**
-	 * set the updatedName - 修改人名称.
-	 *
-	 * @param updatedName - 修改人名称
-	 */
-	public void setUpdatedName(String updatedName) {
-		this.updatedName = updatedName;
-	}
-	/**
-	 * get the updatedTime - 更新时间.
-	 * @return the updatedTime
-	 */
-	public String getUpdatedTime() {
-		return this.updatedTime;
-	}
-
-	/**
-	 * set the updatedTime - 更新时间.
-	 *
-	 * @param updatedTime - 更新时间
-	 */
-	public void setUpdatedTime(String updatedTime) {
-		this.updatedTime = updatedTime;
-	}
-	
-	public String getContractNo() {
-		return contractNo;
-	}
-	
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-	
-	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -721,6 +746,13 @@ public class HGSC001 extends DaoEPBase {
 	public void fromMap(Map map) {
 		
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_id)), id));
+		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_account_code)), accountCode));
+		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_created_by)), createdBy));
+		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_created_name)), createdName));
+		setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_created_time)), createdTime));
+		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
+		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
+		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_company_code)), companyCode));
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_company_name)), companyName));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_dep_code)), depCode));
@@ -731,6 +763,7 @@ public class HGSC001 extends DaoEPBase {
 		setGenralContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_genral_contract_name)), genralContractName));
 		setPartyPmName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_party_pm_name)), partyPmName));
 		setPartyPmHpone(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_party_pm_hpone)), partyPmHpone));
+		setContractNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_contract_no)), contractNo));
 		setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_contract_name)), contractName));
 		setContractWorkTxt(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_contract_work_txt)), contractWorkTxt));
 		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_proj_code)), projCode));
@@ -741,14 +774,7 @@ public class HGSC001 extends DaoEPBase {
 		setPermissStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_permiss_start_date)), permissStartDate));
 		setStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_start_date)), startDate));
 		setEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_end_date)), endDate));
-		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_account_code)), accountCode));
-		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_created_by)), createdBy));
-		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_created_name)), createdName));
-		setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_created_time)), createdTime));
-		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
-		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
-		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
-		setContractNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NO)), contractNo));
+		setProjectSource(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_project_source)), projectSource));
 	}
 	
 	/**
@@ -759,6 +785,13 @@ public class HGSC001 extends DaoEPBase {
 		
 		Map map = new HashMap();
 		map.put(FIELD_id, StringUtils.toString(id, eiMetadata.getMeta(FIELD_id)));
+		map.put(FIELD_account_code, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_account_code)));
+		map.put(FIELD_created_by, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_created_by)));
+		map.put(FIELD_created_name, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_created_name)));
+		map.put(FIELD_created_time, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_created_time)));
+		map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
+		map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
+		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
 		map.put(FIELD_company_code, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_company_code)));
 		map.put(FIELD_company_name, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_company_name)));
 		map.put(FIELD_dep_code, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_dep_code)));
@@ -769,6 +802,7 @@ public class HGSC001 extends DaoEPBase {
 		map.put(FIELD_genral_contract_name, StringUtils.toString(genralContractName, eiMetadata.getMeta(FIELD_genral_contract_name)));
 		map.put(FIELD_party_pm_name, StringUtils.toString(partyPmName, eiMetadata.getMeta(FIELD_party_pm_name)));
 		map.put(FIELD_party_pm_hpone, StringUtils.toString(partyPmHpone, eiMetadata.getMeta(FIELD_party_pm_hpone)));
+		map.put(FIELD_contract_no, StringUtils.toString(contractNo, eiMetadata.getMeta(FIELD_contract_no)));
 		map.put(FIELD_contract_name, StringUtils.toString(contractName, eiMetadata.getMeta(FIELD_contract_name)));
 		map.put(FIELD_contract_work_txt, StringUtils.toString(contractWorkTxt, eiMetadata.getMeta(FIELD_contract_work_txt)));
 		map.put(FIELD_proj_code, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_proj_code)));
@@ -779,14 +813,7 @@ public class HGSC001 extends DaoEPBase {
 		map.put(FIELD_permiss_start_date, StringUtils.toString(permissStartDate, eiMetadata.getMeta(FIELD_permiss_start_date)));
 		map.put(FIELD_start_date, StringUtils.toString(startDate, eiMetadata.getMeta(FIELD_start_date)));
 		map.put(FIELD_end_date, StringUtils.toString(endDate, eiMetadata.getMeta(FIELD_end_date)));
-		map.put(FIELD_account_code, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_account_code)));
-		map.put(FIELD_created_by, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_created_by)));
-		map.put(FIELD_created_name, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_created_name)));
-		map.put(FIELD_created_time, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_created_time)));
-		map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
-		map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
-		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
-		map.put(FIELD_CONTRACT_NO, StringUtils.toString(contractNo, eiMetadata.getMeta(FIELD_CONTRACT_NO)));
+		map.put(FIELD_project_source, StringUtils.toString(projectSource, eiMetadata.getMeta(FIELD_project_source)));
 		
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/sc/enums/ProjectTypeEnum.java → src/main/java/com/baosight/hggp/hg/sc/enums/ProjectSourceEnum.java

@@ -4,7 +4,7 @@ package com.baosight.hggp.hg.sc.enums;
  * @author:songx
  * @date:2024/3/1,17:29
  */
-public enum ProjectTypeEnum {
+public enum ProjectSourceEnum {
 	
 	ENGINEERING("engineering", "工程设计图"),
 	FOREIGN("foreign", "外来制造图"),
@@ -28,7 +28,7 @@ public enum ProjectTypeEnum {
 	 * @return
 	 */
 	public static boolean contains(String code) {
-		for (ProjectTypeEnum value : values()) {
+		for (ProjectSourceEnum value : values()) {
 			if (value.getCode().equals(code)) {
 				return true;
 			}
@@ -36,7 +36,7 @@ public enum ProjectTypeEnum {
 		return false;
 	}
 	
-	ProjectTypeEnum(String code, String name) {
+	ProjectSourceEnum(String code, String name) {
 		this.code = code;
 		this.name = name;
 	}

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001.java

@@ -5,6 +5,7 @@ import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.sc.constant.HgScSqlConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.domain.HGSC001A;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
@@ -62,7 +63,7 @@ public class ServiceHGSC001 extends ServiceBase {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 销售单号
             List<Long> ids = ObjectUtils.listKey(resultRows, HGSC001.FIELD_id);
-            DaoUtils.update(HGSC001.BATCH_DELETE, new HashMap<String,Object>(){{put("ids",ids);}});
+            DaoUtils.update(HgScSqlConstant.HgSc001.BATCH_DELETE, new HashMap<String,Object>(){{put("ids",ids);}});
             HGSCTools.THGSC001A.deleteByProIds(ids);
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
@@ -79,7 +80,7 @@ public class ServiceHGSC001 extends ServiceBase {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 销售单号
             List<Long> ids = ObjectUtils.listKey(resultRows, "id");
-            DaoUtils.update(HGSC001.BATCH_COMPLETE, new HashMap<String,Object>(){{put("ids",ids);}});
+            DaoUtils.update(HgScSqlConstant.HgSc001.BATCH_COMPLETE, new HashMap<String,Object>(){{put("ids",ids);}});
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据完工成功!");
@@ -94,7 +95,7 @@ public class ServiceHGSC001 extends ServiceBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             List<Long> ids = ObjectUtils.listKey(resultRows, HGSC001.FIELD_id);
-            DaoUtils.update(HGSC001.BATCH_COMMIT, new HashMap<String,Object>(){{put("ids",ids);}});
+            DaoUtils.update(HgScSqlConstant.HgSc001.BATCH_COMMIT, new HashMap<String,Object>(){{put("ids",ids);}});
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101.java

@@ -7,10 +7,9 @@ import com.baosight.hggp.core.model.Pager;
 import com.baosight.hggp.core.utils.ThreadUtils;
 import com.baosight.hggp.hg.pz.domain.HGPZ009;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
-import com.baosight.hggp.hg.sc.constant.HgScConst;
 import com.baosight.hggp.hg.sc.constant.HgScSqlConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
-import com.baosight.hggp.hg.sc.enums.ProjectTypeEnum;
+import com.baosight.hggp.hg.sc.enums.ProjectSourceEnum;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.EiInfoUtils;
@@ -160,13 +159,13 @@ public class ServiceHGSC101 extends ServiceEPBase {
 				dbSc001.setProjCode(projCode);
 				dbSc001.setProjName(dcContractList.getTitle());
 				// TODO 默认其他，需要根据智邦的接口返回值确定
-				dbSc001.setProjType(ProjectTypeEnum.OTHER.getCode());
+				dbSc001.setProjectSource(ProjectSourceEnum.OTHER.getCode());
 				dbSc001.setContractNo(dcContractList.getHtid());
 				DaoUtils.insert(HGSC001.INSERT, dbSc001);
 			} else {
 				Map updateMap = new HashMap();
 				updateMap.put(HGSC001.FIELD_proj_code, projCode);
-				updateMap.put(HGSC001.FIELD_CONTRACT_NO, dcContractList.getHtid());
+				updateMap.put(HGSC001.FIELD_contract_no, dcContractList.getHtid());
 				updateMap.put(HGSC001.FIELD_proj_name, dcContractList.getTitle());
 				DaoUtils.update(HgScSqlConstant.HgSc001.UPDATE_PROJ_NAME, updateMap);
 			}

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101A.java

@@ -80,7 +80,7 @@ public class ServiceHGSC101A extends ServiceEPBase {
 	 */
 	private void checkData(HGSC001 fSc001) {
 		AssertUtils.isEmpty(fSc001.getProjName(), "项目名称不能为空！");
-		AssertUtils.isEmpty(fSc001.getProjType(), "项目类型不能为空！");
+		AssertUtils.isEmpty(fSc001.getProjectSource(), "项目来源不能为空！");
 	}
 	
 	/**

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

@@ -4,6 +4,13 @@
 
     <sql id="column">
         id as "id",
+        account_code as "accountCode",  <!-- 帐套 -->
+        created_by as "createdBy",  <!-- 创建人 -->
+        created_name as "createdName",  <!-- 创建人名称 -->
+        created_time as "createdTime",  <!-- 创建时间 -->
+        updated_by as "updatedBy",  <!-- 更新人 -->
+        updated_name as "updatedName",  <!-- 修改人名称 -->
+        updated_time as "updatedTime",  <!-- 更新时间 -->
         company_code as "companyCode",  <!-- 公司编码 -->
         company_name as "companyName",  <!-- 公司名称 -->
         dep_code as "depCode",  <!-- 部门编码 -->
@@ -25,13 +32,7 @@
         permiss_start_date as "permissStartDate",  <!-- 准许开工日期 -->
         start_date as "startDate",  <!-- 开工日期 -->
         end_date as "endDate",  <!-- 完工日期 -->
-        account_code as "accountCode",  <!-- 帐套 -->
-        created_by as "createdBy",  <!-- 创建人 -->
-        created_name as "createdName",  <!-- 创建人名称 -->
-        created_time as "createdTime",  <!-- 创建时间 -->
-        updated_by as "updatedBy",  <!-- 更新人 -->
-        updated_name as "updatedName",  <!-- 修改人名称 -->
-        updated_time as "updatedTime" <!-- 更新时间 -->
+        project_source as "projectSource" <!-- 项目来源 -->
     </sql>
 
 	<sql id="condition">
@@ -111,17 +112,14 @@
 		<isNotEmpty prepend=" AND " property="createdName">
 			created_name = #createdName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdTime">
-			created_time = #createdTime#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="updatedBy">
 			updated_by = #updatedBy#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="updatedName">
 			updated_name = #updatedName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedTime">
-			updated_time = #updatedTime#
+        <isNotEmpty prepend=" AND " property="projectSource">
+            project_source = #projectSource#
         </isNotEmpty>
 	</sql>
 
@@ -324,7 +322,7 @@
         COMPANY_CODE = #companyCode#,
         COMPANY_NAME = #companyName#,
         PROJ_NAME = #projName#,
-        PROJ_TYPE = #projType#,
+        PROJECT_SOURCE = #projectSource#,
         <include refid="SqlBase.updateRevise"/>
         WHERE PROJ_CODE = #projCode#
     </update>

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

@@ -4,6 +4,13 @@
 
     <sql id="column">
         id as "id",
+        account_code as "accountCode",  <!-- 帐套 -->
+        created_by as "createdBy",  <!-- 创建人 -->
+        created_name as "createdName",  <!-- 创建人名称 -->
+        created_time as "createdTime",  <!-- 创建时间 -->
+        updated_by as "updatedBy",  <!-- 更新人 -->
+        updated_name as "updatedName",  <!-- 修改人名称 -->
+        updated_time as "updatedTime",  <!-- 更新时间 -->
         company_code as "companyCode",  <!-- 公司编码 -->
         company_name as "companyName",  <!-- 公司名称 -->
         dep_code as "depCode",  <!-- 部门编码 -->
@@ -14,6 +21,7 @@
         genral_contract_name as "genralContractName",  <!-- 总包商名称 -->
         party_pm_name as "partyPmName",  <!-- 甲方项目经理名称 -->
         party_pm_hpone as "partyPmHpone",  <!-- 甲方项目经理联系电话 -->
+        contract_no as "contractNo",  <!-- 合同号 -->
         contract_name as "contractName",  <!-- 合同名称 -->
         contract_work_txt as "contractWorkTxt",  <!-- 合同工作量 -->
         proj_code as "projCode",  <!-- 项目编码 -->
@@ -24,13 +32,7 @@
         permiss_start_date as "permissStartDate",  <!-- 准许开工日期 -->
         start_date as "startDate",  <!-- 开工日期 -->
         end_date as "endDate",  <!-- 完工日期 -->
-        account_code as "accountCode",  <!-- 帐套 -->
-        created_by as "createdBy",  <!-- 创建人 -->
-        created_name as "createdName",  <!-- 创建人名称 -->
-        created_time as "createdTime",  <!-- 创建时间 -->
-        updated_by as "updatedBy",  <!-- 更新人 -->
-        updated_name as "updatedName",  <!-- 修改人名称 -->
-        updated_time as "updatedTime" <!-- 更新时间 -->
+        project_source as "projectSource" <!-- 项目来源 -->
     </sql>
 
 	<sql id="condition">
@@ -65,6 +67,9 @@
 		<isNotEmpty prepend=" AND " property="projType">
 			proj_type = #projType#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="projectSource">
+            project_source = #projectSource#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="ename">
             proj_name like concat('%', #ename#, '%') or proj_code like concat('%', #ename#, '%')
         </isNotEmpty>

src/main/java/com/baosight/hggp/hg/wd/constant/HgWdSqlConstant.java

@@ -16,8 +16,8 @@ public class HgWdSqlConstant {
 		
 		// 根据父节点统计
 		public static final String COUNT_BY_PARENT = "HGWD001.countByParent";
-		// 根据类型统计
-		public static final String COUNT_BY_TYPE = "HGWD001.countByType";
+		// 根据来源统计
+		public static final String COUNT_BY_SOURCE = "HGWD001.countBySource";
 		// 搜索树节点
 		public static final String SEARCH_TREE_NODE = "HGWD001.searchTreeNode";
 		// 修改项目

src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java

@@ -35,7 +35,7 @@ public class HGWD001 extends DaoEPBase {
 	public static final String FIELD_COMPANY_NAME = "companyName";    		/* 公司名称*/
 	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
 	public static final String FIELD_PROJ_NAME = "projName";    		/* 项目名称*/
-	public static final String FIELD_PROJ_TYPE = "projType";    		/* 项目类型*/
+	public static final String FIELD_PROJECT_SOURCE = "projectSource";    		/* 项目来源*/
 	public static final String FIELD_LEAF_LEVEL = "leafLevel";    		/* 节点层级*/
 	public static final String FIELD_PARENT_ID = "parentId";    		/* 父级ID*/
 	public static final String FIELD_FILE_ID = "fileId";    		/* 文件ID*/
@@ -60,7 +60,7 @@ public class HGWD001 extends DaoEPBase {
 	public static final String COL_COMPANY_NAME = "COMPANY_NAME";    		/* 公司名称*/
 	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
 	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
-	public static final String COL_PROJ_TYPE = "PROJ_TYPE";    		/* 项目类型*/
+	public static final String COL_PROJECT_SOURCE = "PROJECT_SOURCE";    		/* 项目来源*/
 	public static final String COL_PARENT_ID = "PARENT_ID";    		/* 节点层级*/
 	public static final String COL_LEAF_LEVEL = "LEAF_LEVEL";    		/* 父级ID*/
 	public static final String COL_FILE_ID = "FILE_ID";    		/* 文件ID*/
@@ -92,7 +92,7 @@ public class HGWD001 extends DaoEPBase {
 	private String companyName = " ";		/* 公司名称*/
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
-	private String projType = " ";		/* 项目类型*/
+	private String projectSource = " ";		/* 项目来源*/
 	private Integer leafLevel = new Integer(0);
 	private String parentId = " ";
 	private String fileId = " ";		/* 文件ID*/
@@ -166,8 +166,8 @@ public class HGWD001 extends DaoEPBase {
 		eiColumn.setDescName("项目名称");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_PROJ_TYPE);
-		eiColumn.setDescName("项目类型");
+		eiColumn = new EiColumn(FIELD_PROJECT_SOURCE);
+		eiColumn.setDescName("项目来源");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_LEAF_LEVEL);
@@ -441,12 +441,12 @@ public class HGWD001 extends DaoEPBase {
 		this.projName = projName;
 	}
 	
-	public String getProjType() {
-		return projType;
+	public String getProjectSource() {
+		return projectSource;
 	}
 	
-	public void setProjType(String projType) {
-		this.projType = projType;
+	public void setProjectSource(String projectSource) {
+		this.projectSource = projectSource;
 	}
 	
 	/**
@@ -613,7 +613,7 @@ public class HGWD001 extends DaoEPBase {
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
 		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
 		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
-		setProjType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_TYPE)), projType));
+		setProjectSource(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJECT_SOURCE)), projectSource));
 		setLeafLevel(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_LEAF_LEVEL)), leafLevel));
 		setParentId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
 		setFileId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_ID)), fileId));
@@ -646,7 +646,7 @@ public class HGWD001 extends DaoEPBase {
 		map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
 		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
 		map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
-		map.put(FIELD_PROJ_TYPE, StringUtils.toString(projType, eiMetadata.getMeta(FIELD_PROJ_TYPE)));
+		map.put(FIELD_PROJECT_SOURCE, StringUtils.toString(projectSource, eiMetadata.getMeta(FIELD_PROJECT_SOURCE)));
 		map.put(FIELD_LEAF_LEVEL, StringUtils.toString(leafLevel, eiMetadata.getMeta(FIELD_LEAF_LEVEL)));
 		map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID)));
 		map.put(FIELD_FILE_ID, StringUtils.toString(fileId, eiMetadata.getMeta(FIELD_FILE_ID)));

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001.java

@@ -394,10 +394,6 @@ public class ServiceHGWD001 extends ServiceEPBase {
 			if (!HgWdUtils.HgWd009.isManager(userId)) {
 				queryRow.put(User.FIELD_USER_ID, userId);
 			}
-			EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
-			block.addRow(queryRow);
-			inInfo.setBlock(block);
-			
 			return super.query(inInfo, HGWD001.QUERY, new HGWD001(), false, new HGWD001().eiMetadata, "inqu_status1",
 					"result1", "result1", null);
 		} catch (Exception e) {
@@ -461,9 +457,6 @@ public class ServiceHGWD001 extends ServiceEPBase {
 			if (!HgWdUtils.HgWd009.isManager(userId)) {
 				queryRow.put(User.FIELD_USER_ID, userId);
 			}
-			EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
-			block.addRow(queryRow);
-			inInfo.setBlock(block);
 			return super.query(inInfo, HGWD001.QUERY, new HGWD001(), false, new HGWD001().eiMetadata, "inqu_status2",
 					"result2", "result2", null);
 		} catch (Exception e) {

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java

@@ -5,7 +5,7 @@ import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.core.tools.CodeValueTools;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
-import com.baosight.hggp.hg.sc.enums.ProjectTypeEnum;
+import com.baosight.hggp.hg.sc.enums.ProjectSourceEnum;
 import com.baosight.hggp.hg.wd.constant.HgWdConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.tools.HGWDTools;
@@ -217,7 +217,7 @@ public class ServiceHGWD001D extends TreeService {
 			String ename = MapUtils.getString(queryMap, CommonConstant.Field.ENAME);
 			if (CommonConstant.Field.ROOT.equals(node) || CommonConstant.Field.ROOT2.equals(node)) {
 				inInfo.addBlock(node).setRows(queryTopNode(node));
-			} else if (ProjectTypeEnum.contains(node)) {
+			} else if (ProjectSourceEnum.contains(node)) {
 				inInfo.addBlock(node).setRows(queryFirstNode(node, ename));
 			} else {
 				inInfo.addBlock(node).setRows(queryChildNode(node, ename));
@@ -263,7 +263,7 @@ public class ServiceHGWD001D extends TreeService {
 		List<Map> results = new ArrayList();
 		Map queryMap = new HashMap<>();
 		queryMap.put("ename", ename);
-		queryMap.put("projType", parentId);
+		queryMap.put("projectSource", parentId);
 		// 非管理员仅查询自己有权限的项目
 		String userId = UserSessionUtils.getLoginName();
 		if (!HgWdUtils.HgWd009.isManager(userId)) {
@@ -330,7 +330,7 @@ public class ServiceHGWD001D extends TreeService {
 		List<String> labels = ObjectUtils.listKey(nodes, "label");
 		Map<String, Integer> resultMap = null;
 		if (isType) {
-			resultMap = HGWDTools.HgWd001.countByType(labels);
+			resultMap = HGWDTools.HgWd001.countBySource(labels);
 		} else {
 			resultMap = HGWDTools.HgWd001.countByParent(labels);
 		}

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001E.java

@@ -163,7 +163,7 @@ public class ServiceHGWD001E extends ServiceEPBase {
 		HGSC001 dbSc001 = HGSCTools.Hgsc001.queryByCode(fWd001.getProjCode());
 		AssertUtils.isNull(dbSc001, String.format("项目【%s】不存在", fWd001.getProjCode()));
 		fWd001.setProjName(dbSc001.getProjName());
-		fWd001.setProjType(dbSc001.getProjType());
+		fWd001.setProjectSource(dbSc001.getProjectSource());
 	}
  
 }

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml

@@ -17,7 +17,7 @@
         COMPANY_NAME as "companyName",  <!-- 公司名称 -->
         PROJ_CODE as "projCode",  <!-- 项目编码 -->
         PROJ_NAME as "projName",  <!-- 项目名称 -->
-        PROJ_TYPE as "projType",  <!-- 项目类型 -->
+        PROJECT_SOURCE as "projectSource",  <!-- 项目来源 -->
         LEAF_LEVEL as "leafLevel", <!--节点层级-->
         PARENT_ID as "parentId",   <!--父级ID-->
         FILE_ID as "fileId",  <!-- 文件ID -->
@@ -158,14 +158,14 @@
     </select>
 
     <!-- 更具父级节点统计 -->
-    <select id="countByType" resultClass="java.util.HashMap">
-        SELECT B.PROJ_TYPE, COUNT(1) AS CNT
+    <select id="countBySource" resultClass="java.util.HashMap">
+        SELECT B.PROJECT_SOURCE, COUNT(1) AS CNT
         FROM ${hggpSchema}.HGWD001 A, ${hggpSchema}.HGSC001 B
         WHERE 1=1
         AND A.PROJ_CODE = B.PROJ_CODE
         AND A.DELETE_FLAG = 0
-        AND B.PROJ_TYPE IN <iterate close=")" open="(" conjunction="," property="projTypes">#projTypes[]#</iterate>
-        GROUP BY B.PROJ_TYPE
+        AND B.PROJECT_SOURCE IN <iterate close=")" open="(" conjunction="," property="projectSources">#projectSources[]#</iterate>
+        GROUP BY B.PROJECT_SOURCE
     </select>
 
     <!-- 搜索树节点 -->
@@ -206,7 +206,7 @@
         COMPANY_NAME,  <!-- 公司名称 -->
         PROJ_CODE,  <!-- 项目编码 -->
         PROJ_NAME,  <!-- 项目名称 -->
-        PROJ_TYPE,  <!-- 项目类型 -->
+        PROJECT_SOURCE,  <!-- 项目来源 -->
         LEAF_LEVEL, <!--节点层级-->
         PARENT_ID,   <!--父级ID-->
         FILE_ID,  <!-- 文件ID -->
@@ -218,7 +218,7 @@
         RELEASE_DATE
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
-        #deleteFlag#, #companyCode#, #companyName#, #projCode#, #projName#, #projType#,
+        #deleteFlag#, #companyCode#, #companyName#, #projCode#, #projName#, #projectSource#,
         #leafLevel#, #parentId#, #fileId#, #fileType#, #fileName#,
         #docVersion#, #status#, #remark#, #releaseDate#
         <selectKey resultClass="long" keyProperty="id">
@@ -271,7 +271,7 @@
         COMPANY_NAME as "companyName",  <!-- 公司名称 -->
         PROJ_CODE as "projCode",  <!-- 项目编码 -->
         PROJ_NAME as "projName",  <!-- 项目名称 -->
-        PROJ_TYPE as "projType",  <!-- 项目类型 -->
+        PROJECT_SOURCE as "projectSource",  <!-- 项目来源 -->
         LEAF_LEVEL as "leafLevel", <!--节点层级-->
         PARENT_ID as "pId",   <!--父级ID-->
         FILE_ID as "fileId",  <!-- 文件ID -->
@@ -365,7 +365,7 @@
         UPDATE ${hggpSchema}.HGWD001
         SET
         PROJ_NAME = #projName#,
-        PROJ_TYPE = #projType#,
+        PROJECT_SOURCE = #projectSource#,
         <include refid="SqlBase.updateRevise"/>
         WHERE PROJ_CODE = #projCode#
     </update>

src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java

@@ -123,18 +123,18 @@ public class HGWDTools {
 		/**
 		 * 根据类型统计
 		 *
-		 * @param projTypes
+		 * @param projectSources
 		 * @return
 		 */
-		public static Map<String, Integer> countByType(List<String> projTypes) {
-			AssertUtils.isEmpty(projTypes, "项目类型不能为空");
+		public static Map<String, Integer> countBySource(List<String> projectSources) {
+			AssertUtils.isEmpty(projectSources, "项目来源不能为空");
 			Map queryMap = new HashMap();
-			queryMap.put("projTypes", projTypes);
-			List<Map> results = DaoBase.getInstance().query(HgWdSqlConstant.HgWd001.COUNT_BY_TYPE, queryMap);
+			queryMap.put("projectSources", projectSources);
+			List<Map> results = DaoBase.getInstance().query(HgWdSqlConstant.HgWd001.COUNT_BY_SOURCE, queryMap);
 			if (CollectionUtils.isEmpty(results)) {
 				return null;
 			}
-			return results.stream().collect(Collectors.toMap(item -> MapUtils.getString(item, HGWD001.COL_PROJ_TYPE),
+			return results.stream().collect(Collectors.toMap(item -> MapUtils.getString(item, HGWD001.COL_PROJECT_SOURCE),
 					item -> MapUtils.getInteger(item, "CNT")));
 		}
 		

src/main/webapp/HG/SC/HGSC101.jsp

@@ -8,6 +8,10 @@
 		<div class="row">
 			<EF:EFInput ename="inqu_status-0-contractNo" cname="合同号" placeholder="模糊查询" colWidth="3"/>
 			<EF:EFInput ename="inqu_status-0-projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
+			<EF:EFSelect ename="projectSource" cname="项目来源" blockId="inqu_status" row="0" colWidth="3"
+			             optionLabel="全部">
+				<EF:EFCodeOption codeName="app.sc.projectSource"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -19,8 +23,8 @@
 			<EF:EFColumn ename="projCode" cname="项目编码" enable="false" width="120" align="left"/>
 			<EF:EFColumn ename="contractNo" cname="合同号" enable="false" width="120" align="left"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="220" align="left"/>
-			<EF:EFComboColumn ename="projType" cname="项目类型" enable="false" width="100" align="center">
-				<EF:EFCodeOption codeName="app.sc.projType"/>
+			<EF:EFComboColumn ename="projectSource" cname="项目来源" enable="false" width="100" align="center">
+				<EF:EFCodeOption codeName="app.sc.projectSource"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

src/main/webapp/HG/SC/HGSC101A.js

@@ -56,9 +56,9 @@ let checkParams = function () {
 	if (isBlank(projName)) {
 		return "项目名称不能为空";
 	}
-	let projType = $("#result-0-projType").val();
-	if (isBlank(projType)) {
-		return "项目类型不能为空";
+	let projectSource = $("#result-0-projectSource").val();
+	if (isBlank(projectSource)) {
+		return "项目来源不能为空";
 	}
 	/*let companyCode = $("#result-0-companyCode").val();
 	if (isBlank(companyCode)) {

src/main/webapp/HG/SC/HGSC101A.jsp

@@ -24,10 +24,10 @@
 			            ratio="2:10" maxLength="200"/>
 		</div>
 		<div class="row">
-			<EF:EFSelect cname="项目类型" blockId="result" ename="projType" row="0" colWidth="6" ratio="2:10"
+			<EF:EFSelect cname="项目来源" blockId="result" ename="projectSource" row="0" colWidth="6" ratio="2:10"
 			             filter="contains">
 				<EF:EFOption label="请选择" value=""/>
-				<EF:EFCodeOption codeName="app.sc.projType"/>
+				<EF:EFCodeOption codeName="app.sc.projectSource"/>
 			</EF:EFSelect>
 		</div>
 		<br/>

src/main/webapp/HG/WD/HGWD002.jsp

@@ -78,7 +78,7 @@
 		<span id="descSpan" style="font-weight: bold;font-size: 18px">文件预览区域...</span>
 	</div>
 	<%-- 文本预览 --%>
-	<div id="textContainer" class="left-flex">
+	<div id="textContainer" class="left-flex" style="display: none;">
 		<pre id="textSpan" class="textSpan"></pre>
 	</div>
 	<%-- docx文件预览--%>

src/main/webapp/HG/WD/HGWD002A.jsp

@@ -29,7 +29,7 @@
 					<span id="descSpan" style="font-weight: bold;font-size: 18px">文件预览区域...</span>
 				</div>
 				<%-- 文本预览 --%>
-				<div id="textContainer" class="left-flex">
+				<div id="textContainer" class="left-flex" style="display: none;">
 					<pre id="textSpan" class="textSpan"></pre>
 				</div>
 				<%-- docx文件预览--%>