zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉导出

master
e 2020-03-25 12:12:35 +08:00
parent 7b4df56fb5
commit 7abc626fc3
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/zzjee/wave/controller/WaveToDownController.java
View File

@ -370,8 +370,26 @@ public class WaveToDownController extends BaseController {
ResultDO D0 = new ResultDO(); ResultDO D0 = new ResultDO();
D0.setOK(true); D0.setOK(true);
List<WaveToDownEntity> listWaveToDowns=waveToDownService.getList(WaveToDownEntity.class); String hql="from WaveToDownEntity where waveId = ? ";
D0.setObj(listWaveToDowns);
List<WaveToDownEntity> listWaveToDowns =new ArrayList<>();
if(StringUtil.isEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){
hql="from WaveToDownEntity ";
listWaveToDowns = waveToDownService.findHql(hql);
}
if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){
hql="from WaveToDownEntity where waveId = ? ";
listWaveToDowns = waveToDownService.findHql(hql,searchstr);
}
if(StringUtil.isEmpty(searchstr)&&StringUtil.isNotEmpty(searchstr2)){
hql="from WaveToDownEntity where binId = ? ";
listWaveToDowns = waveToDownService.findHql(hql,searchstr2);
}
if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isNotEmpty(searchstr2)){
hql="from WaveToDownEntity where waveId = ? and binId = ?";
listWaveToDowns = waveToDownService.findHql(hql,searchstr,searchstr2);
}
D0.setObj(listWaveToDowns);
return new ResponseEntity(D0, HttpStatus.OK); return new ResponseEntity(D0, HttpStatus.OK);
} }

27
src/main/java/com/zzjee/wave/controller/WaveToFjController.java
View File

@ -1,5 +1,6 @@
package com.zzjee.wave.controller; package com.zzjee.wave.controller;
import com.zzjee.api.ResultDO; import com.zzjee.api.ResultDO;
import com.zzjee.wave.entity.WaveToDownEntity;
import com.zzjee.wave.entity.WaveToFjEntity; import com.zzjee.wave.entity.WaveToFjEntity;
import com.zzjee.wave.service.WaveToFjServiceI; import com.zzjee.wave.service.WaveToFjServiceI;
import java.util.ArrayList; import java.util.ArrayList;
@ -103,7 +104,7 @@ public class WaveToFjController extends BaseController {
* @param request * @param request
* @param response * @param response
* @param dataGrid * @param dataGrid
* @param user
*/ */
@RequestMapping(params = "datagrid") @RequestMapping(params = "datagrid")
@ -177,7 +178,7 @@ public class WaveToFjController extends BaseController {
/** /**
* 添加wave_to_fj * 添加wave_to_fj
* *
* @param ids
* @return * @return
*/ */
@RequestMapping(params = "doAdd") @RequestMapping(params = "doAdd")
@ -201,7 +202,7 @@ public class WaveToFjController extends BaseController {
/** /**
* 更新wave_to_fj * 更新wave_to_fj
* *
* @param ids
* @return * @return
*/ */
@RequestMapping(params = "doUpdate") @RequestMapping(params = "doUpdate")
@ -346,8 +347,26 @@ public class WaveToFjController extends BaseController {
@RequestParam(value="searchstr2", required=false)String searchstr2) { @RequestParam(value="searchstr2", required=false)String searchstr2) {
ResultDO D0 = new ResultDO(); ResultDO D0 = new ResultDO();
D0.setOK(true); D0.setOK(true);
String hql="from WaveToDownEntity where waveId = ? ";
List<WaveToFjEntity> listWaveToFjs=waveToFjService.getList(WaveToFjEntity.class); List<WaveToFjEntity> listWaveToFjs =new ArrayList<>();
if(StringUtil.isEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){
hql="from WaveToFjEntity ";
listWaveToFjs=waveToFjService.findHql(hql);
}
if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){
hql="from WaveToFjEntity where waveId = ? ";
listWaveToFjs=waveToFjService.findHql(hql,searchstr);
}
if(StringUtil.isEmpty(searchstr)&&StringUtil.isNotEmpty(searchstr2)){
hql="from WaveToFjEntity where firstRq = ? ";
listWaveToFjs=waveToFjService.findHql(hql,searchstr2);
}
if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isNotEmpty(searchstr2)){
hql="from WaveToFjEntity where waveId = ? and firstRq = ?";
listWaveToFjs=waveToFjService.findHql(hql,searchstr,searchstr2);
}
// List<WaveToFjEntity> listWaveToFjs=waveToFjService.getList(WaveToFjEntity.class);
D0.setObj(listWaveToFjs); D0.setObj(listWaveToFjs);
return new ResponseEntity(D0, HttpStatus.OK); return new ResponseEntity(D0, HttpStatus.OK);