hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

差旅报销单修改 

2024年8月21日 17:56:16
This commit is contained in:
xiang2lin 2024-08-21 17:57:08 +08:00
parent 2379d9dd7a
commit 1ec337f22a
6 changed files with 83 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java
View File

@ -77,6 +77,10 @@ public class OerDjmlEntity extends BaseEntity {
private String ssrid;
//送审人
private String ssr;
//经费类型代码
private String jflxdm;
//经费类型名称
private String jflxmc;
//附件对象
@JSONField(ordinal = 9995)
private List<FileInfoDTO> fileInfoList;
@ -487,4 +491,20 @@ public class OerDjmlEntity extends BaseEntity {
public void setClf_cclb(String clf_cclb) {
this.clf_cclb = clf_cclb;
}
public String getJflxdm() {
return jflxdm;
}
public void setJflxdm(String jflxdm) {
this.jflxdm = jflxdm;
}
public String getJflxmc() {
return jflxmc;
}
public void setJflxmc(String jflxmc) {
this.jflxmc = jflxmc;
}
}

9
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
View File

@ -133,6 +133,8 @@ GSDM,KJND,mlId
<if test="ssr != null and ssr !='' "> ssr, </if>
<if test="ssrid != null and ssrid !='' "> ssrid, </if>
<if test="ssrq != null and ssrq !='' "> ssrq, </if>
<if test="jflxdm != null and jflxdm !='' "> jflxdm, </if>
<if test="jflxmc != null and jflxmc !='' "> jflxmc, </if>
<if test="xmdm != null and xmdm !='' "> xmdm, </if>
<if test="xmmc != null and xmmc !='' "> xmmc, </if>
</trim>
@ -178,6 +180,8 @@ GSDM,KJND,mlId
<if test="ssr != null and ssr !='' "> #{ssr}, </if>
<if test="ssrid != null and ssrid !='' "> #{ssrid}, </if>
<if test="ssrq != null and ssrq !='' "> #{ssrq}, </if>
<if test="jflxdm != null and jflxdm !='' "> #{jflxdm}, </if>
<if test="jflxmc != null and jflxmc !='' "> #{jflxmc}, </if>
<if test="xmdm != null and xmdm !='' "> #{xmdm}, </if>
<if test="xmmc != null and xmmc !='' "> #{xmmc}, </if>
</trim>
@ -525,6 +529,11 @@ GSDM,KJND,mlId
<if test="zt != null and zt != ''"> ZT = #{zt},</if>
<if test="curshjd != null and curshjd != ''"> curshjd = #{curshjd},</if>
<if test="nextshjd != null and nextshjd != ''"> nextshjd = #{nextshjd},</if>
ssrid = #{ssrid},
ssr = #{ssr},
ssrq = #{ssrq},
shrid = #{ssrid},
shrq = #{shrq}
</trim>
where MLID = #{mlId} and DJBH = #{djbh}
</update>

47
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
View File

@ -98,7 +98,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
res = travel(headers,eventType,summaryId,grpDataSourceCode,formmainData,forsonData);
}else if(DjlxEnum.EXPENSE.type.equals(djlx)){
//费用报销 expense
res = expense(headers,seeyonData, formmainData, forsonData);
res = expense(headers,eventType,summaryId,grpDataSourceCode, formmainData, forsonData);
}else if (DjlxEnum.LABOR.type.equals(djlx)){
//劳务费 labor
}
@ -116,20 +116,21 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
/**
* 费用报销单
* @param headers 请求头
* @param seeyonData 表单对象
* @param eventType 事件类型
* @param summaryId 流程id
* @param dataSourceCode
* @param formmainData 主表数据
* @param forsonData 子表数据
*/
private String expense(Map<String, String> headers,JSONObject seeyonData, JSONObject formmainData, JSONArray forsonData) {
String eventType = headers.get("eventType");
private String expense(Map<String, String> headers, String eventType,String summaryId, String dataSourceCode,JSONObject formmainData, JSONArray forsonData) {
String djlxid = headers.get("djlxid");
String flowcode = headers.get("flowcode");
String fileApiCode = headers.get("file_api_code");
OerDjmlEntity djml = new OerDjmlEntity();
djml.setLclb(eventType);
djml.setDjbh(formmainData.getString("field0001"));
djml.setDjlxId(djlxid);
djml.setDataSourceCode(dataSourceCode);
JSONObject forsonData0 = forsonData.getJSONObject(0);
//流程发起
if (ColEventTypeEnum.ONSTART.getType().equals(eventType)){
@ -274,7 +275,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
djml.setZy( formmainData.getString("field0009"));
//部门代码
djml.setBmdm(formmainData.getString("field0109"));
djml.setBmmc( "");
djml.setBmmc(formmainData.getString("field0120"));
//项目代码
djml.setXmdm(forjsonData0.getString("field0074"));
djml.setXmmc(forjsonData0.getString("field0075"));
@ -340,18 +341,24 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
djnr.setClf_ccksd(forson.getString("field0018"));
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("field0020"));
djnr.setClf_jtf(forson.getString("field0024"));
djnr.setClf_zsbz(forson.getString("field0077"));
djnr.setClf_jtgj(forson.getString("field0119"));
//住宿费
djnr.setClf_zsbz(forson.getString("field0070"));
djnr.setClf_zsf(forson.getString("field0025"));
//伙食补助是 标准金额
//伙食补助
djnr.setClf_hsbz(forson.getString("field0026"));
//伙食费是 实际报销的金额
djnr.setClf_hsf(forson.getString("field0026"));
djnr.setClf_hsf(forson.getString("field0116"));
//交通补助
djnr.setClf_jtbz(forson.getString("field0024"));
djnr.setClf_jtbzf(forson.getString("field0117"));
djnr.setClf_jtf(forson.getString("field0117"));
//其他
djnr.setClf_qtf(forson.getString("field0028"));
//公杂
djnr.setFjs(djml.getFjs());
djnrList.add(djnr);
//结算方式
@ -400,9 +407,23 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
}else if (ColEventTypeEnum.ONSTOP.getType().equals(eventType)){
//流程终止 修改状态，释放指标
djml.setZt("0");
djml.setCurshjd("0");
djml.setNextshjd("-9");
djml.setSsrid(null);
djml.setSsr(null);
djml.setSsrq(null);
djml.setShrId(null);
djml.setShrq(null);
}else if (ColEventTypeEnum.ONCANCEL.getType().equals(eventType)){
//流程撤销 修改状态，释放指标
djml.setZt("1");
djml.setCurshjd("0");
djml.setNextshjd("-9");
djml.setSsrid(null);
djml.setSsr(null);
djml.setSsrq(null);
djml.setShrId(null);
djml.setShrq(null);
}else if (ColEventTypeEnum.ONPROCESSFINISHED.getType().equals(eventType)){
//流程结束事件
djml.setZt("3");
@ -413,7 +434,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
djml.setFileInfoList(fileInfoList);
}
String djmlStr = JSONObject.toJSONString(djml);
//logger.info("差旅报销单报文：{}",djmlStr);
logger.info("差旅报销单报文：{}",djmlStr);
return djmlStr;
}

