Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!225
This commit is contained in:
super_liu
2021-11-09 12:27:16 +08:00
4 changed files with 85 additions and 39 deletions
@@ -350,48 +350,48 @@
<!-- 分页查询条件 -->
<sql id="standSort_in">
ORDER BY
CASE tmp_tb.stand_sort
when 'Q/FT A' THEN 0
when 'Q/FT B' THEN 1
when 'Q/FT E' THEN 2
when 'Q/FT F' THEN 3
when 'Q/FT G' THEN 4
when 'Q/FT M' THEN 5
when 'Q/FT Q' THEN 6
when 'Q/FT R' THEN 7
when 'Q/FT S' THEN 8
when 'Q/FT T' THEN 9
when 'Q/FT V' THEN 10
when 'Q/FT X' THEN 11
when 'Q/FT Y' THEN 12
when 'Q/FT Z' THEN 13
when 'Q/QCBFC' THEN 14
when '雷萨企标Q/FL' THEN 15
when 'Q/QCFLC' THEN 16
CASE
when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0
when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2
when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3
when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4
when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5
when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7
when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8
when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9
when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10
when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11
when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
ELSE 17
END,
tmp_tb.stand_sort ASC
</sql>
<sql id="standSort_out">
ORDER BY
CASE tmp_tb.stand_sort
when 'Q/FT A' THEN 0
when 'Q/FT B' THEN 1
when 'Q/FT E' THEN 2
when 'Q/FT F' THEN 3
when 'Q/FT G' THEN 4
when 'Q/FT M' THEN 5
when 'Q/FT Q' THEN 6
when 'Q/FT R' THEN 7
when 'Q/FT S' THEN 8
when 'Q/FT T' THEN 9
when 'Q/FT V' THEN 10
when 'Q/FT X' THEN 11
when 'Q/FT Y' THEN 12
when 'Q/FT Z' THEN 13
when 'Q/QCBFC' THEN 14
when '雷萨企标Q/FL' THEN 15
when 'Q/QCFLC' THEN 16
CASE
when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0
when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2
when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3
when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4
when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5
when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7
when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8
when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9
when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10
when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11
when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
ELSE 17
END,
tmp_tb.stand_sort ASC,