添加操作者

src/main/java/cn/fastfun/controller/api/ApiAppDeviceController.java

@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.data.domain.Page;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -91,7 +92,10 @@ public class ApiAppDeviceController {
     @ApiOperation(value = "分页搜索")
     @RequestMapping(value = "pageQuery", method = RequestMethod.POST)
     public ApiPageDTO pageQuery(@RequestBody DeviceQueryParam param) {
-        return new ApiPageDTO(null, appDeviceService.findByParam(param));
+
+        Page<AppDevice> devicePage = appDeviceService.findByParam(param);
+        devicePage.getContent().forEach(p -> p.setInStorage("未入库"));
+        return new ApiPageDTO(null, devicePage);
     }
 
     @ApiOperation(value = "导入模板下载")

src/main/java/cn/fastfun/service/entity/AppDevice.java

@@ -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 = "";
 }