From d774e06d639d7e988876b29a61e432bd95c349bd Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 7 May 2025 11:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E6=97=85=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OerDjmlExtServiceImpl.java | 149 +++++++++--------- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java index daaf6366..8c083faa 100644 --- a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java +++ b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java @@ -225,11 +225,11 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { djml.setFjs(formmainData.getString("field0022"));//附件数 djml.setZy(formmainData.getString("field0023"));//摘要 djml.setBmdm(formmainData.getString("field0052"));//经费使用部门代码 - djml.setBmmc(formmainData.getString("field0041"));//经费使用部门名称 + djml.setBmmc(formmainData.getString("field0051"));//经费使用部门名称 djml.setXmdm(formmainData.getString(""));//项目代码 djml.setXmmc(formmainData.getString(""));//项目名称 - djml.setGrdm(formmainData.getString("field0049"));//报销人代码 - djml.setGrmc(formmainData.getString("field0050"));//报销人名称 + djml.setGrdm(formmainData.getString("field0050"));//报销人代码 + djml.setGrmc(formmainData.getString("field0049"));//报销人名称 djml.setJjdm("");//经济代码 djml.setJjmc("");//经济名称 djml.setYhzh(forsonData0.getString("field0015")); @@ -373,49 +373,49 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { //流程发起 if (ColEventTypeEnum.ONSTART.getType().equals(eventType)){ JSONObject forjsonData0 = forsonData.getJSONObject(0); - djml.setGsdm(forjsonData0.getString("field0079")); - djml.setKjnd(forjsonData0.getString("field0081")); + djml.setGsdm(forjsonData0.getString("field0178")); + djml.setKjnd(forjsonData0.getString("field0180")); djml.setDjlxId(djlxid); djml.setZt("2"); - djml.setCrerdm(formmainData.getString("field0084")); - djml.setCrermc(formmainData.getString("field0087")); + djml.setCrerdm(formmainData.getString("field0171"));//制单人代码 + djml.setCrermc(formmainData.getString("field0172"));//制单人名称 djml.setCrerdate(timestampConvert(formmainData.getString("start_date"),"yyyyMMdd")); - djml.setDjdate((timestampConvert(formmainData.getString("field0008"),"yyyyMMdd"))); - djml.setJe(formmainData.getString("field0046")); - djml.setJedx(formmainData.getString("field0047")); + djml.setDjdate((timestampConvert(formmainData.getString("field0004"),"yyyyMMdd"))); + djml.setJe(formmainData.getString("field0020"));//金额 + djml.setJedx(formmainData.getString(""));//金额大写 djml.setYjje("0.00"); djml.setThje("0.00"); - djml.setBlje(formmainData.getString("field0090")); - djml.setFjs( formmainData.getString("field0007")); - djml.setZy( formmainData.getString("field0010")); + djml.setBlje(formmainData.getString(""));//补领金额 + djml.setFjs( formmainData.getString("field0122"));//附件数 + djml.setZy( formmainData.getString("field0013"));//摘要 //部门代码 - djml.setBmdm(formmainData.getString("field0093")); - djml.setBmmc(formmainData.getString("field0092")); + djml.setBmdm(formmainData.getString("field0176"));//经费使用部门代码 + djml.setBmmc(formmainData.getString("field0177"));//经费使用部门名称 //项目代码 - djml.setXmdm(forjsonData0.getString("field0017")); - djml.setXmmc(forjsonData0.getString("field0018")); - //个人代码 - djml.setGrdm(formmainData.getString("field0085")); - djml.setGrmc(formmainData.getString("field0088")); - //经济代码 + djml.setXmdm(forjsonData0.getString("field0128")); + djml.setXmmc(forjsonData0.getString("field0129")); + //经办人代码 + djml.setGrdm(formmainData.getString("field0173")); + djml.setGrmc(formmainData.getString("field0174")); + //经济代码- 这个用不到，grp没有启用 djml.setJjdm(""); djml.setJjmc(""); //银行帐号 开户银行 - djml.setYhzh(forjsonData0.getString("field0045")); - djml.setKhyh(forjsonData0.getString("field0044")); + djml.setYhzh(forjsonData0.getString("field0159")); + djml.setKhyh(forjsonData0.getString("field0158")); //当前审核节点、下个审核节点 ,不在grp审批，是不是不用填了 djml.setCurshjd("-9"); djml.setNextshjd("999"); djml.setFlowcode(flowcode); - djml.setJsfs(OerDjmlUtil.spliceStr(forjsonData0.getString("field0086"), forjsonData0.getString("field0042"))); + djml.setJsfs(OerDjmlUtil.spliceStr(forjsonData0.getString("field0182"), forjsonData0.getString("field0156"))); //电话 - djml.setTel(formmainData.getString("field0005")); - djml.setClf_ccr(formmainData.getString("field0089")); + djml.setTel(formmainData.getString("field0121")); + djml.setClf_ccr(formmainData.getString("")); //送审日期 djml.setSsrq( DateUtil.format(formmainData.getDate("startDate"),"yyyyMMddHHmmssSSS")); - djml.setSsrid(formmainData.getString("field0085")); - djml.setSsr(formmainData.getString("field0088")); - djml.setClf_cclb(forjsonData0.getString("field0019")); + djml.setSsrid(formmainData.getString("field0171")); + djml.setSsr(formmainData.getString("field0172")); + djml.setClf_cclb(forjsonData0.getString("field0130")); //报销明细 List djnrList = new ArrayList<>(); //结算方式 @@ -425,9 +425,9 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { int xh = 1; for (int i = 0; i< forsonData.size(); i++) { JSONObject forson = forsonData.getJSONObject(i); - String gsdm = forson.getString("field0079"); - String kjnd = forson.getString("field0081"); - String je = forson.getString("field0031"); + String gsdm = forson.getString("field0178"); + String kjnd = forson.getString("field0180"); + String je = forson.getString("field0155"); //单据内容 OerDjnrEntity djnr = new OerDjnrEntity(); djnr.setXh(String.valueOf(xh)); @@ -436,42 +436,43 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { djnr.setDjlxId(djlxid); djnr.setBnxId(headers.get("bxmx_bnxid")); djnr.setJe(je); - djnr.setBmdm(forson.getString("field0073")); - djnr.setBmmc(forson.getString("field0020")); - djnr.setXmdm(forson.getString("field0017")); - djnr.setXmmc(forson.getString("field0018")); + djnr.setBmdm(forson.getString("field0184")); + djnr.setBmmc(forson.getString("field0185")); + djnr.setXmdm(forson.getString("field0128")); + djnr.setXmmc(forson.getString("field0129")); djnr.setJjdm(""); djnr.setJjmc(""); - //grp库里有，不知道是什么 1001基本支出 2001项目支出（网银） + //没用到，模板上没配置这个字段 djnr.setFzx8dm(""); djnr.setFzx8mc(""); //指标id - djnr.setZbId(forson.getString("field0071")); + djnr.setZbId(forson.getString("field0126")); + //模板上没有 djnr.setJflxdm(""); djnr.setJflxmc(""); - djnr.setZy(forson.getString("field0041")); - djnr.setClf_startdate(timestampConvert(forson.getString("field0022"),"yyyy-MM-dd")); - djnr.setClf_enddate(timestampConvert(forson.getString("field0023"),"yyyy-MM-dd")); - djnr.setClf_ccdd(forson.getString("field0025")); - djnr.setClf_ccksd(forson.getString("field0024")); + djnr.setZy(forson.getString("field0125")); + djnr.setClf_startdate(timestampConvert(forson.getString("field0134"),"yyyy-MM-dd")); + djnr.setClf_enddate(timestampConvert(forson.getString("field0135"),"yyyy-MM-dd")); + djnr.setClf_ccdd(forson.getString("field0137")); + djnr.setClf_ccksd(forson.getString("field0136")); djnr.setClf_djzs(djml.getFjs()); - djnr.setClf_ccts(forson.getString("field0029")); - djnr.setClf_cctsbz(forson.getString("field0031")); - djnr.setClf_ccrs(forson.getString("field0028")); - djnr.setClf_zw(forson.getString("field0026")); - djnr.setClf_jtgj(forson.getString("field0091")); + djnr.setClf_ccts(forson.getString("field0141")); + djnr.setClf_cctsbz(forson.getString(""));//补助天数 + djnr.setClf_ccrs(forson.getString("field0140")); + djnr.setClf_zw(forson.getString("field0138"));//职务 + djnr.setClf_jtgj(forson.getString("field0139"));//交通工具 //住宿费 - djnr.setClf_zsbz(forson.getString("field0032")); - djnr.setClf_zsf(forson.getString("field0033")); + djnr.setClf_zsbz(forson.getString("field0143")); + djnr.setClf_zsf(forson.getString("field0144")); //伙食补助 - djnr.setClf_hsbz(forson.getString("field0034")); - djnr.setClf_hsf(forson.getString("field0035")); + djnr.setClf_hsbz(forson.getString("field0145")); + djnr.setClf_hsf(forson.getString("field0146")); //交通补助 - djnr.setClf_jtbz(forson.getString("field0068")); - djnr.setClf_jtbzf(forson.getString("field0036")); - djnr.setClf_jtf(forson.getString("field0036")); + djnr.setClf_jtbz(forson.getString("field0147"));//交通补助标准 + djnr.setClf_jtbzf(forson.getString(""));//交通补助实报 + djnr.setClf_jtf(forson.getString("field0148")); //其他 - djnr.setClf_qtf(forson.getString("field0039")); + djnr.setClf_qtf(forson.getString("field0151")); //公杂 djnr.setFjs(djml.getFjs()); @@ -483,31 +484,31 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { jsfs.setDjlxId(djlxid); jsfs.setBnxid(headers.get("jsfs_bnxid")); jsfs.setXh(String.valueOf(xh)); - jsfs.setJsfsdm(forson.getString("field0086")); - jsfs.setJsfsmc(forson.getString("field0042")); - jsfs.setKmdm(forson.getString("field0074")); - jsfs.setKmmc(forson.getString("field0021")); - jsfs.setSkr(forson.getString("field0043")); - jsfs.setKhyh(forson.getString("field0044")); - jsfs.setYhzh(forson.getString("field0045")); + jsfs.setJsfsdm(forson.getString("field0182")); + jsfs.setJsfsmc(forson.getString("field0156")); + jsfs.setKmdm(forson.getString("")); + jsfs.setKmmc(forson.getString("")); + jsfs.setSkr(forson.getString("field0157")); + jsfs.setKhyh(forson.getString("field0158")); + jsfs.setYhzh(forson.getString("field0159")); jsfs.setJe(je); - jsfs.setYh(""); - jsfs.setYhhh(""); - jsfs.setProvince(""); - jsfs.setCity(""); + jsfs.setYh("");//银行类型 例如 招商银行 + jsfs.setYhhh("");// 联行号 + jsfs.setProvince("");//省 + jsfs.setCity("");//市 //支付方式为个人、公务卡时 可以选择 经办人、负责人、其他 - jsfs.setRytype(""); - //oa没有 - jsfs.setYt(forson.getString("field0041")); + jsfs.setRytype("");//人员类型 + //用途 + jsfs.setYt(forson.getString("field0125")); jsfsList.add(jsfs); //预算指标 OerYszbEntity yszb = new OerYszbEntity(); BeanUtil.copyProperties(djnr,yszb); yszb.setBnxId(headers.get("yszb_bnxid")); - yszb.setZbdm(forson.getString("field0071")); - yszb.setZy(forson.getString("field0078")); - yszb.setKmdm(forson.getString("field0074")); - yszb.setKmmc(forson.getString("field0021")); + yszb.setZbdm(forson.getString("field0181")); + yszb.setZy(forson.getString("field0125")); + yszb.setKmdm(forson.getString("")); + yszb.setKmmc(forson.getString("")); yszb.setXh(String.valueOf(xh)); yszbList.add(yszb); xh++;