|
@@ -1,6 +1,7 @@
|
|
|
package cn.fastfun.service.entity;
|
|
|
|
|
|
|
|
|
+import cn.fastfun.service.ProductService;
|
|
|
import cn.fastfun.util.ObjectUtil;
|
|
|
import com.bridge.entity.DateEntity;
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
@@ -10,9 +11,11 @@ import lombok.NoArgsConstructor;
|
|
|
import lombok.Setter;
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import javax.persistence.Column;
|
|
|
import javax.persistence.Entity;
|
|
|
import javax.persistence.Table;
|
|
|
+import javax.persistence.Transient;
|
|
|
import java.util.Date;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -62,20 +65,28 @@ public class AppDevice extends DateEntity {
|
|
|
setSn(ObjectUtil.obj2String(param.get("sn")));
|
|
|
setImei(ObjectUtil.obj2String(param.get("imei")));
|
|
|
setDeliverTime(ObjectUtil.obj2Date(param.get("deliverTime")));
|
|
|
+ setReceivedPlace(ObjectUtil.obj2String(param.get("receivedPlace")));
|
|
|
setStatus(1);
|
|
|
}
|
|
|
|
|
|
+ @Transient
|
|
|
+ private String inStorage;
|
|
|
+
|
|
|
+ // 类型
|
|
|
public String getType() {
|
|
|
return sn.substring(0, 1);
|
|
|
}
|
|
|
|
|
|
- public String getPack(){
|
|
|
+ public String getPack() {
|
|
|
return sn.substring(1, 3);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// 显示名称
|
|
|
- private String typeTitle;
|
|
|
+ private String typeTitle = "";
|
|
|
+
|
|
|
+ private String packTitle = "";
|
|
|
+
|
|
|
+ private String specTitle = "";
|
|
|
|
|
|
- private String packTitle;
|
|
|
+ private String expandTitle = "";
|
|
|
}
|