fix(controller): 积分包结算导出，结算包结算导出-空值判断

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/PackageFinishStatusEnum.java

@@ -15,7 +15,10 @@ public enum PackageFinishStatusEnum {
 	/**
 	 * 已完成
 	 */
-	COMPLETED("1", "已完成");
+	COMPLETED("1", "已完成"),
+
+	STATUS_NULL("", "")
+	;
 
 	private String val;
 
@@ -40,6 +43,6 @@ public enum PackageFinishStatusEnum {
 				return packageFinishStatusEnum;
 			}
 		}
-		return null;
+		return STATUS_NULL;
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/PackageTypeEnum.java

@@ -34,7 +34,10 @@ public enum PackageTypeEnum {
 	/**
 	 * type2结算包（证据链）
 	 */
-	TYPE2_SETTLE_PACKAGE("2", "结算包");
+	TYPE2_SETTLE_PACKAGE("2", "结算包"),
+
+	TYPE_NULL("", "")
+	;
 
 	private String val;
 
@@ -59,6 +62,6 @@ public enum PackageTypeEnum {
 				return packageTypeEnum;
 			}
 		}
-		return null;
+		return TYPE_NULL;
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SettleStatusEnum.java

@@ -17,7 +17,10 @@ public enum SettleStatusEnum {
 	SETTLE_STATUS_SUBMIT("3", "已提交"),
 	SETTLE_STATUS_NO("4", "未结算"),
 	SETTLE_STATUS_PART("5", "部分成功"),
-	SETTLE_STATUS_WAIT("9", "待结算");
+	SETTLE_STATUS_WAIT("9", "待结算"),
+
+	SETTLE_STATUS_NULL("", "");
+	;
 
 	private String val;
 
@@ -34,6 +37,6 @@ public enum SettleStatusEnum {
 				return settleStatusEnum;
 			}
 		}
-		return null;
+		return SETTLE_STATUS_NULL;
 	}
 }