Browse Source

# APP首页‘灵活排版’显示bug修改

# 离线巡检sql执行失败bug修改
zhongwei
haungxing 2 years ago
parent
commit
7cad02cb35
  1. 3
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/TableJsonUtils.java
  2. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/util/TableJsonUtils.java
  3. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java

3
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); needField = needField.substring(0, characterIndex);
} }
} }
if(needField.contains("DEFAULT B")) {
needField = needField.replace("DEFAULT B","DEFAULT ");
}
return needField; return needField;
} }

4
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')"); sb.append(" OFFLINE_FLAG VARCHAR(2) DEFAULT '0')");
// 拼接完整的建表语句 // 拼接完整的建表语句
createTableSql = createTableSql.substring(0, firstParenthesesIndex+1) + sb.toString(); createTableSql = createTableSql.substring(0, firstParenthesesIndex+1) + sb.toString();
// 转成成大写 // 转成成大写
@ -130,6 +131,9 @@ public class TableJsonUtils {
needField = needField.substring(0, characterIndex); needField = needField.substring(0, characterIndex);
} }
} }
if(needField.contains("DEFAULT B")) {
needField = needField.replace("DEFAULT B","DEFAULT ");
}
return needField; return needField;
} }

2
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; return;
} }
item.setNextShift(nextDuty.getClassName()); item.setNextShift(nextDuty.getClassName());
item.setNextTeam(Optional.ofNullable(nextDuty.getGroupName()).orElse("灵活排")); item.setNextTeam(Optional.ofNullable(nextDuty.getGroupName()).orElse("灵活排"));
// 下一班组负责人 // 下一班组负责人
String managerName = this.getManagerName(nextDuty.getManagerId()); String managerName = this.getManagerName(nextDuty.getManagerId());
item.setNextTeamLeader(managerName); item.setNextTeamLeader(managerName);

Loading…
Cancel
Save