Bläddra i källkod

安全检查nfc扫描记录字段完善

jiawuxian 1 år sedan
förälder
incheckning
e36971f008

+ 6 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/CheckNfcRecord.java

@@ -13,6 +13,12 @@ public class CheckNfcRecord {
     @ApiModelProperty("采集点名称")
     private String collectionAreaName;
 
+    @ApiModelProperty("标签名称")
+    private String nfcName;
+
+    @ApiModelProperty("nfc编号")
+    private String nfcCode;
+
     @ApiModelProperty("执行人")
     private String executor;
 

+ 7 - 1
soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -757,7 +757,13 @@
         group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.count
     </select>
     <select id="selectNfcRecord" resultType="com.xunmei.core.safetyCheck.vo.CheckNfcRecord">
-        select t.scan_method, n.area_name, n.collection_area_name, t.img, t.submit_time as execute_time
+        select t.scan_method,
+               n.area_name,
+               n.collection_area_name,
+               n.code as nfc_code,
+               n.label_name as nfc_name,
+               t.img,
+               t.submit_time as execute_time
         from core_safety_task_data_nfc t
                  left join sys_nfc_bind n on n.id = t.nfc_id
         where t.task_id = #{taskId}