修改气瓶系统bug

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/config/MybatisPlusConfiguration.java

@@ -16,11 +16,11 @@ public class MybatisPlusConfiguration {
     /**
      * plus分页插件支持
      */
-    @Bean
+    /*@Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
         mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         return mybatisPlusInterceptor;
-    }
+    }*/
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml

@@ -14,7 +14,7 @@
     </select>
 
 
-    <select id="queryListByQueryDto">
+    <select id="queryListByQueryDto" resultType="java.util.Map">
         SELECT
         r.sequence_nbr AS sequenceNbr,
         r.filling_unit_name AS fillingUnitName,
@@ -80,12 +80,12 @@
         '不合格'
         end as checkResult
         FROM
-        tz_cylinder_filling_record r
+        tz_cylinder_filling_record_copy r
         left join tz_cylinder_unit u on u.app_id = r.app_id
-        left join tz_cylinder_info i on r.sequence_code = i.sequence_code
-        inner join tz_cylinder_filling b on b.sequence_code = r.sequence_code AND
+        left join tz_cylinder_info_copy i on r.sequence_code = i.sequence_code
+        left join tz_cylinder_filling_copy b on b.sequence_code = r.sequence_code AND
         date_format(`b`.`inspection_date`,'%Y-%m-%d') = date_format(`r`.`filling_startTime`,'%Y-%m-%d')
-        inner join tz_cylinder_filling_check af on af.sequence_code = r.sequence_code AND
+        left join tz_cylinder_filling_check_copy af on af.sequence_code = r.sequence_code AND
         date_format(`af`.`inspection_date`,'%Y-%m-%d') = date_format(`r`.`filling_startTime`,'%Y-%m-%d')
         WHERE
         1= 1