diff --git a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java index 7b6e2857..cb5644ff 100644 --- a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java +++ b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java @@ -553,7 +553,9 @@ public class TmsYwDingdanController extends BaseController { @RequestParam(value="omnoticeid", required=false)String omnoticeid) { ResultDO D0 = new ResultDO(); D0.setOK(true); - String hql="from WmTmsNoticeIEntity where omNoticeId = ?"; + System.out.println("/list/omNoticeId"+omnoticeid ); + + String hql="from WmTmsNoticeIEntity where omNoticeId = ?"; List listWaveToDowns =new ArrayList<>(); listWaveToDowns = wmOmNoticeHService.findHql(hql,omnoticeid); D0.setObj(listWaveToDowns); diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java index 7f260f55..59c63eb4 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java @@ -2666,6 +2666,7 @@ public class WmOmNoticeHController extends BaseController { String hql="from WmOmNoticeHEntity "; List listWaveToDowns =new ArrayList<>(); + List listWaveToDownsnew =new ArrayList<>(); if(StringUtil.isNotEmpty(searchstr)&&!"null".equals(searchstr)){ hql="from WmOmNoticeHEntity where omSta <> ? and reMember = ? and omNoticeId = ?"; listWaveToDowns = wmOmNoticeHService.findHql(hql,"复核完成",username,searchstr); @@ -2678,14 +2679,35 @@ public class WmOmNoticeHController extends BaseController { D0.setObj(listWaveToDowns); System.out.println("/list/hehuolistWaveToDowns==="+listWaveToDowns.toString()+listWaveToDowns.size()); + for(WmOmNoticeHEntity t: listWaveToDowns){ + List listWaveToDowndetial =new ArrayList<>(); + hql="from WmOmNoticeIEntity where omNoticeId = ?"; + listWaveToDowndetial = wmOmNoticeHService.findHql(hql, t.getOmNoticeId()); + try{ + double sumcount =0.00; + for(WmOmNoticeIEntity dt: listWaveToDowndetial){ + sumcount = sumcount + Double.parseDouble(dt.getBaseGoodscount()); + } + + t.setOmBeizhu(Double.toString(sumcount)); + }catch (Exception e){ + + } + + listWaveToDownsnew.add(t); + } + + return new ResponseEntity(D0, HttpStatus.OK); } @RequestMapping(value = "/listdetail/hehuo", method = RequestMethod.GET)// @ResponseBody public ResponseEntity listdetail( - @RequestParam(value="omNoticeId", required=false)String omnoticeid) { + @RequestParam(value="omnoticeid", required=false)String omnoticeid) { ResultDO D0 = new ResultDO(); D0.setOK(true); + System.out.println("/list/hehuo/omNoticeId"+omnoticeid ); + String hql="from WmOmNoticeIEntity where omNoticeId = ? "; List listWaveToDowns =new ArrayList<>(); // hql="from WmImNoticeIEntity where noticeiSta <> ? and omNoticeId = ?";