装机添加额定寿命

als-modules/agile-assurance/src/main/java/org/eco/als/domain/AirInstall.java

@@ -103,6 +103,12 @@ public class AirInstall extends BaseEntity {
      */
     private String serviceLife;
 
+    /**
+     * 额定寿命/小时
+     */
+    private Integer ratedLife;
+
+
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/AirInstallBo.java

@@ -113,6 +113,11 @@ public class AirInstallBo extends BaseEntity {
      */
     private String serviceLife;
 
+    /**
+     * 额定寿命/小时
+     */
+    private Integer ratedLife;
+
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallImportVo.java

@@ -114,6 +114,12 @@ public class AirInstallImportVo implements Serializable {
     @ExcelProperty(value = "是否有寿")
     private String serviceLife;
 
+    /**
+     * 额定寿命/小时
+     */
+    @ExcelProperty(value = "额定寿命/小时")
+    private Integer ratedLife;
+
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallVo.java

@@ -124,6 +124,12 @@ public class AirInstallVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "是否有寿")
     private String serviceLife;
 
+    /**
+     * 额定寿命/小时
+     */
+    @ExcelProperty(value = "额定寿命/小时")
+    private Integer ratedLife;
+
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AirInstallServiceImpl.java

@@ -77,6 +77,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
         queryWrapper.and(AIR_INSTALL.REPAIRABLE.eq(airInstallBo.getRepairable()));
         queryWrapper.and(AIR_INSTALL.COMPLETE_SET.eq(airInstallBo.getCompleteSet()));
         queryWrapper.and(AIR_INSTALL.SERVICE_LIFE.eq(airInstallBo.getServiceLife()));
+        queryWrapper.and(AIR_INSTALL.RATED_LIFE.eq(airInstallBo.getRatedLife()));
         queryWrapper.and(AIR_INSTALL.REMARKS.eq(airInstallBo.getRemarks()));
         queryWrapper.orderBy(AIR_INSTALL.CREATE_TIME.desc());
 
@@ -157,8 +158,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
     public boolean update(AirInstallBo airInstallBo) {
         AirInstall airInstall = MapstructUtils.convert(airInstallBo, AirInstall.class);
         if (ObjectUtil.isNotNull(airInstall) && ObjectUtil.isNotNull(airInstall.getId())) {
-            boolean updated = this.updateById(airInstall);
-            return updated;
+            return this.updateById(airInstall);
         }
         return false;
     }