设备查询允许在线查询

zengh

2021-03-30 31cf1ba9219b705ea59dc8a98b6a7b11bd6db002

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -189,12 +189,12 @@
   @GetMapping("/pageDept")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入equipment")
   public R<IPage<EquipmentVO>> pageDept(EquipmentVO equipment, Query query, String pid, HttpServletResponse response) throws ParseException {
   public R<IPage<EquipmentVO>> pageDept(EquipmentVO equipment, Query query, String pid,String dxtype, HttpServletResponse response) throws ParseException {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");

      IPage<EquipmentVO> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid);
      IPage<EquipmentVO> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid,dxtype);

      for (int j = 0; j < page.getRecords().size(); j++) {
         String expireTime = page.getRecords().get(j).getExpireTime();