From 308359fcfb427f08c745880bf63353eb00dd8219 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 08 六月 2023 18:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java b/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
index 3d9f2bc..2129ace 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
@@ -17,6 +17,8 @@
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
+import java.text.DecimalFormat;
+import java.text.Format;
import java.text.ParseException;
/**
@@ -86,13 +88,19 @@
@Transactional
public void addTypeSize(FieldSetEntity fs) throws BaseException {
String tableName = fs.getTableName();
- String year = fs.getString("no01");
- DataTableEntity dataTableEntity = baseDao.listTable("SELECT IFNULL(MAX(no02),0) no02 FROM "+tableName+" where no01=?", new String[]{year});
- String no02 = String.valueOf(Integer.parseInt(dataTableEntity.getFieldSetEntity(0).getString("no02")) + 1);
- while (no02.length() < 3){
- no02 = "0" + no02;
- }
- fs.setValue("no02",no02);
- baseDao.update(fs);
+ String yearNo = fs.getString("no01");
+
+ //鏌ヨ鍚屽瓧鏁版嵁涓渶澶х殑鍙�
+ FieldSetEntity fseMax =baseDao.getFieldSetEntityBySQL("SELECT IFNULL(MAX(no02),0)+1 no02 FROM "+tableName+" WHERE no01=?", new Object[] {yearNo}, false);
+ if (fseMax!=null) {
+ Integer maxNo = fseMax.getInteger("no02");
+
+ //鏍煎紡鍖栧彿
+ Format format = new DecimalFormat("000");
+ String finalNo= format.format(maxNo);
+
+ //淇敼鏁版嵁
+ baseDao.executeUpdate("UPDATE "+ tableName +" SET no02 =? WHERE uuid=?", new Object[] {finalNo, fs.getUUID()});
+ }
}
}
--
Gitblit v1.9.2