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

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT002.java

@@ -331,7 +331,7 @@ public class ServiceHPMT002 extends ServiceBase {
                     int num = 0;
                     while (num < docIds.length) {
                         HPZL001A HPZL001A = new HPZL001A();
-                        HPZL001A.setDeptCode(CommonConstant.YesNo.YES);
+                        HPZL001A.setDepCode(CommonConstant.YesNo.YES);
                         HPZL001A.setDocType(CommonConstant.YesNo.YES_1);
                         HPZL001A.setBizType("XJ_WC");
                         HPZL001A.setDocId(docIds[num]);
@@ -381,7 +381,7 @@ public class ServiceHPMT002 extends ServiceBase {
                 int num = 0;
                 while (num < docIds.length) {
                     HPZL001A HPZL001A = new HPZL001A();
-                    HPZL001A.setDeptCode(CommonConstant.YesNo.YES);
+                    HPZL001A.setDepCode(CommonConstant.YesNo.YES);
                     HPZL001A.setDocType(2);
                     HPZL001A.setBizType("XJ_CL");
                     HPZL001A.setDocId(docIds[num]);

src/main/java/com/baosight/hpjx/hp/zl/domain/HPZL001A.java

@@ -24,7 +24,7 @@ public class HPZL001A extends DaoEPBase {
 
 	public static final String FIELD_ID = "id";    		/* 主键ID*/
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
-	public static final String FIELD_DEPT_CODE = "deptCode";    		/* 部门编码 预留*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码 预留*/
 	public static final String FIELD_DOC_TYPE = "docType";    		/* 附件类型*/
 	public static final String FIELD_CHECK_ID = "checkId";    		/* 质量巡检单ID*/
 	public static final String FIELD_DOC_ID = "docId";    		/* 文件ID*/
@@ -60,7 +60,7 @@ public class HPZL001A extends DaoEPBase {
 
 	private Long id;	/* 主键ID*/
 	private String companyCode = " ";		/* 企业编码 预留*/
-	private String deptCode = " ";		/* 部门编码 预留*/
+	private String depCode = " ";		/* 部门编码 预留*/
 	private Integer docType;	/* 附件类型*/
 	private Long checkId;	/* 质量巡检单ID*/
 	private String docId = " ";		/* 文件ID*/
@@ -88,7 +88,7 @@ public class HPZL001A extends DaoEPBase {
 		eiColumn.setDescName("企业编码 预留");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_DEPT_CODE);
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
 		eiColumn.setDescName("部门编码 预留");
 		eiMetadata.addMeta(eiColumn);
 
@@ -179,20 +179,20 @@ public class HPZL001A extends DaoEPBase {
 		this.companyCode = companyCode;
 	}
 	/**
-	 * get the deptCode - 部门编码 预留.
-	 * @return the deptCode
+	 * get the depCode - 部门编码 预留.
+	 * @return the depCode
 	 */
-	public String getDeptCode() {
-		return this.deptCode;
+	public String getDepCode() {
+		return this.depCode;
 	}
 
 	/**
-	 * set the deptCode - 部门编码 预留.
+	 * set the depCode - 部门编码 预留.
 	 *
-	 * @param deptCode - 部门编码 预留
+	 * @param depCode - 部门编码 预留
 	 */
-	public void setDeptCode(String deptCode) {
-		this.deptCode = deptCode;
+	public void setDepCode(String depCode) {
+		this.depCode = depCode;
 	}
 	/**
 	 * get the docType - 附件类型.
@@ -380,7 +380,7 @@ public class HPZL001A extends DaoEPBase {
 
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
-		setDeptCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPT_CODE)), deptCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		setDocType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DOC_TYPE)), docType));
 		setCheckId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_CHECK_ID)), checkId));
 		setDocId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_ID)), docId));
@@ -403,7 +403,7 @@ public class HPZL001A extends DaoEPBase {
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
-		map.put(FIELD_DEPT_CODE, StringUtils.toString(deptCode, eiMetadata.getMeta(FIELD_DEPT_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		map.put(FIELD_DOC_TYPE, StringUtils.toString(docType, eiMetadata.getMeta(FIELD_DOC_TYPE)));
 		map.put(FIELD_CHECK_ID, StringUtils.toString(checkId, eiMetadata.getMeta(FIELD_CHECK_ID)));
 		map.put(FIELD_DOC_ID, StringUtils.toString(docId, eiMetadata.getMeta(FIELD_DOC_ID)));