From 0d8c43fb46eff4133442bdab278a4970202f9a96 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 11 Jul 2024 11:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E5=A4=B1=E8=B4=A5=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E5=85=88=E5=90=8E=E9=A1=BA=E5=BA=8F=EF=BC=8C?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A48?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/mdmModule/entity/MdmModuleEntity.xml      | 12 ++++++------
 .../service/impl/MdmModuleServiceImpl.java        | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index 046fefdd..865721ad 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -442,11 +442,11 @@ where id = #{id}
                     <when test="item.filedType  == '2'.toString()">
                         <choose>
                             <when test="item.dataType  == '1'.toString()">
-                                MODIFY COLUMN ${item.enName} decimal(${item.filedLength}) DEFAULT NULL COMMENT
+                                MODIFY COLUMN ${item.enName} decimal(${item.filedLength},8) DEFAULT NULL COMMENT
                                 #{item.chName},
                             </when>
                             <otherwise>
-                                add COLUMN ${item.enName} decimal(${item.filedLength}) DEFAULT NULL COMMENT
+                                add COLUMN ${item.enName} decimal(${item.filedLength},8) DEFAULT NULL COMMENT
                                 #{item.chName},
                             </otherwise>
                         </choose>
@@ -505,14 +505,14 @@ where id = #{id}
                     <when test="filedType  == '2'.toString()">
                         <choose>
                             <when test="dataType  == '1'.toString()">
-                                add COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT
+                                add COLUMN ${enName} decimal(${filedLength},8) DEFAULT NULL COMMENT
                                 #{chName}
                             </when>
                             <when test="dataType  == '3'.toString()">
                                 drop COLUMN ${enName}
                             </when>
                             <otherwise>
-                                MODIFY COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT
+                                MODIFY COLUMN ${enName} decimal(${filedLength},8) DEFAULT NULL COMMENT
                                 #{chName}
                             </otherwise>
                         </choose>
@@ -566,13 +566,13 @@ where id = #{id}
                     <when test="filedType  == '2'.toString()">
                         <choose>
                             <when test="dataType  == '1'.toString()">
-                                add  ${enName} decimal(${filedLength}) DEFAULT NULL
+                                add  ${enName} decimal(${filedLength},8) DEFAULT NULL
                             </when>
                             <when test="dataType  == '3'.toString()">
                                 drop  ${enName}
                             </when>
                             <otherwise>
-                                MODIFY  ${enName} decimal(${filedLength}) DEFAULT NULL
+                                MODIFY  ${enName} decimal(${filedLength},8) DEFAULT NULL
                             </otherwise>
                         </choose>
                     </when>
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
index 2d59e3b7..cedbf8a3 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
@@ -1482,6 +1482,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         }
         entity.setUpdate();
         entity.setDataType("2");
+        try {
+            mdmModuleDao.alterTableField(entity);
+        } catch (Exception e){
+            throw new BaseSystemException("表字段类型，修改失败，请联系管理员");
+        }
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
         mdmModuleDbFiledsEntities.add(entity);
         mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities);
@@ -1505,11 +1510,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                 }
             }
         }
-        try {
-            mdmModuleDao.alterTableField(entity);
-        } catch (Exception e){
-            throw new BaseSystemException("表字段类型，修改失败，请联系管理员");
-        }
+        //try {
+        //    mdmModuleDao.alterTableField(entity);
+        //} catch (Exception e){
+        //    throw new BaseSystemException("表字段类型，修改失败，请联系管理员");
+        //}
         return BaseResult.getSuccessMessageEntity("修改字段成功");
     }