阀控记录导出

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayControlRecordController.java

@@ -128,7 +128,7 @@ public class PayControlRecordController {
     }
 
     @GetMapping("/findPageByMeterCode")
-    @ApiOperation(value="查询阀控记录,分页",notes="查询阀控记录,分页")
+    @ApiOperation(value="查询阀控记录(单表),分页",notes="查询阀控记录(单表),分页")
     public AjaxMessage<Pagination<PayControlRecordDto>> findPageByMeterCode(
             @ApiParam(value = "水表电子号，水表档案号", required = false) @RequestParam(required = false) String meterCode,
             @ApiParam(value = "开始时间yyyyMMdd", required = true) @RequestParam(required = false) String beginTime,
@@ -212,7 +212,7 @@ public class PayControlRecordController {
     @GetMapping("/exportExcel2")
     @ApiOperation(value="导出阀控记录(单表)",notes="导出阀控记录(单表)")
     public void exportExcel2(
-            @ApiParam(value = "水表电子号，水表档案号", required = false) @RequestParam(required = false) String meterCode,
+            @ApiParam(value = "水表档案号", required = false) @RequestParam(required = false) String meterCode,
             @ApiParam(value = "阀控规则", required = false) @RequestParam(required = false) String controlRuleId,
             @ApiParam(value = "操作类型 0关阀 1开阀", required = false) @RequestParam(required = false) String type,
             @ApiParam(value = "操作结果 0执行中 1成功 2失败", required = false) @RequestParam(required = false) String result,

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayControlRecordServiceImpl.java

@@ -119,7 +119,7 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
                     }
                 }
             }
-            objs[4] = payControlRecordDto1.getState() != null ? payControlRecordDto1.getDeviceStatus() : ""; //设备状态
+            objs[4] = temp; //设备状态
             objs[5] = payControlRecordDto1.getLocDesc() != null ? payControlRecordDto1.getLocDesc() : "";//安装地址
             objs[6] = payControlRecordDto1.getControlRuleIdName() != null ? payControlRecordDto1.getControlRuleIdName() : "";//操作原因
 
@@ -205,7 +205,7 @@ public class PayControlRecordServiceImpl implements PayControlRecordService {
         List<PayControlRecordDto> payControlRecordList = payControlRecordMapper.findList(payControlRecordDto,
                 new BigInteger(loginUser.getSiteId().toString()),new BigInteger(loginUser.getCustomerId().toString()));
 
-        String title = "阀控记录列表";
+        String title = "阀控记录列表(单表)";
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String[] rowsName = new String[]{"序号","操作原因","操作类型","操作结果","阀门状态","操作时间","处理时间"};