From 3bcf74f2978195f9d537671906635502262a493b Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期二, 20 八月 2024 08:57:07 +0800
Subject: [PATCH] 会议室功能优化8.20

---
 src/main/java/com/product/administration/service/ConferenceManagerService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index eeca058..cd024f7 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -238,7 +238,7 @@
             String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+meeting_date+"'";
             DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{});
             for (int i1 = 0; i1 < product_oa_conference_apply.getRows(); i1++) {
-                FieldSetEntity fieldSetEntity1 = product_oa_conference_apply.getData().get(i);
+                FieldSetEntity fieldSetEntity1 = product_oa_conference_apply.getFieldSetEntity(i1);
                 Date date = new Date();
                 if(date.before(fieldSetEntity1.getDate("start_time"))){
                     fieldSetEntity1.setValue("status","鏈紑濮�");
@@ -247,9 +247,8 @@
                 }else {
                     fieldSetEntity1.setValue("status","浼氳涓�");
                 }
-
+               baseDao.executeUpdate("update product_oa_conference_apply set status='"+fieldSetEntity1.getString("status")+"' where uuid='"+fieldSetEntity1.getString("uuid")+"'");
             }
-            baseDao.update(product_oa_conference_apply);
             //鏋勯�犳墍闇�瑕佺殑鏍煎紡
             if(!list.contains(fieldSetEntity.getValue("room_name").toString())){
                 HashMap<String,Object> hashMap=new HashMap<>();
@@ -373,6 +372,7 @@
 
         }
         HashMap<String,Object> hashMap=new HashMap<>();
+        BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
         if(flag==false){
             hashMap.put("code","200");
             hashMap.put("msg","姝ゆ椂闂存宸茶鍗犵敤");

--
Gitblit v1.9.2