5
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
View File

@ -767,6 +767,11 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
oerDjmlAllEntity.setZt(entity.getZt());
oerDjmlAllEntity.setCurshjd(entity.getCurshjd());
oerDjmlAllEntity.setNextshjd(entity.getNextshjd());
oerDjmlAllEntity.setSsrid(entity.getSsrid());
oerDjmlAllEntity.setSsr(entity.getSsr());
oerDjmlAllEntity.setSsrq(entity.getSsrq());
oerDjmlAllEntity.setShrId(entity.getShrId());
oerDjmlAllEntity.setShrq(entity.getShrq());
iOerDjmlDao.updateOerDjml(oerDjmlAllEntity);
//释放指标
GbiZbsyrecAllEntity gbiZbsyrecAllEntity = new GbiZbsyrecAllEntity();

10
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java
View File

@ -57,6 +57,8 @@ public class OerDjnrEntity extends BaseEntity {
private String clf_djzs;
//差旅费-出差天数
private String clf_ccts;
//差旅费-出差补助天数
private String clf_cctsbz;
//差旅费-出差人数
private String clf_ccrs;
//差旅费-职务
@ -462,4 +464,12 @@ public class OerDjnrEntity extends BaseEntity {
public void setClf_qtf(String clf_qtf) {
this.clf_qtf = clf_qtf;
}
public String getClf_cctsbz() {
return clf_cctsbz;
}
public void setClf_cctsbz(String clf_cctsbz) {
this.clf_cctsbz = clf_cctsbz;
}
}

4
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml
View File

@ -93,6 +93,7 @@
<if test="clf_ccdd != null and clf_ccdd !='' "> clf_ccdd, </if>
<if test="clf_ccksd != null and clf_ccksd !='' "> clf_ccksd, </if>
<if test="clf_djzs != null and clf_djzs !='' "> clf_djzs, </if>
<if test="clf_cctsbz != null and clf_cctsbz !='' "> clf_cctsbz, </if>
<if test="clf_ccts != null and clf_ccts !='' "> clf_ccts, </if>
<if test="clf_ccrs != null and clf_ccrs !='' "> clf_ccrs, </if>
<if test="clf_zw != null and clf_zw !='' "> clf_zw, </if>
@ -100,6 +101,7 @@
<if test="clf_jtf != null and clf_jtf !='' "> clf_jtf, </if>
<if test="clf_zsbz != null and clf_zsbz !='' "> clf_zsbz, </if>
<if test="clf_zsf != null and clf_zsf !='' "> clf_zsf, </if>
<if test="clf_hsf != null and clf_hsf !='' "> clf_hsf, </if>
<if test="clf_hsbz != null and clf_hsbz !='' "> clf_hsbz, </if>
<if test="clf_jtbz != null and clf_jtbz !='' "> clf_jtbz, </if>
<if test="clf_jtbzf != null and clf_jtbzf !='' "> clf_jtbzf, </if>
@ -141,6 +143,7 @@
<if test="clf_ccdd != null and clf_ccdd !='' "> #{clf_ccdd}, </if>
<if test="clf_ccksd != null and clf_ccksd !='' "> #{clf_ccksd}, </if>
<if test="clf_djzs != null and clf_djzs !='' "> #{clf_djzs}, </if>
<if test="clf_cctsbz != null and clf_cctsbz !='' "> #{clf_cctsbz}, </if>
<if test="clf_ccts != null and clf_ccts !='' "> #{clf_ccts}, </if>
<if test="clf_ccrs != null and clf_ccrs !='' "> #{clf_ccrs}, </if>
<if test="clf_zw != null and clf_zw !='' "> #{clf_zw}, </if>
@ -148,6 +151,7 @@
<if test="clf_jtf != null and clf_jtf !='' "> #{clf_jtf}, </if>
<if test="clf_zsbz != null and clf_zsbz !='' "> #{clf_zsbz}, </if>
<if test="clf_zsf != null and clf_zsf !='' "> #{clf_zsf}, </if>
<if test="clf_hsf != null and clf_hsf !='' "> #{clf_hsf}, </if>
<if test="clf_hsbz != null and clf_hsbz !='' "> #{clf_hsbz}, </if>
<if test="clf_jtbz != null and clf_jtbz !='' "> #{clf_jtbz}, </if>
<if test="clf_jtbzf != null and clf_jtbzf !='' "> #{clf_jtbzf}, </if>