submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderGoodsListVo.java

@@ -79,29 +79,30 @@ public class TopOldOrderGoodsListVo {
 	private Long signId;
 
 	public String getCheckStatusStr() {
+		String str = "";
 		if (ObjectUtil.isNull(this.checkStatus)){
-			return "";
+			return str;
 		}
 		switch (this.checkStatus){
 			case 0:
-				this.checkStatusStr = "待审核";
+				str = "待审核";
 				break;
 			case 1:
-				this.checkStatusStr = "已通过";
+				str = "已通过";
 				break;
 			case 2:
-				this.checkStatusStr = "未通过";
+				str = "未通过";
 				break;
 			case 3:
-				this.checkStatusStr = "已撤销";
+				str = "已撤销";
 				break;
 			case -1:
-				this.checkStatusStr = "已更换新的学员";
+				str = "已更换新的学员";
 				break;
 			default :
 				break;
 		}
-		return checkStatusStr;
+		return str;
 	}
 
 	@Excel(name = "开通状态")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -5,9 +5,11 @@ import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -120,15 +122,15 @@ public class TopOldOrderVo {
 	@ApiModelProperty("退款（元）")
 	private BigDecimal orderRefund;
 	/** 已退（元） */
-	@Excel(name = "退款" , readConverterExp = "元=")
+	@Excel(name = "退款")
 	@ApiModelProperty("已退（元）")
 	private BigDecimal orderRefunded;
 	/** 未收账款（元） */
-	@Excel(name = "未收" , readConverterExp = "元=")
+	@Excel(name = "未收")
 	@ApiModelProperty("未收账款（元）")
 	private BigDecimal orderUncollected;
 	/** 实收账款（元） */
-	@Excel(name = "已收" , readConverterExp = "元=")
+	@Excel(name = "已收")
 	@ApiModelProperty("已收账款（元）")
 	private BigDecimal orderReceived;
 
@@ -142,6 +144,14 @@ public class TopOldOrderVo {
 	@Excel(name = "财务备注")
 	@ApiModelProperty("财务备注")
 	private String financeRemark;
+
+	public String getOrderBusiness() {
+		if (CollectionUtils.isEmpty(this.businessNames)){
+			return "";
+		}
+		return this.businessNames.stream().collect(Collectors.joining(","));
+	}
+
 	/** 业务分类 */
 	@Excel(name = "业务类型")
 	@ApiModelProperty("业务分类")