From 8dcd9d96a488bd5015bf4e10aa0a6499003a5a89 Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Fri, 18 Dec 2020 00:32:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=8B=A3=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zzjee/wave/controller/WaveToFjController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java index 01ad154d..4938934d 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java @@ -346,7 +346,8 @@ public class WaveToFjController extends BaseController { public ResponseEntity list(@RequestParam(value="username", required=false) String username, @RequestParam(value="searchstr", required=false)String searchstr, @RequestParam(value="searchstr2", required=false)String searchstr2, - @RequestParam(value="searchstr3", required=false)String searchstr3) { + @RequestParam(value="searchstr3", required=false)String searchstr3, + @RequestParam(value="searchstr3", required=false)String searchstr4) { ResultDO D0 = new ResultDO(); D0.setOK(true); String hql="from WaveToDownEntity where waveId = ? "; @@ -355,7 +356,7 @@ public class WaveToFjController extends BaseController { List listWaveToFjsnew =new ArrayList<>(); if(StringUtil.isEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){ - hql="from WaveToFjEntity "; + hql="from WaveToFjEntity where 1 = 1 "; listWaveToFjs=waveToFjService.findHql(hql); } if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){ @@ -370,6 +371,7 @@ public class WaveToFjController extends BaseController { hql="from WaveToFjEntity where waveId = ? and firstRq = ?"; listWaveToFjs=waveToFjService.findHql(hql,searchstr,searchstr2); } + // List listWaveToFjs=waveToFjService.getList(WaveToFjEntity.class); String omnoticeid="1"; String siji = ""; @@ -377,6 +379,13 @@ public class WaveToFjController extends BaseController { System.out.println("11111searchstr3="+searchstr3); for(WaveToFjEntity t:listWaveToFjs) { + + if(StringUtil.isNotEmpty(searchstr4)){ + if ( !StringUtil.strPos(t.getSecondRq(), searchstr4) ) { + continue; + } + } + if (StringUtil.isNotEmpty(searchstr3)) { System.out.println("t.getGoodsId()="+t.getGoodsId()); System.out.println("searchstr3="+searchstr3);