From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java index 3762e11..a303de8 100644 --- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java +++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java @@ -109,17 +109,27 @@ result = tojson(model); return SUCCESS; } - + //鎵归噺璁剧疆鏀剧數鍙傛暟鏃舵煡璇㈠嚭褰撳墠鏀剧數鐨勭數姹犵粍锛�1u/2u鍒嗗紑锛� + public String seachDischarge(){ + BattInf binf=getGson().fromJson(json, BattInf.class); + User_inf uinf=(User_inf) getUser(); + binf.setBattGroupId(uinf.getUId()); + ServiceModel model = service.seachDischarge(binf); + result = tojson(model); + return SUCCESS; + } + //瀹炴椂鍒锋柊鎵归噺璁剧疆鏀剧數鍙傛暟 + public String freshenDischarge(){ + List list=getGson().fromJson(json,new TypeToken<List<BattInf>>(){}.getType()); + ServiceModel model = service.freshenDischarge(list); + result = tojson(model); + return SUCCESS; + } //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 --> public String serchByCondition_ky(){ - isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶 + //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶 ServiceModel model = new ServiceModel(); - if(key != null && CROSS_DOMAIN_KEY.equals(key)){ - model = service.serchByCondition_ky(); - }else{ - model.setCode(0); - model.setMsg("璇嗗埆鐮侀敊璇�"); - } + model = service.serchByCondition_ky(); result = tojson(model); return SUCCESS; } -- Gitblit v1.9.1