meterType

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/BaseInfo.java

@@ -16,32 +16,33 @@ public class BaseInfo  implements  DataModel{
     public static final String ID="20100000000";
     public static final String TBN="BSI";
     public static final String TBN_CH="合同信息";
+    static final String UNKNOWN="未设置";
     /**项目名称*/
     @JSONField(name = "key_1",label="项目名称",ordinal = 1)
     private String projectName;
     /**合同段名称*/
     @JSONField(name = "key_2",label="合同段名称",ordinal = 2)
-    private String contractName;
+    private String contractName=UNKNOWN;
     /**
      * 合同段编号
      */
     @JSONField(name = "key_3",label="合同段编号",ordinal = 3)
-    private String contractNumber;
+    private String contractNumber=UNKNOWN;
     /**
      * 业主单位名称
      */
     @JSONField(name = "key_4",label="业主单位名称",ordinal = 4)
-    private String contractorUnitName;
+    private String contractorUnitName=UNKNOWN;
     /**
      * 施工单位名称
      */
     @JSONField(name = "key_5",label="施工单位名称",ordinal = 5)
-    private String constructionUnitName;
+    private String constructionUnitName=UNKNOWN;
     /**
      * 监理单位名称
      */
     @JSONField(name = "key_6",label="监理单位名称",ordinal = 6)
-    private String supervisionUnitName;
+    private String supervisionUnitName=UNKNOWN;
     /**合同段金额*/
     @JSONField(name = "key_7",label="合同段金额",ordinal = 7)
     private BigDecimal contractAmount;
@@ -50,16 +51,16 @@ public class BaseInfo  implements  DataModel{
     private BigDecimal dyTotalAmount;
     /**农工资帐号名称*/
     @JSONField(name = "key_8",label="农工资帐号名称",ordinal = 8)
-    private String  laborerAccountName  ="未设置";
+    private String  laborerAccountName  =UNKNOWN;
     /**农工资开户行名称*/
     @JSONField(name = "key_9",label="农工资开户行名称",ordinal = 9)
-    private String  laborerBankName ="未设置";
+    private String  laborerBankName =UNKNOWN;
     /**农工资专户帐号*/
     @JSONField(name = "key_13",label="农工资专户帐号",ordinal = 9)
-    private String  laborerAccount ="未设置";
+    private String  laborerAccount =UNKNOWN;
     /**工程款银行账户名称*/
     @JSONField(name = "key_14",label="工程款银行账户名称",ordinal = 10)
-    private String  bankAccountName = "未设置";
+    private String  bankAccountName = UNKNOWN;
     /**工程款开户行名称*/
     @JSONField(name = "key_15",label="工程款开户行名称",ordinal = 10)
     private String  bankName = "未设置";

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/MeterType.java

@@ -23,7 +23,7 @@ public enum MeterType {
     }
     public static MeterType getByIndex(int index,int contractType) {
         MeterType[] values = MeterType.values();
-        if(contractType==2){
+        if(contractType==2&&index==0){
             index=3;
         }
         if (index >= 0 && index < values.length) {