增加u8接口返回状态字段

2024年8月30日09:23:34

service/src/main/java/com/hzya/frame/seeyon/service/impl/SeeyonExtServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hzya.frame.seeyon.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -150,9 +151,11 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
         param.put("eventType",sourceBody.getString("eventType"));
         //把返回的单号更新到oa档案表
         String returnDataStr = logEntity.getReturnData();
-        if (JSONUtil.isTypeJSON(returnDataStr) && !targetFormApp.contains("edit")){
+        if (JSONUtil.isTypeJSON(returnDataStr)){
             JSONObject returnData = JSONObject.parseObject(returnDataStr);
             String success = returnData.getString("success");
+            //新增的流程申请 才处理回写单号的处理
+            if (!targetFormApp.contains("edit")){
                 if ("true".equals(success)){
                     JSONArray dataArr = returnData.getJSONArray("data");
                     if (null != dataArr){
@@ -187,6 +190,8 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
                         }
                     }
                 }
+            }
+            //回写u8返回信息到流程表
             try {
                 //更新u8返回信息到流程表
                 switch (formApp){
@@ -194,6 +199,7 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
                         Formmain0227Entity formmain0227 = new Formmain0227Entity();
                         formmain0227.setId(targetBody.getString("billid"));
                         formmain0227.setField0029(returnData.getString("message"));
+                        formmain0227.setField0030(isSuccess(success));
                         formmain0227.setDataSourceCode(dataSourceCode);
                         formmain0227Service.updateU8ResMsg(formmain0227);
                         break;
@@ -201,6 +207,7 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
                         Formmain0225Entity formmain0225 = new Formmain0225Entity();
                         formmain0225.setId(targetBody.getString("billid"));
                         formmain0225.setField0032(returnData.getString("message"));
+                        formmain0225.setField0033(isSuccess(success));
                         formmain0225.setDataSourceCode(dataSourceCode);
                         formmain0225Service.updateFlag(formmain0225);
                         break;
@@ -208,6 +215,7 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
                         Formmain0226Entity formmain0226 = new Formmain0226Entity();
                         formmain0226.setId(targetBody.getString("billid"));
                         formmain0226.setField0082(returnData.getString("message"));
+                        formmain0226.setField0083(isSuccess(success));
                         formmain0226.setDataSourceCode(dataSourceCode);
                         formmain0226Service.updateFlag(formmain0226);
                         break;
@@ -216,6 +224,7 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
                 logger.error("更新u8返回信息到OA流程表出错",e);
             }
         }
+
         IntegrationTaskLivingDetailsEntity logDetails = new IntegrationTaskLivingDetailsEntity();
         logDetails.setRootAppPk(JSON.toJSONString(param));
         logDetails.setRootAppBill(hzyaExtData.getString("billCode"));
@@ -463,4 +472,8 @@ public class SeeyonExtServiceImpl implements ISeeyonExtService {
         }
         return "实际用量结算";
     }
+
+    private String isSuccess(String flag){
+        return "true".equals(flag) ? "成功" : "失败";
+    }
 }

service/src/main/java/com/hzya/frame/seeyon/ydc/entity/Formmain0225Entity.java

@@ -20,6 +20,8 @@ public class Formmain0225Entity extends BaseEntity {
     private String finishedflag;
     //u8返回信息
     private String field0032;
+    //u8返回结果
+    private String field0033;
     public String getField0001() {
         return field0001;
     }
@@ -83,4 +85,12 @@ public class Formmain0225Entity extends BaseEntity {
     public void setField0032(String field0032) {
         this.field0032 = field0032;
     }
+
+    public String getField0033() {
+        return field0033;
+    }
+
+    public void setField0033(String field0033) {
+        this.field0033 = field0033;
+    }
 }

service/src/main/java/com/hzya/frame/seeyon/ydc/entity/Formmain0225Entity.xml

@@ -40,7 +40,8 @@
         update formmain_0225  set
         <trim suffix="" suffixOverrides=",">
             <if test="field0025 != null and field0025 != ''"> field0025 = #{field0025},</if>
-            <if test="field0032 != null and field0032 != ''"> field0032 = #{field0032}</if>
+            <if test="field0032 != null and field0032 != ''"> field0032 = #{field0032},</if>
+            <if test="field0033 != null and field0033 != ''"> field0033 = #{field0033}</if>
         </trim>
         where id = #{id}
     </update>

service/src/main/java/com/hzya/frame/seeyon/ydc/entity/Formmain0226Entity.java

@@ -25,6 +25,7 @@ public class Formmain0226Entity extends BaseEntity {
     private String finishedflag;
 
     private String field0082;//u8返回信息
+    private String field0083;//u8返回结果
     public String getField0001() {
         return field0001;
     }
@@ -136,4 +137,12 @@ public class Formmain0226Entity extends BaseEntity {
     public void setField0082(String field0082) {
         this.field0082 = field0082;
     }
+
+    public String getField0083() {
+        return field0083;
+    }
+
+    public void setField0083(String field0083) {
+        this.field0083 = field0083;
+    }
 }

service/src/main/java/com/hzya/frame/seeyon/ydc/entity/Formmain0226Entity.xml

@@ -52,7 +52,8 @@
         update formmain_0226  set
         <trim suffix="" suffixOverrides=",">
             <if test="field0028 != null and field0028 != ''"> field0028 = #{field0028},</if>
-            <if test="field0082 != null and field0082 != ''"> field0082 = #{field0082}</if>
+            <if test="field0082 != null and field0082 != ''"> field0082 = #{field0082},</if>
+            <if test="field0083 != null and field0083 != ''"> field0083 = #{field0083}</if>
         </trim>
         where id = #{id}
     </update>

service/src/main/java/com/hzya/frame/seeyon/ydc/entity/Formmain0227Entity.java

@@ -31,6 +31,7 @@ public class Formmain0227Entity extends BaseEntity {
     private String finishedflag;
 
     private String field0029;//子表的u8返回信息
+    private String field0030;//子表的u8返回状态
     public String getField0009() {
         return field0009;
     }
@@ -118,4 +119,12 @@ public class Formmain0227Entity extends BaseEntity {
     public void setField0029(String field0029) {
         this.field0029 = field0029;
     }
+
+    public String getField0030() {
+        return field0030;
+    }
+
+    public void setField0030(String field0030) {
+        this.field0030 = field0030;
+    }
 }

service/src/main/java/com/hzya/frame/seeyon/ydc/entity/Formmain0227Entity.xml

@@ -52,7 +52,8 @@
     <update id="entity_update_formson" parameterType = "com.hzya.frame.seeyon.ydc.entity.Formmain0227Entity" >
         update formson_0228  set
         <trim suffix="" suffixOverrides=",">
-            <if test="field0029 != null and field0029 != ''"> field0029 = #{field0029}</if>
+            <if test="field0029 != null and field0029 != ''"> field0029 = #{field0029},</if>
+            <if test="field0030 != null and field0030 != ''"> field0030 = #{field0030}</if>
         </trim>
         where id = #{id}
     </update>