履职登记NFC保存、显示问题

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRegister/ResumptionNfcVo.java

@@ -18,14 +18,21 @@ public class ResumptionNfcVo {
     private Long checkId;
     private String checkName;
     private String nfccdoe;
-    private int status = 0;
+    /**
+     * 是否已扫描。0未扫1已扫
+     */
+    private Integer status;
+    /**
+     * 是否必须扫描。1扫描，0不扫描
+     */
+    private Integer mustScan;
+
     @JsonSerialize(using = ToStringSerializer.class)
     private Long pointId;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long areaId;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long nfcid;
-    private Long nfcScanStatus;
     private Long scanMethod;
     private String img;
 

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppResumptionDataNfcMapper.xml

@@ -53,7 +53,8 @@
         d.id AS pointId,
         a.area_id AS areaId,
         a.id AS nfcid,
-        dnf.STATUS as nfcScanStatus,
+        e.point_scan as mustScan,
+        if(dnf.STATUS is null,0,dnf.STATUS) as status,
         dnf.scan_method,
         dnf.img
         FROM