维修

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogVO extends BaseVO implements Serializable{
+    private LocalDate nextCheckDate;
     private String positionName;
     private String typeName;
     private LocalDate youXiaoQi;

platform-dao/src/main/java/com/platform/dao/vo/sb/SbUpdateLogVO.java

@@ -67,6 +67,8 @@ public class SbUpdateLogVO extends BaseVO implements Serializable {
 
     private String guige;
 
+    private String model;
+
 
 
 }

platform-dao/src/main/resources/mapper/sb/SbMeasureLogMapper.xml

@@ -139,7 +139,7 @@
             resultType="com.platform.dao.vo.query.sb.SbMeasureLogVO">
         select checkstandard.*,type.name as typeName,
         sb.position_no as positionNo, sb.zzh, sb.name sbName, sb.model sbModel, sb.no sbNo, sb.zzh sbZzh, sb.card_no cardNo,
-        position.name as positionName
+        position.name as positionName,sb.check_period as period,sb.next_check_date as nextCheckDate
         from t_sb_measure_log as checkstandard
         LEFT JOIN t_sb_info sb on checkstandard.sb_id = sb.id
         left join t_sb_position position on position.id = sb.position_id

platform-dao/src/main/resources/mapper/sb/SbUpdateLogMapper.xml

@@ -5,7 +5,7 @@
     <select id="selectList" parameterType="com.platform.dao.entity.sb.SbUpdateLog"
             resultType="com.platform.dao.vo.sb.SbUpdateLogVO">
         select type.name as typeName,info.position_no as sbPositionNo,info.name as sbName,guige.name
-        as guige,position.name as sbPositionName,content,log.created_time
+        as guige,position.name as sbPositionName,content,log.created_time,info.model
         from t_sb_update_log as log left join t_sb_info info
         on log.sb_id = info.id
         left join t_sb_type type on type.id = info.type_id