差旅报销单参数处理
This commit is contained in:
parent
482352e9ce
commit
2329d34439
|
@ -14,10 +14,10 @@ import com.hzya.frame.grpU8.nxproof.oerdjml.dto.FileInfoDTO;
|
|||
import com.hzya.frame.grpU8.nxproof.oerdjml.entity.GrpU8CollAttachmentResDTO;
|
||||
import com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity;
|
||||
import com.hzya.frame.grpU8.nxproof.oerdjml.entity.RestUtil;
|
||||
import com.hzya.frame.grpU8.nxproof.oerdjml.enums.ColEventTypeEnum;
|
||||
import com.hzya.frame.grpU8.nxproof.oerdjml.service.IOerDjmlExtService;
|
||||
import com.hzya.frame.grpU8.nxproof.oerdjnr.entity.OerDjnrEntity;
|
||||
import com.hzya.frame.grpU8.nxproof.oeryszb.entity.OerYszbEntity;
|
||||
import com.hzya.frame.seeyon.enums.ColEventTypeEnum;
|
||||
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
|
||||
import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService;
|
||||
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
|
||||
|
@ -258,49 +258,49 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
|
|||
//流程发起
|
||||
if (ColEventTypeEnum.ONSTART.getType().equals(eventType)){
|
||||
JSONObject forjsonData0 = forsonData.getJSONObject(0);
|
||||
djml.setGsdm(forjsonData0.getString("field0084"));
|
||||
djml.setKjnd(forjsonData0.getString("field0082"));
|
||||
djml.setGsdm(forjsonData0.getString("field0079"));
|
||||
djml.setKjnd(forjsonData0.getString("field0081"));
|
||||
djml.setDjlxId(djlxid);
|
||||
djml.setZt("2");
|
||||
djml.setCrerdm(formmainData.getString("field0107"));
|
||||
djml.setCrermc(formmainData.getString("field0114"));
|
||||
djml.setCrerdm(formmainData.getString("field0084"));
|
||||
djml.setCrermc(formmainData.getString("field0087"));
|
||||
djml.setCrerdate(timestampConvert(formmainData.getString("start_date"),"yyyyMMdd"));
|
||||
djml.setDjdate((timestampConvert(formmainData.getString("field0002"),"yyyyMMdd")));
|
||||
djml.setJe(formmainData.getString("field0033"));
|
||||
djml.setJedx(formmainData.getString("field0034"));
|
||||
djml.setDjdate((timestampConvert(formmainData.getString("field0008"),"yyyyMMdd")));
|
||||
djml.setJe(formmainData.getString("field0046"));
|
||||
djml.setJedx(formmainData.getString("field0047"));
|
||||
djml.setYjje("0.00");
|
||||
djml.setThje("0.00");
|
||||
djml.setBlje(formmainData.getString("field0080"));
|
||||
djml.setFjs( formmainData.getString("field0004"));
|
||||
djml.setZy( formmainData.getString("field0009"));
|
||||
djml.setBlje(formmainData.getString("field0090"));
|
||||
djml.setFjs( formmainData.getString("field0007"));
|
||||
djml.setZy( formmainData.getString("field0010"));
|
||||
//部门代码
|
||||
djml.setBmdm(formmainData.getString("field0109"));
|
||||
djml.setBmmc(formmainData.getString("field0120"));
|
||||
djml.setBmdm(formmainData.getString("field0093"));
|
||||
djml.setBmmc(formmainData.getString("field0092"));
|
||||
//项目代码
|
||||
djml.setXmdm(forjsonData0.getString("field0074"));
|
||||
djml.setXmmc(forjsonData0.getString("field0075"));
|
||||
djml.setXmdm(forjsonData0.getString("field0017"));
|
||||
djml.setXmmc(forjsonData0.getString("field0018"));
|
||||
//个人代码
|
||||
djml.setGrdm(formmainData.getString("field0108"));
|
||||
djml.setGrmc(formmainData.getString("field0115"));
|
||||
djml.setGrdm(formmainData.getString("field0085"));
|
||||
djml.setGrmc(formmainData.getString("field0088"));
|
||||
//经济代码
|
||||
djml.setJjdm("");
|
||||
djml.setJjmc("");
|
||||
//银行帐号 开户银行
|
||||
djml.setYhzh(forjsonData0.getString("field0079"));
|
||||
djml.setKhyh(forjsonData0.getString("field0078"));
|
||||
djml.setYhzh(forjsonData0.getString("field0045"));
|
||||
djml.setKhyh(forjsonData0.getString("field0044"));
|
||||
//当前审核节点、下个审核节点 ,不在grp审批,是不是不用填了
|
||||
djml.setCurshjd("-9");
|
||||
djml.setNextshjd("999");
|
||||
djml.setFlowcode(flowcode);
|
||||
djml.setJsfs(spliceStr(forjsonData0.getString("field0095"), forjsonData0.getString("field0094")));
|
||||
//电话,oa上没有
|
||||
djml.setTel(formmainData.getString("field0110"));
|
||||
djml.setClf_ccr(formmainData.getString("field0113"));
|
||||
djml.setJsfs(spliceStr(forjsonData0.getString("field0086"), forjsonData0.getString("field0042")));
|
||||
//电话
|
||||
djml.setTel(formmainData.getString("field0005"));
|
||||
djml.setClf_ccr(formmainData.getString("field0089"));
|
||||
//送审日期
|
||||
djml.setSsrq( DateUtil.format(formmainData.getDate("startDate"),"yyyyMMddHHmmssSSS"));
|
||||
djml.setSsrid(formmainData.getString("field0108"));
|
||||
djml.setSsr(formmainData.getString("field0115"));
|
||||
djml.setClf_cclb(forjsonData0.getString("field0098"));
|
||||
djml.setSsrid(formmainData.getString("field0085"));
|
||||
djml.setSsr(formmainData.getString("field0088"));
|
||||
djml.setClf_cclb(forjsonData0.getString("field0019"));
|
||||
//报销明细
|
||||
List<OerDjnrEntity> djnrList = new ArrayList<>();
|
||||
//结算方式
|
||||
|
@ -310,9 +310,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("field0084");
|
||||
String kjnd = forson.getString("field0082");
|
||||
String je = forson.getString("field0029");
|
||||
String gsdm = forson.getString("field0079");
|
||||
String kjnd = forson.getString("field0081");
|
||||
String je = forson.getString("field0031");
|
||||
//单据内容
|
||||
OerDjnrEntity djnr = new OerDjnrEntity();
|
||||
djnr.setXh(String.valueOf(xh));
|
||||
|
@ -321,42 +321,42 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
|
|||
djnr.setDjlxId(djlxid);
|
||||
djnr.setBnxId(headers.get("bxmx_bnxid"));
|
||||
djnr.setJe(je);
|
||||
djnr.setBmdm(forson.getString("field0088"));
|
||||
djnr.setBmmc(forson.getString("field0087"));
|
||||
djnr.setXmdm(forson.getString("field0074"));
|
||||
djnr.setXmmc(forson.getString("field0075"));
|
||||
djnr.setBmdm(forson.getString("field0073"));
|
||||
djnr.setBmmc(forson.getString("field0020"));
|
||||
djnr.setXmdm(forson.getString("field0017"));
|
||||
djnr.setXmmc(forson.getString("field0018"));
|
||||
djnr.setJjdm("");
|
||||
djnr.setJjmc("");
|
||||
//grp库里有,不知道是什么 1001基本支出 2001项目支出(网银)
|
||||
djnr.setFzx8dm("");
|
||||
djnr.setFzx8mc("");
|
||||
//指标id
|
||||
djnr.setZbId(forson.getString("field0085"));
|
||||
djnr.setZbId(forson.getString("field0071"));
|
||||
djnr.setJflxdm("");
|
||||
djnr.setJflxmc("");
|
||||
djnr.setZy(forson.getString("field0030"));
|
||||
djnr.setClf_startdate(timestampConvert(forson.getString("field0016"),"yyyy-MM-dd"));
|
||||
djnr.setClf_enddate(timestampConvert(forson.getString("field0017"),"yyyy-MM-dd"));
|
||||
djnr.setClf_ccdd(forson.getString("field0019"));
|
||||
djnr.setClf_ccksd(forson.getString("field0018"));
|
||||
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.setClf_djzs(djml.getFjs());
|
||||
djnr.setClf_ccts(forson.getString("field0023"));
|
||||
djnr.setClf_cctsbz(forson.getString("field0023"));
|
||||
djnr.setClf_ccrs(forson.getString("field0021"));
|
||||
djnr.setClf_zw(forson.getString("field0092"));
|
||||
djnr.setClf_jtgj(forson.getString("field0119"));
|
||||
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_zsbz(forson.getString("field0070"));
|
||||
djnr.setClf_zsf(forson.getString("field0025"));
|
||||
djnr.setClf_zsbz(forson.getString("field0032"));
|
||||
djnr.setClf_zsf(forson.getString("field0033"));
|
||||
//伙食补助
|
||||
djnr.setClf_hsbz(forson.getString("field0026"));
|
||||
djnr.setClf_hsf(forson.getString("field0116"));
|
||||
djnr.setClf_hsbz(forson.getString("field0034"));
|
||||
djnr.setClf_hsf(forson.getString("field0035"));
|
||||
//交通补助
|
||||
djnr.setClf_jtbz(forson.getString("field0024"));
|
||||
djnr.setClf_jtbzf(forson.getString("field0117"));
|
||||
djnr.setClf_jtf(forson.getString("field0117"));
|
||||
djnr.setClf_jtbz(forson.getString("field0068"));
|
||||
djnr.setClf_jtbzf(forson.getString("field0036"));
|
||||
djnr.setClf_jtf(forson.getString("field0036"));
|
||||
//其他
|
||||
djnr.setClf_qtf(forson.getString("field0028"));
|
||||
djnr.setClf_qtf(forson.getString("field0039"));
|
||||
//公杂
|
||||
|
||||
djnr.setFjs(djml.getFjs());
|
||||
|
@ -368,13 +368,13 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
|
|||
jsfs.setDjlxId(djlxid);
|
||||
jsfs.setBnxid(headers.get("jsfs_bnxid"));
|
||||
jsfs.setXh(String.valueOf(xh));
|
||||
jsfs.setJsfsdm(forson.getString("field0095"));
|
||||
jsfs.setJsfsmc(forson.getString("field0094"));
|
||||
jsfs.setKmdm(forson.getString("field0089"));
|
||||
jsfs.setKmmc(forson.getString("field0066"));
|
||||
jsfs.setSkr(forson.getString("field0096"));
|
||||
jsfs.setKhyh(forson.getString("field0078"));
|
||||
jsfs.setYhzh(forson.getString("field0079"));
|
||||
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.setJe(je);
|
||||
jsfs.setYh("");
|
||||
jsfs.setYhhh("");
|
||||
|
@ -383,16 +383,16 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
|
|||
//支付方式为个人、公务卡时 可以选择 经办人、负责人、其他
|
||||
jsfs.setRytype("");
|
||||
//oa没有
|
||||
jsfs.setYt(forson.getString("field0030"));
|
||||
jsfs.setYt(forson.getString("field0041"));
|
||||
jsfsList.add(jsfs);
|
||||
//预算指标
|
||||
OerYszbEntity yszb = new OerYszbEntity();
|
||||
BeanUtil.copyProperties(djnr,yszb);
|
||||
yszb.setBnxId(headers.get("yszb_bnxid"));
|
||||
yszb.setZbdm(forson.getString("field0085"));
|
||||
yszb.setZy(forson.getString("field0111"));
|
||||
yszb.setKmdm(forson.getString("field0089"));
|
||||
yszb.setKmmc(forson.getString("field0066"));
|
||||
yszb.setZbdm(forson.getString("field0071"));
|
||||
yszb.setZy(forson.getString("field0078"));
|
||||
yszb.setKmdm(forson.getString("field0074"));
|
||||
yszb.setKmmc(forson.getString("field0021"));
|
||||
yszb.setXh(String.valueOf(xh));
|
||||
yszbList.add(yszb);
|
||||
xh++;
|
||||
|
|
Loading…
Reference in New Issue