aps-甘特图查询工序作业明细优化

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -197,14 +197,14 @@
         IF(IFNULL(apope.BLANKBATCHNUMBER,'')='',SUBSTRING_INDEX(abo.PREPAREMATERIALBATCHNO, ',', 1),apope.BLANKBATCHNUMBER),
         IF(apo.PROCESS = "小卷成退"OR apo.PROCESS = "小卷包装",
         CONCAT_WS(',',
-        SUBSTRING_INDEX( trim( BOTH ',' FROM IFNULL(apope.BACHMATERIALPROCESS,'') ), ',', 1 ),
-        SUBSTRING_INDEX( trim( BOTH ',' FROM IFNULL(apope.DOINGBATCHNUMBER,'') ), ',', 1 ),
-        SUBSTRING_INDEX( trim( BOTH ',' FROM IFNULL(apope.REPORTBATCHNUMBER,'') ), ',', 1 )
+        SUBSTRING_INDEX( if(apope.BACHMATERIALPROCESS='',null,trim( BOTH ',' FROM apope.BACHMATERIALPROCESS)), ',', 1 ),
+        SUBSTRING_INDEX( if(apope.DOINGBATCHNUMBER='',null,trim( BOTH ',' FROM apope.DOINGBATCHNUMBER)), ',', 1 ),
+        SUBSTRING_INDEX( if(apope.REPORTBATCHNUMBER='',null,trim( BOTH ',' FROM apope.REPORTBATCHNUMBER)), ',', 1 )
         ),
         CONCAT_WS(',',
-        trim( BOTH ',' FROM IFNULL(apope.BACHMATERIALPROCESS,'') ),
-        trim( BOTH ',' FROM IFNULL(apope.DOINGBATCHNUMBER,'') ),
-        trim( BOTH ',' FROM IFNULL(apope.REPORTBATCHNUMBER,'') )
+        if(apope.BACHMATERIALPROCESS='',null,trim( BOTH ',' FROM apope.BACHMATERIALPROCESS)),
+        if(apope.DOINGBATCHNUMBER='',null,trim( BOTH ',' FROM apope.DOINGBATCHNUMBER)),
+        if(apope.REPORTBATCHNUMBER='',null,trim( BOTH ',' FROM apope.REPORTBATCHNUMBER))
         )
         )
         ) AS SHOWBATCHNUMBER