From 7cad02cb35820c2387cde7cabfba04f341b685d5 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 24 May 2023 08:07:10 +0800
Subject: [PATCH] =?UTF-8?q?#=20APP=E9=A6=96=E9=A1=B5=E2=80=98=E7=81=B5?=
 =?UTF-8?q?=E6=B4=BB=E6=8E=92=E7=89=88=E2=80=99=E6=98=BE=E7=A4=BAbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20#=20=E7=A6=BB=E7=BA=BF=E5=B7=A1=E6=A3=80sq?=
 =?UTF-8?q?l=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java     | 3 +++
 .../java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java   | 4 ++++
 .../hzims/operational/main/service/impl/HydropowerServiceImpl.java    | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java
index 3baeb8f..218b5de 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java
@@ -136,6 +136,9 @@ public class TableJsonUtils {
                 needField = needField.substring(0, characterIndex);
             }
         }
+        if(needField.contains("DEFAULT B")) {
+            needField = needField.replace("DEFAULT B","DEFAULT ");
+        }
         return needField;
     }
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java
index 34f3857..49f143f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java
@@ -89,6 +89,7 @@ public class TableJsonUtils {
                 }
             }
 			sb.append(" OFFLINE_FLAG VARCHAR(2) DEFAULT '0')");
+
             // 拼接完整的建表语句
             createTableSql = createTableSql.substring(0, firstParenthesesIndex+1) + sb.toString();
             // 转成成大写
@@ -130,6 +131,9 @@ public class TableJsonUtils {
                 needField = needField.substring(0, characterIndex);
             }
         }
+        if(needField.contains("DEFAULT B")) {
+            needField = needField.replace("DEFAULT B","DEFAULT ");
+        }
         return needField;
     }
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
index b7535a6..7d99632 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
@@ -1651,7 +1651,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 			return;
 		}
 		item.setNextShift(nextDuty.getClassName());
-		item.setNextTeam(Optional.ofNullable(nextDuty.getGroupName()).orElse("灵活排版"));
+		item.setNextTeam(Optional.ofNullable(nextDuty.getGroupName()).orElse("灵活排班"));
 		// 下一班组负责人
 		String managerName = this.getManagerName(nextDuty.getManagerId());
 		item.setNextTeamLeader(managerName);