kangwei:

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.context.BaseContextHandler;
+import com.skua.core.query.QueryGenerator;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -109,6 +110,28 @@ public class EquipmentController {
     @Autowired
     @Autowired
     private Key2ValueService key2ValueService;
     private Key2ValueService key2ValueService;
 
 
+    @AutoLog(value = "设备台账-所有设备")
+    @ApiOperation(value = "设备台账-所有设备", notes = "设备台账-所有设备")
+    @GetMapping(value = "/allList")
+    public Result<List<EquipmentInfo>> allList(EquipmentInfo equipmentInfo, @RequestParam(name="model", defaultValue="0") Integer model,HttpServletRequest req ) throws Exception {
+
+        Result<List<EquipmentInfo>> result = new Result<List<EquipmentInfo>>();
+        QueryWrapper<EquipmentInfo> queryWrapper = QueryGenerator.initQueryWrapper(equipmentInfo, req.getParameterMap());
+        // queryWrapper.eq("depart_id", BaseContextHandler.getRealDepartId());
+        if(equipmentInfo.getDepartId()==null){
+            equipmentInfo.setDepartId(BaseContextHandler.getDeparts());
+        }
+  /*  if(model==1){
+		queryWrapper.isNotNull("is_model");
+		queryWrapper.last(" and is_model != ''");
+	}*/
+        queryWrapper.orderByDesc("create_time");
+        List<EquipmentInfo> dataList = equipmentInfoService.list(queryWrapper);
+        result.setSuccess(true);
+        result.setResult(dataList);
+        return result;
+    }
+
     @CustomExceptionAnno(description = "设备台账-设备排序")
     @CustomExceptionAnno(description = "设备台账-设备排序")
     @AutoLog(value = "设备台账-设备排序")
     @AutoLog(value = "设备台账-设备排序")
     @ApiOperation(value = "设备台账-设备排序", notes = "设备台账-设备排序")
     @ApiOperation(value = "设备台账-设备排序", notes = "设备台账-设备排序")