Browse Source

新增 会议签到,会议纪要

tjf 7 tháng trước cách đây
mục cha
commit
413c53f297

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -19,8 +19,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
-#    active: prod
+#    active: druid
+    active: prod
   # 文件上传
   servlet:
     multipart:

+ 1 - 10
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MeetingRecordsServiceImpl.java

@@ -55,9 +55,7 @@ public class MeetingRecordsServiceImpl implements IMeetingRecordsService {
      */
     @Override
     public int insertMeetingRecords(MeetingRecords meetingRecords) {
-
         int row = 0;
-        Long conferenceRoomOrderId = meetingRecords.getConferenceRoomOrderId();
         Long userId = meetingRecords.getUserId();
         SysUser sysUser = sysUserMapper.selectUserById(userId);
         if (sysUser != null) {
@@ -69,14 +67,7 @@ public class MeetingRecordsServiceImpl implements IMeetingRecordsService {
             if (StringUtils.isNotBlank(nickName)) {
                 meetingRecords.setNickName(nickName);
             }
-            //先去查询是否存在
-            MeetingRecords meetingRecordsOld = meetingRecordsMapper.selectMeetingRecordsByConferenceRoomOrderId(conferenceRoomOrderId);
-            if (meetingRecordsOld != null) {
-                meetingRecords.setRecordId(meetingRecordsOld.getRecordId());
-                row = meetingRecordsMapper.updateMeetingRecords(meetingRecords);
-            } else {
-                row = meetingRecordsMapper.insertMeetingRecords(meetingRecords);
-            }
+            row = meetingRecordsMapper.insertMeetingRecords(meetingRecords);
         }
         return row;
     }

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/MeetingRecordsMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
         </where>
-        order by create_time DESC
+        order by create_time
     </select>
     
     <select id="selectMeetingRecordsByConferenceRoomOrderId" parameterType="Long" resultMap="MeetingRecordsResult">