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

hdw

2018-10-29 3ea3e6ac0db260b46aa262bc2ab33d8ab8860b86

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

@@ -71,6 +71,13 @@
      result = tojson(model);

      return SUCCESS;

   }

   //根据维护区和机房名称查询电池组信息

   public String searchInform1() {

      Batt_Maint_Dealarm bmd = getGson().fromJson(json, Batt_Maint_Dealarm.class);

      ServiceModel model = service.searchInform1(bmd);

      result = tojson(model);

      return SUCCESS;

   }

   public String serchByCondition() {

      model = service.serchByCondition(bif);

      result = ActionUtil.tojson(model);

@@ -329,10 +336,21 @@
   //电池配组管理(重要)

   public String serchMakeGroup(){

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

      User_inf uinf=(User_inf) getUser();

      binf.setNum(uinf.getUId());

      ServiceModel model = service.serchMakeGroup(binf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

   //电池配组管理(重要)

   public String serchGroupByInfor(){

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

      User_inf uinf=(User_inf) getUser();

      binf.setNum(uinf.getUId());

      ServiceModel model = service.serchGroupByInfor(binf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

   public BattInf getBif() {

      return bif;

   }