From fd0c7c174d7b7313aa49061df05350405a3c1bf1 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期二, 29 八月 2023 15:56:11 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg
---
home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java | 128 +++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 59 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 704ec8f..633dc9a 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;
/**
@@ -28,70 +30,78 @@
@Service
public class AdvanceNoticeService extends AbstractBaseService implements IAdvanceNoticeService {
- @Autowired
- public BaseDao baseDao;
- @Autowired
- PermissionService permissionService;
- @Autowired
- QueryFilterService queryFilterService;
+ @Autowired
+ public BaseDao baseDao;
+ @Autowired
+ PermissionService permissionService;
+ @Autowired
+ QueryFilterService queryFilterService;
- @Override
- public DataTableEntity listAdvanceNoticeg(FieldSetEntity fs) throws BaseException{
- String filter=fs.getString("filter");
- String dataFilter = permissionService.getDataFilter(fs.getTableName(),CmnConst.NO18);
+ @Override
+ public DataTableEntity listAdvanceNoticeg(FieldSetEntity fs) throws BaseException {
+ String filter = fs.getString("filter");
+ String dataFilter = permissionService.getDataFilter(fs.getTableName(), CmnConst.NO18);
- if(!StringUtils.isEmpty(dataFilter)){
- if(!StringUtils.isEmpty(filter)){
- filter += " and "+dataFilter;
- }else {
- filter = dataFilter;
- }
- }
- if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
- filter = filter + " and " + queryFilterService.getQueryFilter(fs);
- }
+ if (!StringUtils.isEmpty(dataFilter)) {
+ if (!StringUtils.isEmpty(filter)) {
+ filter += " and " + dataFilter;
+ } else {
+ filter = dataFilter;
+ }
+ }
+ if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
+ filter = filter + " and " + queryFilterService.getQueryFilter(fs);
+ }
// fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)
- DataTableEntity dt = baseDao.listTable(CmnConst.APP_NOTICE_PUNISHMENT,filter, null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
- baseDao.loadPromptData(dt);
- return dt;
- }
+ DataTableEntity dt = baseDao.listTable(CmnConst.APP_NOTICE_PUNISHMENT, filter, null, null, " no00 desc", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
- @Override
- public FieldSetEntity getAdvanceNotice(FieldSetEntity fs) {
- return baseDao.getFieldSet(CmnConst.APP_NOTICE_PUNISHMENT, fs.getUUID(), false);
- }
+ @Override
+ public FieldSetEntity getAdvanceNotice(FieldSetEntity fs) {
+ return baseDao.getFieldSet(CmnConst.APP_NOTICE_PUNISHMENT, fs.getUUID(), false);
+ }
- @Override
- @Transactional
- public String saveAdvanceNotice(FieldSetEntity fs)throws BaseException {
- String fsUUID = fs.getUUID();
- if(BaseUtil.strIsNull(fsUUID)){
- fsUUID = baseDao.add(fs);
- }else{
- baseDao.update(fs);
- }
- return fsUUID;
- }
+ @Override
+ @Transactional
+ public String saveAdvanceNotice(FieldSetEntity fs) throws BaseException {
+ String fsUUID = fs.getUUID();
+ if (BaseUtil.strIsNull(fsUUID)) {
+ fsUUID = baseDao.add(fs);
+ } else {
+ baseDao.update(fs);
+ }
+ return fsUUID;
+ }
- @Override
- @Transactional
- public String deleteAdvanceNotice(FieldSetEntity fs)throws BaseException {
- String uuids = fs.getString(CmnConst.UUID);
- String[] uuid = uuids.split(",");
- baseDao.delete(CmnConst.APP_NOTICE_PUNISHMENT, uuid);
- return uuids;
- }
+ @Override
+ @Transactional
+ public String deleteAdvanceNotice(FieldSetEntity fs) throws BaseException {
+ String uuids = fs.getString(CmnConst.UUID);
+ String[] uuid = uuids.split(",");
+ baseDao.delete(CmnConst.APP_NOTICE_PUNISHMENT, uuid);
+ return uuids;
+ }
- @Override
- @Transactional
- public void addTypeSize(FieldSetEntity fs) throws BaseException {
- String tableName = fs.getTableName();
- DataTableEntity dataTableEntity = baseDao.listTable("SELECT IFNULL(MAX(no02),0) no02 FROM "+tableName, new String[]{});
- 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);
- }
+ @Override
+ @Transactional
+ public void addTypeSize(FieldSetEntity fs) throws BaseException {
+ String tableName = fs.getTableName();
+ String yearNo = fs.getString("no01");
+
+ //鏌ヨ鍚屽瓧鏁版嵁涓渶澶х殑鍙�
+ FieldSetEntity fseMax = baseDao.getFieldSetEntityBySQL("SELECT CONVERT(IFNULL(MAX(no02),0)+1,UNSIGNED INT ) 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()});
+ fs.setValue("no02", finalNo);
+ }
+ }
}
--
Gitblit v1.9.2