维修

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 String typeName;
     private LocalDate youXiaoQi;
 
     /**

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

@@ -137,10 +137,12 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sb.SbMeasureLogDTO"
             resultType="com.platform.dao.vo.query.sb.SbMeasureLogVO">
-        select checkstandard.*,
+        select checkstandard.*,type.name as typeName
         sb.position_no positionNo, sb.zzh, sb.name sbName, sb.model sbModel, sb.no sbNo, sb.zzh sbZzh, sb.card_no cardNo
         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 = info.position_id
+        left join t_sb_type type on type.id = info.type_id
         <where>
             <include refid="List_Condition"/>
         </where>

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

@@ -4,8 +4,8 @@
 
     <select id="selectList" parameterType="com.platform.dao.entity.sb.SbUpdateLog"
             resultType="com.platform.dao.vo.sb.SbUpdateLogVO">
-        select log.*,type.name as typeName,info.position_no as sbPositionNo,info.name as sbName,guige.name
-        as guige
+        select type.name as typeName,info.position_no as sbPositionNo,info.name as sbName,guige.name
+        as guige,position.name as sbPositionName,
         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