diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java index f4cb00a..23c2cf6 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java @@ -214,7 +214,6 @@ public class InterestMeasurementController extends BaseController { render(response, JSONUtil.toJSONString(res)); return null; - } type = "农发行利息测算"; }else{ diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctleasebill/controller/YdctLeaseBillController.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctleasebill/controller/YdctLeaseBillController.java index 049f563..3a23138 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctleasebill/controller/YdctLeaseBillController.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctleasebill/controller/YdctLeaseBillController.java @@ -71,7 +71,6 @@ public class YdctLeaseBillController extends BaseController { Map res = new HashMap<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmsssss"); - InterestCalculationUtil rentCalculationUtil = new InterestCalculationUtil(); request.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8"); diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/U8CCashCommonNode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/U8CCashCommonNode.java index a791f91..97a08e3 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/U8CCashCommonNode.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/U8CCashCommonNode.java @@ -73,13 +73,20 @@ public abstract class U8CCashCommonNode extends ACommonSuperNode { String param = paramUtil.param(request,getMethod(),formDataVo); Cap4ReturnUtil cap4ReturnUtil = new Cap4ReturnUtil(); try { - if("/u8cloud/api/cmp/sj/audit".equals(getMethod())){ + if("DiaoBoYdctCollectionNode".equals(getNodeId())){ FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果收"); String value = fhjg.getStringValue(); if(value.startsWith("推送U8C成功")) { return context.success("跳过:" + value); } } + if("YDCT资金调拨推送U8C付款结算单".equals(getNodeId())){ + FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果付"); + String value = fhjg.getStringValue(); + if(value.startsWith("推送U8C成功")) { + return context.success("跳过:" + value); + } + } } catch (Exception e) { context.setException(true); context.back("处理异常:OA跳过处理异常:" + e.getMessage()); @@ -117,15 +124,23 @@ public abstract class U8CCashCommonNode extends ACommonSuperNode { // 设置公司编码 JSONObject paramJSON =JSON.parseObject(param); log.info("请求参数"+paramJSON); - JSONArray billvoparams = paramJSON.getJSONArray("billvo"); - JSONObject billvoparam = billvoparams.getJSONObject(0); - JSONObject parentvoparam = billvoparam.getJSONObject("parentvo"); - bill.put("dwbm",parentvoparam.getString("dwbm")); -// 设置审核人编码 + JSONObject parentvoparam = new JSONObject(); + if("DiaoBoYdctRemittanceNode".equals(getNodeId())){ + JSONObject billvoparam = paramJSON.getJSONObject("billvo"); + parentvoparam = billvoparam.getJSONObject("parentvo"); + bill.put("dwbm",parentvoparam.getString("dwbm")); + }else{ + JSONArray billvoparams = paramJSON.getJSONArray("billvo"); + JSONObject billvoparam = billvoparams.getJSONObject(0); + parentvoparam = billvoparam.getJSONObject("parentvo"); + bill.put("dwbm",parentvoparam.getString("dwbm")); + } + FieldDataVo shrbm = formDataVo.getFieldData("U8C-审核人编码"); bill.put("operatorid",shrbm.getStringValue()); bills.add(bill); auditObject.put("bills",bills); +// 设置审核人编码 log.info("审核请求参数:"+auditObject.toString()); // 调用审核单接口 String auditUrl = configVo.getParamVal(U8cConstants.u8cUrl.name()); @@ -142,6 +157,7 @@ public abstract class U8CCashCommonNode extends ACommonSuperNode { auditResponse = U8cHttpUtil.doPost(auditUrl, auditObject.toString(),u8cSystem,u8cUsercode,u8cPassword,u8cConnection,u8cContentType); // 处理审核单返回接口 log.info("审核返回:"+auditResponse); + System.out.println("审核返回:"+auditResponse); }catch (Exception e){ // 审核异常调用删除接口删除生成数据 JSONObject deleteObject = new JSONObject(); @@ -197,7 +213,7 @@ public abstract class U8CCashCommonNode extends ACommonSuperNode { }else{ formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C成功:" + u8cResponse.getStatus()); } - } else { + }else { // 设置单据删除参数 // 设置审核单参数 JSONObject deleteObject = new JSONObject(); diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FinanceTongYongYdctCollectionNode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FinanceTongYongYdctCollectionNode.java new file mode 100644 index 0000000..94bce89 --- /dev/null +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FinanceTongYongYdctCollectionNode.java @@ -0,0 +1,30 @@ +package com.seeyon.apps.ydctu8c.cash.node; + +import com.seeyon.apps.ydctu8c.U8CCashCommonNode; + +/** + * 功能描述:
+ *
+ *
+ * 
+ * + * @Author: HuangZhengguo + * @Date: 2024/9/19 + */ +public class FinanceTongYongYdctCollectionNode extends U8CCashCommonNode { + + @Override + public String getMethod() { + return "/u8cloud/api/cmp/sj/insert"; + } + + @Override + public String getNodeId() { + return "FinanceTongYongYdctCollectionNode"; + } + + @Override + public String getNodeName() { + return "YDCT财务通用收款推送U8C收款结算单"; + } +} diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FinanceTongYongYdctPaymentNode.java b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FinanceTongYongYdctPaymentNode.java new file mode 100644 index 0000000..eaf4e12 --- /dev/null +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FinanceTongYongYdctPaymentNode.java @@ -0,0 +1,30 @@ +package com.seeyon.apps.ydctu8c.cash.node; + +import com.seeyon.apps.ydctu8c.U8CCashCommonNode; + +/** + * 功能描述:
+ *
+ *
+ * 
+ * + * @Author: HuangZhengguo + * @Date: 2024/9/19 + */ +public class FinanceTongYongYdctPaymentNode extends U8CCashCommonNode { + + @Override + public String getMethod() { + return "/u8cloud/api/cmp/fj/insert"; + } + + @Override + public String getNodeId() { + return "FinanceTongYongYdctPaymentNode"; + } + + @Override + public String getNodeName() { + return "YDCT财务通用付款推送U8C付款结算单"; + } +} diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/util/U8cHttpUtil.java b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/util/U8cHttpUtil.java index 90f548d..e617665 100644 --- a/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/util/U8cHttpUtil.java +++ b/v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/util/U8cHttpUtil.java @@ -26,6 +26,7 @@ public class U8cHttpUtil { .header("connection", connection) .header("Content-Type", contentType) .header("system", u8cSystem) + .header("needStackTrace", "Y") .header("usercode", u8cUsercode) .header("password", u8cPassword) .body(body).execute().body(); diff --git a/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/pluginCfg.xml b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/pluginCfg.xml new file mode 100644 index 0000000..dae5501 --- /dev/null +++ b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/pluginCfg.xml @@ -0,0 +1,6 @@ + + + src_edocInspection + 公文督办流程触发 + 20260613 + diff --git a/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/spring/spring-event.xml b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/spring/spring-event.xml new file mode 100644 index 0000000..ee3f8d1 --- /dev/null +++ b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/spring/spring-event.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/spring/spring.xml b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/spring/spring.xml new file mode 100644 index 0000000..d1fb038 --- /dev/null +++ b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_edocInspection/spring/spring.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/ydctu8c/spring/spring-node.xml b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/ydctu8c/spring/spring-node.xml index 3999796..fc2cc96 100644 --- a/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/ydctu8c/spring/spring-node.xml +++ b/v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/ydctu8c/spring/spring-node.xml @@ -38,6 +38,8 @@ + +