From 9f529d59e088ecf2a7db1e1b1e5a2be4d84c7682 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 17 十月 2025 18:20:45 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index 4391525..a134585 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -111,7 +111,7 @@
}
/**
- * 浼氳瀹や繚瀛�
+ * 浼氳瀹ら厤缃繚瀛�
*
* @param request
* @return
@@ -137,7 +137,7 @@
}
/**
- * 浼氳瀹ゅ垹闄�
+ * 浼氳瀹ら厤缃垹闄�
*
* @param request
* @return
@@ -169,7 +169,7 @@
/**
- * 浼氳瀹ょ敵璇�
+ * 浼氳锛堜細璁锛夌敵璇峰垪琛�
*
* @param request
* @return
@@ -201,7 +201,7 @@
/**
- * 浼氳瀹ら厤缃鎯�
+ * 浼氳锛堜細璁锛夌敵璇疯鎯�
*
* @param request
* @return
@@ -232,7 +232,7 @@
}
/**
- * 浼氳瀹ょ敵璇蜂繚瀛�
+ * 浼氳锛堜細璁锛夌敵璇蜂繚瀛�
*
* @param request
* @return
@@ -258,7 +258,7 @@
}
/**
- * 浼氳瀹ょ敵璇峰垹闄�
+ * 浼氳锛堜細璁锛夌敵璇峰垹闄�
*
* @param request
* @return
@@ -310,7 +310,7 @@
}
/**
- * 浼氳棰勭害鐪嬫澘鍔熻兘
+ * 浼氳鐪嬫澘
* @param request
* @return
*/
@@ -330,28 +330,6 @@
return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
}
}
-
- /**
- * 浼氳棰勭害鐪嬫澘鍔熻兘
- * @param request
- * @return
- */
-// @PostMapping("/get_kb_Data/{version}")
-// @ApiVersion(1)
-// public String getkbData(HttpServletRequest request){
-// try {
-// //鑾峰彇鍙傛暟
-// FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
-// List kbData = conferenceManagerService.getkbData(fse);
-// return OK(kbData);
-// } catch (BaseException e) {
-// e.printStackTrace();
-// return this.error(e.getCode(), e.getMessage());
-// } catch (Exception e) {
-// e.printStackTrace();
-// return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
-// }
-// }
/**
* 鑾峰彇浼氳棰勭害璇︽儏
@@ -375,28 +353,28 @@
}
}
- /**
- * 浼氳瀹ら绾︿繚瀛樻洿鏂板姛鑳�
- * @param request
- * @return
- */
-
- @PostMapping("/save_or_update_meeting_info/{version}")
- @ApiVersion(1)
- public String saveOrUpdateMeetingInfo(HttpServletRequest request){
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- HashMap hashMap = conferenceManagerService.saveOrUpdateMeetingInfo(fse);
- return OK(hashMap);
- } catch (BaseException e) {
- e.printStackTrace();
- return this.error(e.getCode(), e.getMessage());
- } catch (Exception e) {
- e.printStackTrace();
- return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
- }
- }
+// /**
+// * 浼氳瀹ら绾︿繚瀛樻洿鏂板姛鑳�
+// * @param request
+// * @return
+// */
+//
+// @PostMapping("/save_or_update_meeting_info/{version}")
+// @ApiVersion(1)
+// public String saveOrUpdateMeetingInfo(HttpServletRequest request){
+// try {
+// //鑾峰彇鍙傛暟
+// FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+// conferenceManagerService.saveOrUpdateMeetingInfo(fse);
+// return OK();
+// } catch (BaseException e) {
+// e.printStackTrace();
+// return this.error(e.getCode(), e.getMessage());
+// } catch (Exception e) {
+// e.printStackTrace();
+// return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
+// }
+// }
/**
@@ -494,7 +472,7 @@
* @param request
* @return
*/
- @PostMapping("/get_sign_or_visit_info/{version}")
+ @PostMapping("/list-meeting-minute/{version}")
@ApiVersion(1)
public String listMeetingMinute(HttpServletRequest request) {
try {
@@ -513,6 +491,31 @@
return this.error(SystemCode.CONFERENCE_APPLY_FIND_FIAL.getValue(), SystemCode.CONFERENCE_APPLY_FIND_FIAL.getText() + e.getMessage());
}
}
+
+ /**
+ * 鑾峰彇浼氳绾鍒楄〃
+ * @param request
+ * @return
+ */
+ @PostMapping("/find-meeting-minute/{version}")
+ @ApiVersion(1)
+ public String findMeetingMinute(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝ｅ父
+ if (StringUtils.isEmpty(fse.getString(CmnConst.UUID))
+ && StringUtils.isEmpty(fse.getString("meeting_uuid"))) {
+ return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+ }
+ return OK_List(conferenceManagerService.findMeetingMinute(fse));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return this.error(e.getCode(), e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return this.error(SystemCode.CONFERENCE_APPLY_FIND_FIAL.getValue(), SystemCode.CONFERENCE_APPLY_FIND_FIAL.getText() + e.getMessage());
+ }
+ }
/**
* 鍙戦�佹秷鎭�
--
Gitblit v1.9.2