diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/jync_file/util/ParamNewUtil.java b/v5/apps-customize/src/main/java/com/seeyon/apps/jync_file/util/ParamNewUtil.java index eac5d74..3149cc0 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/jync_file/util/ParamNewUtil.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/jync_file/util/ParamNewUtil.java @@ -207,7 +207,7 @@ public class ParamNewUtil { jsonArray.add(subjson); } jsonObject.put("data", jsonArray); - if(istrue.size()==subFormMap.size()) { + if(istrue.size() == subFormMap.size()) { jsonObject = new JSONObject(); } return jsonObject; @@ -423,15 +423,10 @@ public class ParamNewUtil { } FieldDataVo isunitidVo = formDataVo.getFieldData("是否同一收款单位"); String isunitid = ""; - if(isunitidVo!=null){ + if(isunitidVo != null){ isunitid = isunitidVo.getDbValue().toString(); } - String isunit = ""; - if("".equals(isunitid)){ - isunit = "是"; - }else { - isunit = getEnumManagerNew().getEnumItem(Long.parseLong(isunitid)).getLabel(); - } + String isunit = StringUtils.isBlank(isunitid) ? "是" : getEnumManagerNew().getEnumItem(Long.parseLong(isunitid)).getLabel(); if("是".equals(isunit) && "否".equals(isbear)) { JSONObject subjson = new JSONObject(); FieldDataVo psndoccodeVo = formDataVo.getFieldData("收款单位编码"); @@ -542,7 +537,7 @@ public class ParamNewUtil { }else { for (FormDataVo subFormDataVo : subFormMap) { FieldDataVo bipNoVo = subFormDataVo.getFieldData("BIP单据号"); - if(bipNoVo!=null){ + if (bipNoVo != null && StringUtils.isNotBlank(bipNoVo.getStringValue())) { istrue.add(bipNoVo.getStringValue()); } JSONObject subjson = new JSONObject(); @@ -698,7 +693,7 @@ public class ParamNewUtil { } jsonObject.put("data", jsonArray); - if(istrue.size()==subFormMap.size()) { + if(istrue.size() == subFormMap.size()) { jsonObject = new JSONObject(); } return jsonObject; diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/jync_fz/node/SheBaoFenZhangNode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/jync_fz/node/SheBaoFenZhangNode.java index 1c56b71..6e5b843 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/jync_fz/node/SheBaoFenZhangNode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/jync_fz/node/SheBaoFenZhangNode.java @@ -71,7 +71,7 @@ public class SheBaoFenZhangNode extends ACommonSuperNode { // 进入超级审核节点 SuperNodeContext context = new SuperNodeContext(); context.setNeedSave(true); - System.out.println("开始处理单据sheBaoFenZhangNode"); + log.info("开始处理单据sheBaoFenZhangNode"); // 封装推送接口参数调用接口 try { JSONObject headerer = HeaderUtil.getHeader(); @@ -79,43 +79,40 @@ public class SheBaoFenZhangNode extends ACommonSuperNode { ColSummary summary = formDataVo.getColSummary(); JSONObject jsonObject = paramNewUtil.getSheBaoFenZhangParam(formDataVo,summary.getId()+""); context.setRequest(jsonObject.toString()); - if(jsonObject.size()==0) { + if(jsonObject.size() == 0 ) { JSONObject endJsonObject = paramNewUtil.getSheBaoFenZhangEndParam(formDataVo); context.setRequest(endJsonObject.toString()); log.info("接口流程结束,参数记录:"+endJsonObject); String url = PropKit.getProp(PropKit.SBFZCANCELURL); context.setUrl(url); JSONObject EndRes = ProtUtil.doPost(endJsonObject, url, headerer); - if(EndRes.isEmpty()) { - context.setResponse(EndRes.toString()); - context.back("流程状态改变失败"); - context.setErrMsg("流程状态改变失败"); - } - String status = EndRes.getString("status"); - if(!"2".equals(status)) { + log.info("接口流程结束,返回值记录:"+EndRes); + if(EndRes.isEmpty() || !"2".equals(EndRes.getString("status"))) { context.setResponse(EndRes.toString()); context.back("流程状态改变失败"); context.setErrMsg("流程状态改变失败"); + return context; } } -// String url = PropKit.getProp(PropKit.TRANSFORMURL); - String url = PropKit.getProp(PropKit.SBFZCANCELURL); + String url = PropKit.getProp(PropKit.TRANSFORMURL); +// String url = PropKit.getProp(PropKit.SBFZCANCELURL); context.setUrl(url); + log.info("接口流程结束,参数记录:"+jsonObject); JSONObject res = ProtUtil.doPost(jsonObject,url , headerer); + log.info("接口流程结束,返回值记录:"+res); context.setResponse(res.toString()); - if(res==null) { + if(res == null) { context.back("接口调用失败,未正常返回结果"); context.setErrMsg("接口调用失败,未正常返回结果"); + formDataVo.getNewFieldDataMap().put("BIP返回结果", "推送BIP失败"); return context; } String isStatus = res.get("status").toString(); String msg = res.get("msg").toString(); if("1".equals(isStatus)) { context.success(msg); - Map> subFormMaps = formDataVo.getSubFormMap(); List subFormMap = subFormMaps.get("分账明细表"); - String[] nos = msg.split("【"); FieldDataVo isbearidVo = formDataVo.getFieldData("支付公司是否成本承担公司"); String isbearid = ""; @@ -152,28 +149,24 @@ public class SheBaoFenZhangNode extends ACommonSuperNode { log.info("接口流程结束,参数记录:"+endJsonObject); String endurl = PropKit.getProp(PropKit.SBFZCANCELURL); JSONObject EndRes = ProtUtil.doPost(endJsonObject, endurl, headerer); + log.info("接口流程结束,返回值记录:"+EndRes); context.setResponse(res.toString()); - if(EndRes.isEmpty()) { + if(EndRes.isEmpty() || !"2".equals(EndRes.getString("status"))){ context.back("流程状态改变失败"); context.setErrMsg("流程状态改变失败"); } - String status = EndRes.getString("status"); - if(!"2".equals(status)) { - context.back("流程状态改变失败"); - context.setErrMsg("流程状态改变失败"); - }else { - context.success(msg); - } }else { context.back(msg); context.setErrMsg(msg); } } catch (Exception e) { - e.printStackTrace(); - context.back("异常:"+e); - context.setErrMsg("异常:"+e); + log.error(e.getMessage(),e); + context.back("异常:"+e.getMessage()); + context.setErrMsg("异常:"+e.getMessage()); } return context; + + } } \ No newline at end of file