Merge branch 'develop_3' into 'develop_master'

Develop 3 See merge request LiuChao/foton-slrs-system-rest!385
2022-01-22 16:46:43 +08:00
parent 5d0df6d02c 9e7d9f65d4
commit 96c71c50a4
5 changed files with 71 additions and 6 deletions
@@ -788,7 +788,8 @@
        WHERE b.VALID_FLAG = 0
    </select>
    <select id="getFileType" resultType="java.lang.String">
-       SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE
+      <!-- SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE -->
+       SELECT FILE_type from sar_file_split_info WHERE STAND_ID = #{standId} AND VALID_FLAG = '0' GROUP BY FILE_TYPE
    </select>

 </mapper>