Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-11-12 0edab78d73d975663da8ce2596a0a00c1b6a6db1

 gx_tieta/src/com/fgkj/actions/StationtrafficAction.java

@@ -2,6 +2,7 @@


import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.Stationtraffic;

import com.fgkj.dto.User_inf;

import com.fgkj.services.StationtrafficService;





@@ -14,6 +15,8 @@
   //统计基站流量

   public String serchByCondition() {

      Stationtraffic st=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Stationtraffic.class);

      User_inf uinf=(User_inf) getUser();

      st.setNote(uinf.getUId().toString());

      ServiceModel model=service.serchByCondition(st);

      result=tojson(model);

      return SUCCESS;