From 8c21d4e38b123c783386f814b8c99359cfda2cca Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 12 Dec 2024 09:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/api/controller/ApiController.java | 1 + .../manage/controller/RecordInspectionInfoController.java | 2 +- .../mapper/manage/RecordInspectionInfoMapper.xml | 3 ++- .../manage/record_inspection/record_inspection.html | 8 +++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java index 52bd975..6029194 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java @@ -252,6 +252,7 @@ public class ApiController { RecordInspection recordInspection = new RecordInspection(); recordInspection.setInspectionUser(user); int insertNumber = inspectionService.insertRecordInspection(recordInspection); + apiService.insertCheckTask(Math.toIntExact(recordInspection.getInspectionId()), list); return success("创建成功", insertNumber); diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionInfoController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionInfoController.java index 64923a0..091535a 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionInfoController.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionInfoController.java @@ -49,7 +49,7 @@ public class RecordInspectionInfoController extends BaseController @ResponseBody public TableDataInfo list(RecordInspectionInfo recordInspectionInfo) { - startPage(); + // startPage(); List list = recordInspectionInfoService.selectRecordInspectionInfoList(recordInspectionInfo); return getDataTable(list); } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionInfoMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionInfoMapper.xml index 3d1df74..616bb42 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionInfoMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionInfoMapper.xml @@ -10,10 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select inspection_id, epc_code, location_code, inspection_state, inspection_remark from record_inspection_info + select inspection_id, epc_code, location_code, inspection_state, inspection_remark ,create_time from record_inspection_info