feat(all): 修改梦天回传逻辑

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml

@@ -4,9 +4,11 @@
 
     <select id="pageNodePush" resultType="com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity">
         select * from mt_factory_node_push
-        <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
+        <where>
-            ${ew.sqlSegment}
+            <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
-        </if>
+                ${ew.sqlSegment}
+            </if>
+        </where>
     </select>
 
     <update id="cancel">

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java

@@ -3,6 +3,7 @@ package com.logpm.factorydata.mengtian.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
@@ -39,6 +40,12 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
     public IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, Query query) {
 		IPage<FactoryNodePushEntity> page = Condition.getPage(query);
 		QueryWrapper<FactoryNodePushEntity> queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class);
+		if(StrUtil.isNotEmpty(vo.getType())){
+			queryWrapper.eq("type", vo.getType());
+		}
+		if(StrUtil.isNotEmpty(vo.getSendStatus())){
+			queryWrapper.eq("send_status", vo.getSendStatus());
+		}
 		List<FactoryNodePushEntity> deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper);
 		return page.setRecords(deliveryTrainPage);
     }