From 432abf3943c694b36821f506f64dddec92e844c3 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Tue, 20 Aug 2024 14:22:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=AE=E6=97=85=E6=8A=A5=E9=94=80?=
 =?UTF-8?q?=E5=8D=95=202024=E5=B9=B48=E6=9C=8820=E6=97=A5=2014:22:10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/impl/AttachmentFileDaoImpl.java       |  2 +-
 .../oerannex/dao/impl/OerAnnexDaoImpl.java    |  6 +-
 .../nxproof/oerdjml/entity/OerDjmlEntity.xml  |  2 +
 .../service/impl/OerDjmlExtServiceImpl.java   | 74 +++++++++++--------
 .../service/impl/OerDjmlServiceImpl.java      |  3 +
 .../service/impl/SeeYonInterFaceImpl.java     |  2 +-
 .../com/hzya/frame/seeyon/util/RestUtil.java  | 37 ++++++++--
 7 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java
index 13a8a64b..3de2969b 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java
@@ -17,7 +17,7 @@ public class AttachmentFileDaoImpl extends MybatisGenericDao<AttachmentFileEntit
     @DS("#entity.dataSourceCode")
     @Override
     public Integer saveData(AttachmentFileEntity entity) {
-        Integer o = super.insert(getSqlIdPrifx() + "AttachmentFileEntity_insert", entity);
+        Integer o = super.insert("com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity.AttachmentFileEntity_insert", entity);
         return o;
     }
 }
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java
index 29bb95b6..bb6c8eb9 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerannex/dao/impl/OerAnnexDaoImpl.java
@@ -20,21 +20,21 @@ public class OerAnnexDaoImpl extends MybatisGenericDao<OerAnnexEntity, String> i
     @DS("#entity.dataSourceCode")
     @Override
     public Integer deleteAnnex(OerAnnexEntity entity) {
-        Integer o = super.delete(getSqlIdPrifx() + "OerAnnexEntity_delete", entity);
+        Integer o = super.delete( "com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_delete", entity);
         return o;
     }
 
     @DS("#entity.dataSourceCode")
     @Override
     public OerAnnexEntity queryMaxId(OerAnnexEntity entity) {
-        OerAnnexEntity o = super.query(entity,getSqlIdPrifx() + "OerAnnexEntity_max_id");
+        OerAnnexEntity o = super.query(entity,"com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_max_id");
         return o;
     }
 
     @DS("#entity.dataSourceCode")
     @Override
     public Integer saveData(OerAnnexEntity entity) {
-        Integer o = super.insert(getSqlIdPrifx() + "entity_insert",entity);
+        Integer o = super.insert("com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity.OerAnnexEntity_insert",entity);
         return o;
     }
 }
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
index dbc60495..ea2e98d1 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
@@ -270,6 +270,8 @@ GSDM,KJND,mlId
     <select id="queryOerDjml" resultType="com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity" parameterType = "com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity">
         select
         mlId,
+        kjnd,
+        gsdm,
         DJBH
         from OER_DJML
         <trim prefix="where" prefixOverrides="and">
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
index 7ea4b6f0..0e5ea9e9 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -73,14 +74,14 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
                 }
             }
             Map<String, String> headers = entity.getHeaders();
-            String eventType = headers.get("eventType");
             String formmainTableName = headers.get("formmainTableName");
             String forsonTableName = headers.get("forsonTableName");
-            String djlxid = headers.get("djlxid");
             String djlx = headers.get("djlx");
-            String flowcode = headers.get("flowcode");
-            String fileApiCode = headers.get("file_api_code");
             JSONObject bodyObj =  JSONObject.parseObject(bodys);
