From df93aa68915e383d420ce87d54ed23c8fc8145ba Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Mon, 3 Jun 2024 13:43:15 +0800 Subject: [PATCH] =?UTF-8?q?oa=E5=AF=B9=E6=8E=A5u8=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SeeYonInterFaceImpl.java | 28 +++++++++++++++++-- .../service/impl/SeeyonExtServiceImpl.java | 11 ++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java index 797bfb42..fb8a4253 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java @@ -216,7 +216,7 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace { Object summaryObj = entity.getSummaryObj(); String deeCfgId = entity.getDeeCfgId(); String currentNodeLast = entity.getCurrentNodeLast(); - Map businessData = JSON.parseObject(entity.getBusinessDataStr(), Map.class); + JSONObject businessData = JSON.parseObject(entity.getBusinessDataStr()); Map extData = entity.getExtData(); /** 表单表的FORM ID,用此字段标记是哪个流程*/ String formApp = entity.getFormApp(); @@ -248,12 +248,34 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace { /** 结束事件*/ case "onProcessFinished": if (StrUtil.isNotEmpty(formApp)){ + String type = "_add"; + switch (formApp){ + case "-8691606453890363968"://存货 + JSONObject formmain0227 = businessData.getJSONObject("formmain_0227"); + //新增还是修改 + type = formmain0227.getString("field0014"); + break; + case "6223456019738676230"://供应商 + JSONObject formmain0225 = businessData.getJSONObject("formmain_0225"); + type = formmain0225.getString("field0019"); + break; + case "-9122508232154527168"://客户 + JSONObject formmain0226 = businessData.getJSONObject("formmain_0226"); + type = formmain0226.getString("field0024"); + break; + } + //这个枚举代表修改 + if (type.equals("7858843591961101741")){ + type = "_add"; + }else { + type = "_edit"; + } SysApplicationApiEntity sysApplicationApiEntity = new SysApplicationApiEntity(); - sysApplicationApiEntity.setHeaderIn(formApp); + sysApplicationApiEntity.setHeaderIn(formApp+type); List applist = sysApplicationApiService.queryByLike(sysApplicationApiEntity); if (CollectionUtil.isNotEmpty(applist)){ if (applist.size() > 1){ - return BaseResult.getFailureMessageEntity("根据formID：" + formApp+"查询出多条数据", ""); + return BaseResult.getFailureMessageEntity("根据formApp：" + formApp+"查询出多条数据", ""); } SysApplicationApiEntity sysApp = applist.get(0); Map headerMap = MapBuilder.create(true) diff --git a/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeyonExtServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeyonExtServiceImpl.java index 677a14a2..459aee7a 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeyonExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeyonExtServiceImpl.java @@ -106,7 +106,7 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService { String formApp = sourceBody.getString("formApp"); param.put("formAppId",formApp); param.put("formMainIds",formMainIds); - param.put("dataSourceCode","ht_oa_sqlserver"); + param.put("dataSourceCode","ydc_oa_sqlserver"); param.put("eventType",sourceBody.getString("eventType")); //把返回的单号更新到oa档案表 @@ -183,10 +183,11 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService { JSONObject jsonObject = new JSONObject(); jsonObject.put("billid", formmain0225.getString("id")); jsonObject.put("AccId", formmain0225.getString("field0020")); - jsonObject.put("Token", U8Util.getToken()); + //jsonObject.put("Token", U8Util.getToken()); + jsonObject.put("Token", "Hzya1314_CheckSkip"); JSONObject oArchives = new JSONObject(); oArchives.put("cVenCode", formmain0225.getString("field0002")); - oArchives.put("cVenName ", formmain0225.getString("field0003")); + oArchives.put("cVenName", formmain0225.getString("field0003")); oArchives.put("cVenAbbName", formmain0225.getString("field0004")); oArchives.put("cVCCode", formmain0225.getString("field0006")); oArchives.put("cVenExch_name", formmain0225.getString("field0010")); @@ -206,6 +207,10 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService { oArchives.put("cVenRegCode", formmain0225.getString("field0009")); oArchives.put("cVenBank", formmain0225.getString("field0011")); oArchives.put("cVenAccount", formmain0225.getString("field0012")); + //专管业务员 + oArchives.put("cVenPPerson",formmain0225.getString("field0016")); + //分管部门 + oArchives.put("cVenDepart","field0013"); jsonObject.put("oArchives", oArchives); param.setBodys(JSON.toJSONString(jsonObject)); hzyaExtData.put("billCode", formmain0225.getString("field0001"));