diff --git a/.idea/artifacts/weaver_develop_jar.xml b/.idea/artifacts/weaver_develop_jar.xml index 6258dfe..2aff103 100644 --- a/.idea/artifacts/weaver_develop_jar.xml +++ b/.idea/artifacts/weaver_develop_jar.xml @@ -1,6 +1,6 @@ - $PROJECT_DIR$/out/artifacts/weaver_develop_jar + $PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib diff --git a/src/test/MainTest.java b/src/test/MainTest.java index 4090938..f9d21bf 100644 --- a/src/test/MainTest.java +++ b/src/test/MainTest.java @@ -1,6 +1,9 @@ package test; import com.weaver.general.TimeUtil; +import weaver.interfaces.fssecond.action.FnabudgetinfoAction; +import weaver.soa.workflow.request.RequestInfo; +import weaver.workflow.request.RequestManager; /** * @Author weaver_cl @@ -11,8 +14,13 @@ import com.weaver.general.TimeUtil; public class MainTest { public static void main(String[] args) { - double doubleValue = getDoubleValue(""); - System.out.println(doubleValue); + RequestInfo requestInfo = new RequestInfo(); +// RequestManager requestManager = new RequestManager(); +// requestManager.setFormid(-568); +// requestInfo.setRequestManager(requestManager); +// requestInfo.setRequestid("1548547"); + FnabudgetinfoAction fnabudgetinfoAction = new FnabudgetinfoAction(); + fnabudgetinfoAction.execute(requestInfo); } public static double getDoubleValue(String var0) { diff --git a/src/weaver/interfaces/fssecond/action/FnabudgetinfoAction.java b/src/weaver/interfaces/fssecond/action/FnabudgetinfoAction.java index e1f742a..774710a 100644 --- a/src/weaver/interfaces/fssecond/action/FnabudgetinfoAction.java +++ b/src/weaver/interfaces/fssecond/action/FnabudgetinfoAction.java @@ -24,6 +24,7 @@ public class FnabudgetinfoAction implements Action { String requestid = requestInfo.getRequestid(); int formid = Math.abs(requestInfo.getRequestManager().getFormid()); + RecordSet rs = new RecordSet(); String mainTable = String.format("%s%s", "formtable_main_", formid); String detaiTable = String.format("%s%s",mainTable,"_dt1"); @@ -113,8 +114,6 @@ public class FnabudgetinfoAction implements Action { // String ybzsm11 = Util.null2String(rs.getString("ybzsm_11")); // String ybzsm12 = Util.null2String(rs.getString("ybzsm_12")); - FnabudgetinfoDetailPo fnabudgetinfoDetail = FnabudgetinfoDetailPo.builder().budgettypeId(kmmc) - .build(); List items = new ArrayList<>(); items.add(FnabudgetinfoDetailItemPo.builder().budgetAccount(y1).budgetperiodsList(1).build()); @@ -132,9 +131,10 @@ public class FnabudgetinfoAction implements Action { items.forEach(e -> { if (StringUtils.isNotEmpty(e.getBudgetAccount())){ + double value = Util.getDoubleValue(e.getBudgetAccount()); - fnabudgetinfoDetail.setBudgetAccount(value); - fnabudgetinfoDetail.setBudgetperiodsList(e.getBudgetperiodsList()); + FnabudgetinfoDetailPo fnabudgetinfoDetail = FnabudgetinfoDetailPo.builder().budgettypeId(kmmc) + .budgetAccount(value).budgetperiodsList(e.getBudgetperiodsList()).build(); fbDetail.add(fnabudgetinfoDetail); } });