Эх сурвалжийг харах

检查登记信息补全nfc标签信息

jiawuxian 2 жил өмнө
parent
commit
9176b513e9

+ 10 - 2
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterNfcVo.java

@@ -25,8 +25,16 @@ public class TaskRegisterNfcVo {
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "NFC所属区域id")
     private Long areaId;
-//    @ApiModelProperty(value = "采集点名称")
-//    private String checkName;
+
+    /**
+     * 区域采集点名称
+     */
+    private String nfcName;
+
+    /**
+     * nfc编码
+     */
+    private String nfcCode;
 
     /**
      * 是否已扫描。0未扫1已扫

+ 2 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -682,6 +682,8 @@
                dn.task_data_id                     as taskDataId,
                nfc.id                              as nfcId,
                nfc.area_id                         as areaId,
+               nfc.code                            as nfcCode,
+               nfc.label_name                      as nfcName,
                p.required                          as mustScan,
                if(dn.status is null, 0, dn.status) as status,
                dn.scan_method                      as scanMethod,