装备编辑回显装备证书

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/Table.java

@@ -17,6 +17,9 @@ import java.util.List;
 @Data
 public class Table {
 
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
     @ApiModelProperty(value = "唯一标识符")
     private String identifyCode;
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java

@@ -156,4 +156,9 @@ public class DevInfoVo extends DevInfo {
 
     @ApiModelProperty(value = "订单编码")
     private String orderCode;
+
+    @ApiModelProperty(value = "检修预报警天数")
+    private String maintenanceAlarmDay;
+
+
 }

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java

@@ -131,6 +131,7 @@ public class DevInfoServiceImpl implements DevInfoService {
             MaDevQc qc = maDevQcMapper.getQcListByOne(maId);
             table.setIdentifyCode(devInfoVo.getIdentifyCode());
             table.setCheckMan(qc.getQcUser());
+            table.setId(qc.getId());
             table.setCheckDate(qc.getQcTime());
             table.setNextCheckDate(qc.getNextCheckTime());
             tableList.add(table);

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml

@@ -229,6 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt4.type_name as typeName,
             mt4.unit_name as unitName,
             mt4.manage_type as manageType,
+            mt4.maintenance_alarm_day,
             d.ma_status as maStatus,
             d.brand as brand,
             d.model_name as modelName,

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml

@@ -46,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m1.ma_id AS maId,
         m2.CODE AS deviceCode,
         m2.device_name AS deviceName,
-        m1.qc_name AS qcName,
         m1.qc_code AS qcCode,
         m1.qc_user AS qcUser,
         m1.qc_time AS qcTime,
@@ -124,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getQcListByOne" resultType="com.bonus.material.device.domain.MaDevQc">
         SELECT
+            id,
             mdc.qc_time,
             mt.maintenance_alarm_day,
             mdc.qc_user,