From 218122f83197ceb2287a30d324be2ed3c42cc282 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期三, 21 八月 2024 15:43:02 +0800
Subject: [PATCH] 会议室功能8.21
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 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..e6eac8d 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -1,7 +1,10 @@
package com.product.administration.service;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
+import com.google.errorprone.annotations.Var;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
@@ -38,6 +41,7 @@
import java.io.IOException;
import java.text.DecimalFormat;
import java.text.Format;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -307,7 +311,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 +346,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 +433,7 @@
BitMatrix bitMatrix = null;
try {
- //鐢熸垚鐭╅樀锛屽洜涓烘垜鐨勪笟鍔″満鏅紶鏉ョ殑鏄紪鐮佷箣鍚庣殑URL锛屾墍浠ュ厛瑙ｇ爜
+
bitMatrix = new MultiFormatWriter().encode(content,
BarcodeFormat.QR_CODE, width, height, hints);
@@ -430,6 +444,65 @@
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);
+ }
+
+ }
+
+ @Override
+ public String ConferenceSign(FieldSetEntity fse) throws BaseException, ParseException {
+
+
+ JSONObject jsonObject = new JSONObject();
+ /* if(!StringUtils.isEmpty(fse.getString("uuid"))&&!StringUtils.isEmpty(fse.getString("date"))){*/
+ /*String uuid = fse.getString("uuid");
+ String date = fse.getString("date");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date parseDate = dateFormat.parse(date);
+ long between = DateUtil.between(parseDate, new Date(), DateUnit.SECOND);*/
+ String uuid="5591f2ea-b7bd-49c4-999a-9a1045edc717";
+ /* if(between>20){
+ jsonObject.put("code","200");
+ jsonObject.put("msg","浜岀淮鐮佸凡澶辨晥");
+ jsonObject.put("status","fail");
+
+ }else {*/
+
+ SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
+ FieldSetEntity fieldSetEntity = new FieldSetEntity();
+ fieldSetEntity.setTableName("product_oa_conference_sign");
+ fieldSetEntity.setValue("sign_user",currentUser.getUser_name());
+ fieldSetEntity.setValue("user_id",currentUser.getUser_id());
+ fieldSetEntity.setValue("org_level_uuid","00000000-0000-0000-0000-000000000000");
+ fieldSetEntity.setValue("organization",currentUser.getDept_uuid());
+ fieldSetEntity.setValue("organization_name",currentUser.getCurrentDept().getString("org_level_name"));
+ fieldSetEntity.setValue("sign_date",new Date());
+ fieldSetEntity.setValue("sign_status","宸茬鍒�");
+ fieldSetEntity.setValue("meeting_uuid",uuid);
+
+ // BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
+ baseDao.add(fieldSetEntity);
+ jsonObject.put("code","200");
+ jsonObject.put("msg","绛惧埌鎴愬姛");
+ jsonObject.put("status","sucess");
+ /* }*/
+ /* }*/
+
+ return jsonObject.toString();
+ }
/**
--
Gitblit v1.9.2