|
@@ -3,6 +3,7 @@ package com.fdkankan.manage.vo.response;
|
|
|
import com.alibaba.excel.annotation.ExcelIgnore;
|
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
import lombok.Data;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
@@ -149,9 +150,12 @@ public class DownOrderVo {
|
|
|
}
|
|
|
|
|
|
public String getDownTypeStr() {
|
|
|
- if(downType == null){
|
|
|
+ if(downType == null && StringUtils.isBlank(downTypeStr)){
|
|
|
return "";
|
|
|
}
|
|
|
+ if(downType == null ){
|
|
|
+ return downTypeStr;
|
|
|
+ }
|
|
|
switch (downType){
|
|
|
case 0 : return "四维看看";
|
|
|
case 1 : return "四维深时";
|