修改

81041

2019-01-18 cf4efde9b2ec3d661269c0346596aaf789eb54ad

 gx_tieta/src/com/fgkj/services/BatttestdataService.java

@@ -34,11 +34,39 @@
         if(list!=null && list.size()>0){

            model.setCode(1);

            model.setData(list);

            model.setMsg("查询成功!");

         }else{

            model.setCode(0);

            model.setMsg("查询失败!");

         }

      }

      return model;

   }

	
   //历史监测——折线图<-------跨域----------->

   public ServiceModel serchByCondition_ky(Object obj){

      Batttestdata btd=(Batttestdata)obj;

      btd.setRecord_num(0);

      btd.setNum(0);

      btd.setTest_type(0);

      if(btd.getBattGroupId()!=null && btd.getTest_record_count()!=null){

      List<Batttestdata> listM=(new BatttestdataDAOImpl()).serchMaxAndMintime(btd);

         if(listM!=null&&listM.size()>0){

            btd.setNum(listM.get(listM.size()-1).getNum());

            btd.setTest_type(listM.get(listM.size()-1).getTest_type());

            btd.setRecord_num(listM.get(listM.size()-1).getRecord_num());

         }

         List<List<Batttestdata>> list = ((BatttestdataDAOImpl)dao).serchByCondition_ky(btd);	
         if(list!=null && list.size()>0){

            model.setCode(1);

            model.setData(list);

            model.setMsg("查询成功!");

         }else{

            model.setCode(0);

            model.setMsg("查询失败!");

         }

      }

      return model;

   }

   public List checkBattTestData(Object obj){

      List listnew = new ArrayList<Batttestdata>();

      List<Batttestdata> list = (List<Batttestdata>)obj;

@@ -54,10 +82,11 @@
   

   public static void main(String[] args) {

      Batttestdata b = new Batttestdata();

      b.setBattGroupId(1000010);

      b.setTest_record_count(37);

      b.setBattGroupId(1002085);

      b.setTest_record_count(1);

      BatttestdataService service = new BatttestdataService();

      service.serchByCondition(b);

      ServiceModel model=service.serchByCondition_ky(b);

      System.out.println(model.getData());

   }

   

}