+            //事件类型
+            String eventType = bodyObj.getString("eventType");
+            //summaryId
+            String summaryId = bodyObj.getString("summaryId");
             JSONObject seeyonData = bodyObj.getJSONObject("businessDataStr");
             if (null != seeyonData){
                 /**
@@ -94,16 +95,16 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
                 String res = "";
                 if (DjlxEnum.TRAVEL.type.equals(djlx)) {
                     //差旅报销 travel
-                    res = travel(headers, eventType, djlxid, flowcode, fileApiCode, seeyonData, formmainData, forsonData);
+                    res = travel(headers,eventType,summaryId,grpDataSourceCode,formmainData,forsonData);
                 }else if(DjlxEnum.EXPENSE.type.equals(djlx)){
                     //费用报销 expense
-                    res = expense(headers, eventType, djlxid, flowcode, fileApiCode, seeyonData, formmainData, forsonData);
+                    res = expense(headers,seeyonData, formmainData, forsonData);
                 }else if (DjlxEnum.LABOR.type.equals(djlx)){
                     //劳务费 labor
                 }
                 if (StrUtil.isNotEmpty(res)){
                     entity.setBodys(res);
-                    //return entity;
+                    return entity;
                 }
             }
         }catch (Exception ex ){
@@ -115,15 +116,16 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
     /**
      * 费用报销单
      * @param headers 请求头
-     * @param eventType 事件类型
-     * @param djlxid 单据类型id
-     * @param flowcode 流程编码
-     * @param fileApiCode 附件下载apicode
      * @param seeyonData 表单对象
      * @param formmainData 主表数据
      * @param forsonData 子表数据
      */
-    private String expense(Map<String, String> headers, String eventType, String djlxid, String flowcode, String fileApiCode, JSONObject seeyonData, JSONObject formmainData, JSONArray forsonData) {
+    private String expense(Map<String, String> headers,JSONObject seeyonData, JSONObject formmainData, JSONArray forsonData) {
+        String eventType = headers.get("eventType");
+        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"));
@@ -136,8 +138,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setZt("2");
             djml.setCrerdm("");
             djml.setCrermc("");
-            djml.setCrerdate(timestampConvert(formmainData.getString("start_date")));
-            djml.setDjdate(timestampConvert(formmainData.getString("field0016")));
+            djml.setCrerdate(timestampConvert(formmainData.getString("start_date"),"yyyyMMdd"));
+            djml.setDjdate(timestampConvert(formmainData.getString("field0016"),"yyyyMMdd"));
             djml.setJe(formmainData.getString("field0052"));
             djml.setJedx(formmainData.getString("field0071"));
             djml.setYjje("0.00");
@@ -239,17 +241,19 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
      * 差旅报销单
      * @param headers 请求头
      * @param eventType 事件类型
-     * @param djlxid 单据类型id
-     * @param flowcode 流程编码
-     * @param fileApiCode 附件下载apicode
-     * @param seeyonData 表单对象
+     * @param summaryId 流程id
+     * @param dataSourceCode
      * @param formmainData 主表数据
      * @param forsonData 子表数据
      */
-    private String travel(Map<String, String> headers, String eventType, String djlxid, String flowcode, String fileApiCode, JSONObject seeyonData, JSONObject formmainData, JSONArray forsonData) {
+    private String travel(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.setDataSourceCode(dataSourceCode);
         //流程发起
         if (ColEventTypeEnum.ONSTART.getType().equals(eventType)){
             JSONObject forjsonData0 = forsonData.getJSONObject(0);
@@ -259,8 +263,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setZt("2");
             djml.setCrerdm(formmainData.getString("field0107"));
             djml.setCrermc(formmainData.getString("field0114"));
-            djml.setCrerdate(timestampConvert(formmainData.getString("start_date")));
-            djml.setDjdate((timestampConvert(formmainData.getString("field0002"))));
+            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.setYjje("0.00");
@@ -295,7 +299,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setSsrq( DateUtil.format(formmainData.getDate("startDate"),"yyyyMMddHHmmssSSS"));
             djml.setSsrid(formmainData.getString("field0108"));
             djml.setSsr(formmainData.getString("field0115"));
-
+            djml.setClf_cclb(forjsonData0.getString("field0098"));
             //报销明细
             List<OerDjnrEntity> djnrList = new ArrayList<>();
             //结算方式
@@ -330,8 +334,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
                 djnr.setJflxdm("");
                 djnr.setJflxmc("");
                 djnr.setZy(forson.getString("field0030"));
-                djnr.setClf_startdate(forson.getString("field0016"));
-                djnr.setClf_enddate(forson.getString("field0017"));
+                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.setClf_djzs(djml.getFjs());
@@ -405,20 +409,21 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setCurshjd("999");
             djml.setNextshjd("-1");
             //查询协同附件
-            List<FileInfoDTO> fileInfoList = fileDownload(seeyonData.getString("summaryId"), fileApiCode);
+            List<FileInfoDTO> fileInfoList = fileDownload(summaryId, fileApiCode);
             djml.setFileInfoList(fileInfoList);
         }
         String djmlStr = JSONObject.toJSONString(djml);
-        logger.info("差旅报销单报文：{}",djmlStr);
+        //logger.info("差旅报销单报文：{}",djmlStr);
         return djmlStr;
     }
 
     /**
-     * 时间戳转成  yyyyMMdd
-     * @param timestamp
+     * 时间戳转成  指定格式
+     * @param timestamp 时间戳
+     * @param format 格式
      * @return
      */
-    private String timestampConvert(String timestamp){
+    private String timestampConvert(String timestamp,String format){
         if (StrUtil.isNotEmpty(timestamp) && NumberUtil.isNumber(timestamp)){
             try {
                 DateTime date = DateUtil.date(Long.valueOf(timestamp));
@@ -439,15 +444,19 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
      */
     private List<FileInfoDTO> fileDownload(String summaryId,String apiCode){
         try {
-            List<CollAttachmentResDTO> colAttachmentList = restUtil.getColAttachments(summaryId, "0", apiCode, "hzya");
+            List<CollAttachmentResDTO> colAttachmentList = restUtil.getColAttachments(summaryId, "0", apiCode, null);
             //下载协同附件
             if (CollectionUtils.isNotEmpty(colAttachmentList)){
+                String token = restUtil.getToken(null, apiCode);
                 List<FileInfoDTO> fileList = new ArrayList<>();
                 for (CollAttachmentResDTO att : colAttachmentList) {
                     FileInfoDTO fileInfoDTO = new FileInfoDTO();
 
                     String fileName = URLDecoder.decode(att.getFilename(), "UTF-8");
-                    byte[] bytes = restUtil.downloadFileBytes("hzya", apiCode, att.getFileUrl(), fileName);
+                    byte[] bytes = restUtil.downloadFileBytes(null, apiCode, att.getFileUrl(), fileName,token);
+                    if (!FileUtil.isDirectory(DSK+ File.separator+DateUtil.today())){
+                        FileUtil.mkdir(DSK+ File.separator+DateUtil.today());
+                    }
                     String filePath = DSK+ File.separator+DateUtil.today()+File.separator+att.getFileUrl()+"."+att.getExtension();
                     File file = new File(filePath);
                     // 使用 FileOutputStream 写入字节数组到文件
@@ -455,7 +464,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
                         fos.write(bytes);
                     }
                     if (null != file){
-                        String zipPath = DSK+File.separator+DateUtil.today()+File.separator+att.getSubReference()+".zip";
+                        String zipPath = DSK+File.separator+DateUtil.today()+File.separator+att.getFileUrl()+".zip";
                         ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipPath), Charset.forName("GBK"));
                         writeZipFile(file, zos, fileName);
                         zos.close();
@@ -476,6 +485,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
                         fileList.add(fileInfoDTO);
                     }
                 }
+                return fileList;
             }
         }catch (Exception e){
             logger.error("下载附件出错:{}",e);
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
index 38e94603..72a87768 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
@@ -765,6 +765,8 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
                 //修改状态
                 oerDjmlAllEntity.setMlId(oerDjmlAllEntities.get(0).getMlId());
                 oerDjmlAllEntity.setZt(entity.getZt());
+                oerDjmlAllEntity.setCurshjd(entity.getCurshjd());
+                oerDjmlAllEntity.setNextshjd(entity.getNextshjd());
                 iOerDjmlDao.updateOerDjml(oerDjmlAllEntity);
                 //释放指标
                 GbiZbsyrecAllEntity gbiZbsyrecAllEntity = new GbiZbsyrecAllEntity();
@@ -844,6 +846,7 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
                             annexEntity.setDataSourceCode(entity.getDataSourceCode());
                             annexEntity.setMlid(oerDjmlAllEntities.get(0).getMlId());
                             annexEntity.setKjnd(oerDjmlAllEntities.get(0).getKjnd());
+                            annexEntity.setGsdm(oerDjmlAllEntities.get(0).getGsdm());
                             annexEntity.setAnnexName(fileName);
                             annexEntity.setAnnexSize(Convert.toLong(fileInfo.getFile_size()));
                             annexEntity.setOnlyid(fileEntity.getaTGuid());
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 60adecc0..639065a7 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
@@ -390,7 +390,7 @@ public class SeeYonInterFaceImpl implements ISeeYonInterFace {
                     object.put("eventType",eventType);
                     object.put("businessDataStr",seeYonBean.toJSONString());
                     object.put("affairId","");
-                    object.put("summaryId",interFaceEntity.getSummaryId());
+                    object.put("summaryId",requestData.getString("summaryId"));
                     object.put("currentActivityId","");
                     object.put("id",forMainId);
                     object.put("hzyaExtData",requestData.getJSONObject("hzyaExtData"));
diff --git a/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java b/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
index 429d1084..2259638a 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
@@ -81,7 +81,7 @@ public class RestUtil {
         if (StrUtil.isNotEmpty(summaryId) && StrUtil.isNotEmpty(apiCode)){
             SysApplicationApiEntity sysApp = getByCode(apiCode);
             String token = getToken(loginName,sysApp);
-            String appUrl = sysApp.getAppUrl();
+            String appUrl = StrUtil.removeSuffix(sysApp.getAppUrl(),"/");
             if (StrUtil.isEmpty(attType)){
                 attType = "0";
             }
@@ -95,6 +95,7 @@ public class RestUtil {
         }
         return null;
     }
+
     /**
      * 附件下载
      * @param loginName oa登录名
@@ -107,7 +108,32 @@ public class RestUtil {
         if (StrUtil.isNotEmpty(apiCode)){
             SysApplicationApiEntity sysApp = getByCode(apiCode);
             String token = getToken(loginName,sysApp);
-            String appUrl = sysApp.getAppUrl();
+            String appUrl = StrUtil.removeSuffix(sysApp.getAppUrl(),"/");
+            String url = "/seeyon/rest/attachment/file/@ctp_file_ID@?fileName=@文件名@&token=@token@";
+            url = url.replaceAll("@ctp_file_ID@",fileId).replaceAll("@文件名@",fileName).replaceAll("@token@",token);
+            byte[] bytes = HttpUtil.downloadBytes(appUrl + url);
+            return bytes;
+        }
+        return null;
+    }
+
+
+    /**
+     * 附件下载
+     * @param loginName oa登录名
+     * @param apiCode 接口编码
+     * @param fileId 附件id
+     * @param fileName 附件名
+     * @param token
+     * @return 附件字节数组
+     */
+    public byte[] downloadFileBytes(String loginName,String apiCode,String fileId,String fileName,String token){
+        if (StrUtil.isNotEmpty(apiCode)){
+            SysApplicationApiEntity sysApp = getByCode(apiCode);
+            if (StrUtil.isEmpty(token)){
+                token = getToken(loginName,sysApp);
+            }
+            String appUrl = StrUtil.removeSuffix(sysApp.getAppUrl(),"/");
             String url = "/seeyon/rest/attachment/file/@ctp_file_ID@?fileName=@文件名@&token=@token@";
             url = url.replaceAll("@ctp_file_ID@",fileId).replaceAll("@文件名@",fileName).replaceAll("@token@",token);
             byte[] bytes = HttpUtil.downloadBytes(appUrl + url);
@@ -139,7 +165,7 @@ public class RestUtil {
     public String getToken(String login_name,SysApplicationApiEntity sysApp){
         if (null != sysApp){
             HashMap<String, String> hashMap = new HashMap<>();
-            String app_url = sysApp.getAppUrl();
+            String app_url = StrUtil.removeSuffix(sysApp.getAppUrl(), "/");
             String url = app_url+"/seeyon/rest/token";
             String headerIn = sysApp.getHeaderIn();
             JSONArray headers = JSON.parseArray(headerIn);
@@ -151,8 +177,9 @@ public class RestUtil {
                     hashMap.put(parameterName,example);
                 }
             }
-            if (StrUtil.isNotEmpty(login_name)){
-                hashMap.put("loginName",login_name);
+            login_name = hashMap.get("loginName");
+            if (StrUtil.isEmpty(login_name)){
+                hashMap.put("loginName","hzya");
             }
             String result = HttpRequest.post(url).body(JSON.toJSONString(hashMap)).execute().body();
             JSONObject jsonObject = JSONObject.parseObject(result);

From 2379d9dd7a931a039465133b78bd941c84b3c06f Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Tue, 20 Aug 2024 14:52:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ssrq=E5=AD=97=E6=AE=B5=202024=E5=B9=B48?=
 =?UTF-8?q?=E6=9C=8820=E6=97=A514:51:34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
index ea2e98d1..a00f79f6 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
@@ -132,6 +132,7 @@ GSDM,KJND,mlId
             <if test="yhzh != null and yhzh !='' "> yhzh, </if>
             <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="xmdm != null and xmdm !='' "> xmdm, </if>
             <if test="xmmc != null and xmmc !='' "> xmmc, </if>
         </trim>
@@ -176,6 +177,7 @@ GSDM,KJND,mlId
             <if test="yhzh != null and yhzh !='' "> #{yhzh}, </if>
             <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="xmdm != null and xmdm !='' "> #{xmdm}, </if>
             <if test="xmmc != null and xmmc !='' "> #{xmmc}, </if>
         </trim>

From 1ec337f22a7af2e89b73ce0831529059c4081286 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Wed, 21 Aug 2024 17:57:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=AE=E6=97=85=E6=8A=A5=E9=94=80?=
 =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=202024=E5=B9=B48=E6=9C=8821?=
 =?UTF-8?q?=E6=97=A5=2017:56:16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nxproof/oerdjml/entity/OerDjmlEntity.java | 20 ++++++++
 .../nxproof/oerdjml/entity/OerDjmlEntity.xml  |  9 ++++
 .../service/impl/OerDjmlExtServiceImpl.java   | 49 +++++++++++++------
 .../service/impl/OerDjmlServiceImpl.java      |  5 ++
 .../nxproof/oerdjnr/entity/OerDjnrEntity.java | 10 ++++
 .../nxproof/oerdjnr/entity/OerDjnrEntity.xml  |  4 ++
 6 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java
index 86ccc7c7..bfd53363 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java
@@ -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;
+    }
 }
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
index a00f79f6..f08343d5 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
@@ -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>
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
index 0e5ea9e9..d8d4b2c7 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
@@ -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)){
@@ -273,8 +274,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setFjs( formmainData.getString("field0004"));
             djml.setZy( formmainData.getString("field0009"));
             //部门代码
-            djml.setBmdm( formmainData.getString("field0109"));
-            djml.setBmmc( "");
+            djml.setBmdm(formmainData.getString("field0109"));
+            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;
     }
 
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
index 72a87768..2b0c256f 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
@@ -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();
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java
index e64d5e4b..41ef94dc 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java
@@ -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;
+    }
 }
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml
index a697d827..effdc908 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml
@@ -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>

From 472484d8c628ff2e3b63e9719377b92fe8de65c5 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Wed, 21 Aug 2024 18:14:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5queryOe?=
 =?UTF-8?q?rDjml=20=E5=A2=9E=E5=8A=A0=20djlxid=E5=AD=97=E6=AE=B5=202024?=
 =?UTF-8?q?=E5=B9=B48=E6=9C=8821=E6=97=A518:14:00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
index f08343d5..8330f9e8 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
@@ -278,7 +278,8 @@ GSDM,KJND,mlId
         mlId,
         kjnd,
         gsdm,
-        DJBH
+        DJBH,
+        djlxid
         from OER_DJML
         <trim prefix="where" prefixOverrides="and">
             <if test="djbh != null and djbh != ''"> and DJBH = #{djbh} </if>