Browse Source

第二批

lmstack 3 years ago
parent
commit
0d1a5dfae5

+ 1 - 1
src/main/java/com/qx/didi/controller/ShowDataController.java

@@ -306,7 +306,7 @@ public class ShowDataController {
     @PostMapping("/getSn")
     public ApiDTO getSn(@RequestBody QueryParam param) {
         List<String> snList = new ArrayList<>();
-        List<ResultOriginData> resultOriginData = resultOriginDataService.list(new QueryWrapper<ResultOriginData>().eq("type", param.getTableId()));
+        List<ResultOriginData> resultOriginData = resultOriginDataService.list(new QueryWrapper<ResultOriginData>().eq("type", param.getTableId()).eq("batch_num", param.getBatchNum()));
         resultOriginData.forEach(p -> snList.add(p.getDeviceId()));
         return ApiDTO.ok(snList);
     }

+ 2 - 0
src/main/java/com/qx/didi/entity/ResultOriginData.java

@@ -62,5 +62,7 @@ public class ResultOriginData implements Serializable {
 
     private Integer id;
 
+    private Integer batchNum;
+
 
 }

+ 4 - 0
src/main/java/com/qx/didi/param/QueryParam.java

@@ -12,4 +12,8 @@ public class QueryParam {
     @ApiModelProperty(value = "tableId(1:安全类,2:健康类", name = "tableId", required = true)
     private Integer tableId;
 
+
+    @ApiModelProperty(value = "batchNum(1:第一批,2:第二批", name = "batchNum", required = true)
+    private Integer batchNum;
+
 }