Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml

@@ -36,10 +36,10 @@
                    ELSE ifnull(TRIM(TRAILING '.00' FROM FORMAT(ROUND(SUM(tt.num) * 100.0 / SUM(ltb.real_num), 2), 2)), '0')
                    END,'%') AS                          scanRate,
                 (ifnull(sum(ltb.real_num), 0) - ifnull(sum(tt.num), 0))  batchPickupItemCount,
-                case
+               concat(case
                 when sum(ltb.real_num) = 0 then '0'
                 else ifnull(TRIM(TRAILING '.00' from FORMAT(ROUND((ifnull(sum(ltb.real_num), 0) - ifnull(sum(tt.num), 0)) * 100.0 / sum(ltb.real_num), 2), 2)),
-                '0') end                                                                                       as batchPickupRate,
+                '0') end,'%')                                                                                       as batchPickupRate,
                ifnull(sum(com.num), 0)             completedPickupCount,
                ifnull(sum(com.wcwcs), 0)           qualifiedPickupCountWithin,
                ifnull(sum(nocom.wwccs), 0)         overdueIncompleteCount,