blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-07-25 4e76c488d6b9054059e61ad46c5feb9fa6921bb7 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -178,6 +178,7 @@


#                c.quantity,


               c.quantity as thisQuantity,/*用于判断是否改变颜色*/


               e.reportWorkQuantity,


               e.reportWorkQuantityShow,


               e.reportWorkQuantityCount,


               e.reportWorkTime,


               e.broken_num,


@@ -219,6 +220,10 @@


                                          GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),


                                          '}'


                                       )             as reportWorkQuantity,


                                   concat('{',


                                          GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),


                                          '}'


                                       )             as reportWorkQuantityShow,


                                   concat('{',


                                          GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),


                                          '}'


@@ -2113,7 +2118,7 @@


        WHERE


            rw.reporting_work_time >= #{selectTime1}


          AND rw.reporting_work_time <  #{selectTime2}


          AND dd.available = 0


          AND dd.available = 0 and rw.reviewed_state>=0


        <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">


            and o.order_id regexp #{damageReportDTO.orderId}


        </if>