From a10a35acc3b48ae648839acf408b65974f0329f2 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 12 Jan 2024 17:54:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B):=20?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/fb/entity/ProcessFbEntryChange.java    |  4 ++--
 .../impl/ProcessFbEntryChangeServiceImpl.java      | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java
index 853c25ae..f31a2a87 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java
@@ -67,7 +67,7 @@ public class ProcessFbEntryChange implements Serializable {
     /**来源（1国内、2海外） 翻译*/
     @ApiModelProperty(value = "来源（1国内、2海外） 翻译")
     @TableField(exist = false)
-    private java.lang.String sourceDictText;
+    private java.lang.String source_dictText;
 	/**操作类型（1标准法规入库、2标准法规变更）*/
 	@Excel(name = "操作类型（1标准法规入库、2标准法规变更）", width = 15)
     @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更）")
@@ -75,7 +75,7 @@ public class ProcessFbEntryChange implements Serializable {
     /**操作类型（1标准法规入库、2标准法规变更）*/
     @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更） 翻译")
     @TableField(exist = false)
-    private java.lang.String operateTypeDictText;
+    private java.lang.String operateType_dictText;
     /**标准编号*/
     @Excel(name = "标准编号", width = 15)
     @ApiModelProperty(value = "标准编号")
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index ec4b382a..fa20a08b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -381,33 +381,33 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         String source = processFbEntryChange.getSource();
         JSONObject jsonObject = JSON.parseObject(businessJson);
         if ("1".equals(source)){
-            processFbEntryChange.setSourceDictText("国内");
+            processFbEntryChange.setSource_dictText("国内");
             // 国内动力类型
             if (businessJson.contains("dynamic_type")){
                 Object read = JSONPath.read(businessJson, "$.dynamic_type");
                 String text = dictService.queryDictText("POWER_TYPE_DOMESTIC", read.toString());
-                jsonObject.put("dynamic_typeDictText", text);
+                jsonObject.put("dynamic_type_dictText", text);
 
             }
         }else {
-            processFbEntryChange.setSourceDictText("海外");
+            processFbEntryChange.setSource_dictText("海外");
             // 海外动力类型
             if (businessJson.contains("dynamic_type")){
                 Object read = JSONPath.read(businessJson, "$.dynamic_type");
                 String text = dictService.queryDictText("POWER_TYPE_DOMESTIC_OVERSEAS", read.toString());
-                jsonObject.put("dynamic_typeDictText", text);
+                jsonObject.put("dynamic_type_dictText", text);
             }
         }
         if ("1".equals(processFbEntryChange.getOperateType())){
-            processFbEntryChange.setOperateTypeDictText("标准法规入库");
+            processFbEntryChange.setOperateType_dictText("标准法规入库");
         }else {
-            processFbEntryChange.setOperateTypeDictText("标准法规变更");
+            processFbEntryChange.setOperateType_dictText("标准法规变更");
         }
         // 采标程度
         if (businessJson.contains("degree_of_bid_acquisition")){
             Object read = JSONPath.read(businessJson, "$.degree_of_bid_acquisition");
             String text = dictService.queryDictText("degree_bid_acquisition", read.toString());
-            jsonObject.put("degree_of_bid_acquisitionDictText", text);
+            jsonObject.put("degree_of_bid_acquisition_dictText", text);
         }
         processFbEntryChange.setBusinessJson(jsonObject.toJSONString());
     }