aps-生产计划跟踪报表

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2695,22 +2695,31 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         List<ColumnQueryType> columnQueryTypes = req.getColumnQueryTypes();
         for (ColumnQueryType columnQueryType : columnQueryTypes) {
-            for (SearchColumnVo column : columnQueryType.getColumns()) {
-                if (column.getField().equals("customname")) {
-                    param.setCustomName(column.getValue());
-                }
-                if (column.getField().equals("customorderno")) {
-                    param.setCustomOrderNo(column.getValue());
-                }
-                if (column.getField().equals("promiseDateStart")) {
-                    param.setStartDate(column.getStartDate());
-                    param.setEndDate(column.getEndDate());
-                }
-                if (column.getField().equals("blankNumber")) {
-                    param.setBlankNumber(column.getValue());
+            if (columnQueryType.getColumnInnerRelation().equals("AND")) {
+                for (SearchColumnVo column : columnQueryType.getColumns()) {
+                    if (column.getField().equals("customname")) {
+                        param.setCustomName(column.getValue());
+                    }
+                    if (column.getField().equals("customorderno")) {
+                        param.setCustomOrderNo(column.getValue());
+                    }
+                    if (column.getField().equals("promiseDateStart")) {
+                        param.setStartDate(column.getStartDate());
+                        param.setEndDate(column.getEndDate());
+                    }
+                    if (column.getField().equals("blankNumber")) {
+                        param.setBlankNumber(column.getValue());
+                    }
+                    if (column.getField().equals("productionOrderStatus")) {
+                        param.setProductionOrderStatus(column.getValue());
+                    }
                 }
-                if (column.getField().equals("productionOrderStatus")) {
-                    param.setProductionOrderStatus(column.getValue());
+            }
+            if (columnQueryType.getColumnInnerRelation().equals("OR")) {
+                for (SearchColumnVo column : columnQueryType.getColumns()) {
+                    if (column.getField().equals("customname")) {
+                        param.setLikeSearchAll(column.getValue());
+                    }
                 }
             }
         }

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

@@ -268,6 +268,12 @@
             <if test="param.blankNumber != ''">
                 AND abo.BLANKNUMBER like concat('%',#{param.blankNumber},'%')
             </if>
+            <if test="param.likeSearchAll != ''">
+                AND (apo.CUSTOMNAME like concat('%',#{param.likeSearchAll},'%')
+                    OR apo.CUSTOMORDERNO like concat('%',#{param.likeSearchAll},'%')
+                    OR abo.BLANKNUMBER like concat('%',#{param.likeSearchAll},'%')
+                    )
+            </if>
 
             )a
         <where>

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProductPlanReportParamVo.java

@@ -14,6 +14,9 @@ public class ProductPlanReportParamVo {
     private String endDate = "";
     private String blankNumber = "";
 
+    //全部模糊查询
+    private String likeSearchAll = "";
+
     private String productionOrderStatus = "";
 
     private String orders = "";