1.修复部分查询bug

master
x_z 3 years ago
parent fa7500b0f6
commit abf4724d7d

@ -6,6 +6,7 @@ import com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity;
import com.glxp.udi.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.udi.admin.res.param.SystemPDFTemplateRelevanceResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -50,7 +51,7 @@ public interface SystemPDFTemplateRelevanceDao extends BaseMapper<SystemPDFTempl
boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
IPage<SystemPDFTemplateRelevanceResponse> filterList(IPage<SystemPDFTemplateRelevanceResponse> page, Integer moduleId, String localAction, String customerId);
IPage<SystemPDFTemplateRelevanceResponse> filterList(@Param("page") IPage<SystemPDFTemplateRelevanceResponse> page, @Param("moduleId") Integer moduleId, @Param("localAction") String localAction, @Param("customerId") String customerId);
List<SystemPDFTemplateRelevanceResponse> filterAll(SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest);

@ -96,7 +96,7 @@ public class OrderService {
.ge(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", orderFilterRequest.getEndTime())
.eq(StrUtil.isNotBlank(orderFilterRequest.getIsError()), "status", orderFilterRequest.getStatus())
.eq(StrUtil.isNotBlank(orderFilterRequest.getAction()), "action", orderFilterRequest.getAction())
.ne(StrUtil.isBlank(orderFilterRequest.getAction()), "action", orderFilterRequest.getAction())
.ne(StrUtil.isBlank(orderFilterRequest.getAction()), "action", "StockCheck")
.eq(StrUtil.isNotBlank(orderFilterRequest.getOrderId()), "orderId", orderFilterRequest.getOrderId())
.eq(StrUtil.isNotBlank(orderFilterRequest.getMainAction()), "mainAction", orderFilterRequest.getMainAction())
.eq(null != orderFilterRequest.getStatus(), "status", orderFilterRequest.getStatus())

Loading…
Cancel
Save