提交回收员

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeviceMapper.xml

@@ -12,6 +12,6 @@
         nx_recycle_device a
         ${ew.customSqlSegment}
         and
-  a.id not in (SELECT device_code from nx_recycle_staff_device where f_delete_mark is null)
+  a.id not in (SELECT device_id from nx_recycle_staff_device where f_delete_mark is null)
     </select>
 </mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleStaffDeviceEntity.java

@@ -52,5 +52,8 @@ public class RecycleStaffDeviceEntity  {
     @TableField(value = "address" )
     private String address;
     @TableField("DEVICE_NAME")
-    private String device_name;
+    private String deviceName;
+
+    @TableField("DEVICE_ID")
+    private String deviceId;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclestationstaff/RecycleStaffDeviceModel.java

@@ -1,5 +1,6 @@
 package jnpf.model.recyclestationstaff;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -34,4 +35,7 @@ public class RecycleStaffDeviceModel  {
     @JSONField(name = "address")
     private String address;
 
+    @JSONField(name = "deviceId ")
+    private String deviceId;
+
 }

jnpf-java-boot/jnpf-web/src/views/recyclestationstaff/form.vue

@@ -126,14 +126,14 @@
                       </JnpfPopupSelect>
                     </template>
                   </el-table-column> -->
-                  <el-table-column label="设备名称" prop="deviceName">
+                  <el-table-column label="设备名称" prop="deviceCode">
                     <template slot="header" v-if="false">
                       <span class="required-sign">*</span>设备名称
                     </template>
 
                     <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.deviceName"
-                        @change="changeData('recyclestaffdevice-deviceName', scope.$index)" placeholder="请输入"
+                      <JnpfInput v-model="scope.row.deviceCode"
+                        @change="changeData('recyclestaffdevice-deviceCode', scope.$index)" placeholder="请输入"
                         clearable :style='{ "width": "100%" }'>
                       </JnpfInput>
                     </template>
@@ -318,7 +318,8 @@ export default {
       for (let i = 0; i < list.length; i++) {
         const e = list[i];
         let item = {
-          deviceCode: e.id,
+          deviceId: e.id,
+          deviceCode: e.deviceCode,
           deviceName: e.deviceName,
           address: e.address,
           // hasSchedule: e.hasSchedule,