Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW004.java

@@ -85,7 +85,7 @@ public class HGCW004 extends DaoEPBase {
     private String companyName = " ";		/* 公司名称*/
     private String projName = " ";		/* 项目名称*/
     private String projCode = " ";		/* 项目编号*/
-    private BigDecimal contractNumber = new BigDecimal("0");		/* 主合同号*/
+    private String contractNumber = " ";		/* 主合同号*/
     private String contractName = " ";		/* 主合同名称*/
     private String signingDate = " ";		/* 签订日期*/
     private String partyA = " ";		/* 甲方公司名称*/
@@ -134,9 +134,6 @@ public class HGCW004 extends DaoEPBase {
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn(FIELD_CONTRACT_NUMBER);
-        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
-        eiColumn.setFieldLength(15);
         eiColumn.setDescName("主合同号");
         eiMetadata.addMeta(eiColumn);
 
@@ -313,7 +310,7 @@ public class HGCW004 extends DaoEPBase {
      * get the contractNumber - 主合同号.
      * @return the contractNumber
      */
-    public BigDecimal getContractNumber() {
+    public String getContractNumber() {
         return this.contractNumber;
     }
 
@@ -322,7 +319,7 @@ public class HGCW004 extends DaoEPBase {
      *
      * @param contractNumber - 主合同号
      */
-    public void setContractNumber(BigDecimal contractNumber) {
+    public void setContractNumber(String contractNumber) {
         this.contractNumber = contractNumber;
     }
     /**
@@ -579,7 +576,7 @@ public class HGCW004 extends DaoEPBase {
         setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
         setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
         setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
-        setContractNumber(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
+        setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
         setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
         setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
         setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW005.java

@@ -83,7 +83,7 @@ public class HGCW005 extends DaoEPBase {
     private String companyName = " ";		/* 公司名称*/
     private String projName = " ";		/* 项目名称*/
     private String projCode = " ";		/* 项目编号*/
-    private BigDecimal contractNumber = new BigDecimal("0");		/* 主合同号*/
+    private String contractNumber = " ";		/* 主合同号*/
     private String contractName = " ";		/* 主合同名称*/
     private String signingDate = " ";		/* 扣款日期*/
     private String partyA = " ";		/* 甲方公司名称*/
@@ -131,9 +131,6 @@ public class HGCW005 extends DaoEPBase {
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn(FIELD_CONTRACT_NUMBER);
-        eiColumn.setType("N");
-        eiColumn.setScaleLength(3);
-        eiColumn.setFieldLength(15);
         eiColumn.setDescName("主合同号");
         eiMetadata.addMeta(eiColumn);
 
@@ -306,7 +303,7 @@ public class HGCW005 extends DaoEPBase {
      * get the contractNumber - 主合同号.
      * @return the contractNumber
      */
-    public BigDecimal getContractNumber() {
+    public String getContractNumber() {
         return this.contractNumber;
     }
 
@@ -315,7 +312,7 @@ public class HGCW005 extends DaoEPBase {
      *
      * @param contractNumber - 主合同号
      */
-    public void setContractNumber(BigDecimal contractNumber) {
+    public void setContractNumber(String contractNumber) {
         this.contractNumber = contractNumber;
     }
     /**
@@ -556,7 +553,7 @@ public class HGCW005 extends DaoEPBase {
         setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
         setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
         setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
-        setContractNumber(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
+        setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
         setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
         setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
         setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));