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 8c083faa..34c75200 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 @@ -381,22 +381,22 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { djml.setCrermc(formmainData.getString("field0172"));//制单人名称 djml.setCrerdate(timestampConvert(formmainData.getString("start_date"),"yyyyMMdd")); djml.setDjdate((timestampConvert(formmainData.getString("field0004"),"yyyyMMdd"))); - djml.setJe(formmainData.getString("field0020"));//金额 - djml.setJedx(formmainData.getString(""));//金额大写 + djml.setJe(formmainData.getString("field0161"));//金额 + djml.setJedx(formmainData.getString("field0105"));//金额大写 djml.setYjje("0.00"); djml.setThje("0.00"); djml.setBlje(formmainData.getString(""));//补领金额 djml.setFjs( formmainData.getString("field0122"));//附件数 djml.setZy( formmainData.getString("field0013"));//摘要 //部门代码 - djml.setBmdm(formmainData.getString("field0176"));//经费使用部门代码 - djml.setBmmc(formmainData.getString("field0177"));//经费使用部门名称 + djml.setBmdm(formmainData.getString("field0169"));//经费使用部门代码 + djml.setBmmc(formmainData.getString("field0170"));//经费使用部门名称 //项目代码 djml.setXmdm(forjsonData0.getString("field0128")); djml.setXmmc(forjsonData0.getString("field0129")); //经办人代码 - djml.setGrdm(formmainData.getString("field0173")); - djml.setGrmc(formmainData.getString("field0174")); + djml.setGrdm(formmainData.getString("field0167")); + djml.setGrmc(formmainData.getString("field0168")); //经济代码- 这个用不到,grp没有启用 djml.setJjdm(""); djml.setJjmc(""); @@ -410,7 +410,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { djml.setJsfs(OerDjmlUtil.spliceStr(forjsonData0.getString("field0182"), forjsonData0.getString("field0156"))); //电话 djml.setTel(formmainData.getString("field0121")); - djml.setClf_ccr(formmainData.getString("")); + //出差人 + djml.setClf_ccr(formmainData.getString("field0190")); //送审日期 djml.setSsrq( DateUtil.format(formmainData.getDate("startDate"),"yyyyMMddHHmmssSSS")); djml.setSsrid(formmainData.getString("field0171")); @@ -450,17 +451,17 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { //模板上没有 djnr.setJflxdm(""); djnr.setJflxmc(""); - djnr.setZy(forson.getString("field0125")); + djnr.setZy(forson.getString("field0160")); 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("field0141")); - djnr.setClf_cctsbz(forson.getString(""));//补助天数 + djnr.setClf_cctsbz(forson.getString("field0199"));//补助天数 djnr.setClf_ccrs(forson.getString("field0140")); djnr.setClf_zw(forson.getString("field0138"));//职务 - djnr.setClf_jtgj(forson.getString("field0139"));//交通工具 + djnr.setClf_jtgj(forson.getString("field0191"));//交通工具 //住宿费 djnr.setClf_zsbz(forson.getString("field0143")); djnr.setClf_zsf(forson.getString("field0144")); @@ -469,7 +470,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { djnr.setClf_hsf(forson.getString("field0146")); //交通补助 djnr.setClf_jtbz(forson.getString("field0147"));//交通补助标准 - djnr.setClf_jtbzf(forson.getString(""));//交通补助实报 + djnr.setClf_jtbzf(forson.getString("field0192"));//交通补助实报 djnr.setClf_jtf(forson.getString("field0148")); //其他 djnr.setClf_qtf(forson.getString("field0151"));