From 0c56911f52f30c9803e0ef673297208cba603443 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期二, 20 八月 2024 17:48:24 +0800
Subject: [PATCH] 会议室功能二维码生成8.20-1
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 53747f8..88184ca 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -307,7 +307,7 @@
param.add(meeting_room);
param.add(meeting_date);
StringBuilder sb=new StringBuilder();
- sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status, ");
+ sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, ");
sb.append(" (select user_name from product_sys_users where user_id=b.record_man) as record_man,");
sb.append(" (select user_name from product_sys_users where user_id=b.record_master) as record_master,");
sb.append(" CONCAT(DATE_FORMAT(b.start_time,\"%H-%i-%S\"),'~',DATE_FORMAT(b.end_time,\"%H-%i-%S\")) as time_quantum,");
@@ -342,6 +342,16 @@
String end_time_date = dateFormat.format(end_time);
MapValues.put("start_time",start_time_date);
MapValues.put("end_time",end_time_date);
+ }
+
+ Date date = new Date();
+ //鏄惁鑳藉鍙栨秷
+ if(date.before(fieldSetEntity.getDate("start_time"))){
+ MapValues.put("isCancel",true);
+ }
+ //鏄惁鎵ц寮�鍚姛鑳�
+ if(date.before(fieldSetEntity.getDate("start_time")) && fieldSetEntity.getString("status").equals("宸插彇娑�")){
+ MapValues.put("isStart",true);
}
dataList.add(MapValues);
}
@@ -419,7 +429,7 @@
BitMatrix bitMatrix = null;
try {
- //鐢熸垚鐭╅樀锛屽洜涓烘垜鐨勪笟鍔″満鏅紶鏉ョ殑鏄紪鐮佷箣鍚庣殑URL锛屾墍浠ュ厛瑙ｇ爜
+
bitMatrix = new MultiFormatWriter().encode(content,
BarcodeFormat.QR_CODE, width, height, hints);
@@ -430,6 +440,23 @@
return bitMatrix;
}
+ @Override
+ public void CancelAndStart(FieldSetEntity fse) throws BaseException {
+
+ String uuid = fse.getString("uuid");
+ String filter=" uuid='"+uuid+"'";
+ DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{});
+ if(product_oa_conference_apply.getRows()!=0){
+ FieldSetEntity fieldSetEntity = product_oa_conference_apply.getFieldSetEntity(0);
+ if(fieldSetEntity.getString("status").equals("宸插彇娑�")){
+ fieldSetEntity.setValue("status","宸插惎鐢�");
+ }else {
+ fieldSetEntity.setValue("status","宸插彇娑�");
+ }
+ baseDao.update(fieldSetEntity);
+ }
+
+ }
/**
--
Gitblit v1.9.2