From 75635fab693d31de407d7075f74e7a608e13a87d Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 25 Apr 2024 22:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=87=AA=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/entity/InspectTaskRecord.java | 4 ++ .../xml/InspectTaskItemRecordMapper.xml | 2 +- .../mapper/xml/InspectTaskRecordMapper.xml | 3 ++ .../InspectTaskItemRecordServiceImpl.java | 44 +++++++++++++++---- .../impl/InspectTaskRecordServiceImpl.java | 38 +++++++++++++--- .../QualityInspectionRecordController.java | 7 +++ .../entity/QualityInspectionRecord.java | 12 +++++ .../mapper/QualityInspectionRecordMapper.java | 6 +++ .../xml/QualityInspectionRecordMapper.xml | 25 +++++++++++ .../IQualityInspectionRecordService.java | 6 +++ .../QualityInspectionRecordServiceImpl.java | 15 +++++++ 11 files changed, 146 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/inspection/entity/InspectTaskRecord.java b/src/main/java/com/zhgd/xmgl/modules/inspection/entity/InspectTaskRecord.java index 55faf155d..0e28110ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/inspection/entity/InspectTaskRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/inspection/entity/InspectTaskRecord.java @@ -80,4 +80,8 @@ public class InspectTaskRecord implements Serializable { @ApiModelProperty(value="检查人员userId") private java.lang.String inspectUser ; + /**1:安全;2:质量*/ + @Excel(name = "1:安全;2:质量", width = 15) + @ApiModelProperty(value="1:安全;2:质量") + private java.lang.Integer type ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTaskItemRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTaskItemRecordMapper.xml index e90b553ec..4fde70b60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTaskItemRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTaskItemRecordMapper.xml @@ -4,7 +4,7 @@ + + +