新增 会议签到,会议纪要

ruoyi-admin/src/main/java/com/ruoyi/web/controller/meeting/MeetingRecordsController.java

@@ -19,10 +19,10 @@ import java.util.List;
  * 会议记录Controller
  *
  * @author boman
- * @date 2024-10-22
+ * @date 2024-11-04
  */
 @RestController
-@RequestMapping("/system/records")
+@RequestMapping("/records")
 public class MeetingRecordsController extends BaseController {
     @Autowired
     private IMeetingRecordsService meetingRecordsService;
@@ -33,7 +33,6 @@ public class MeetingRecordsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:records:list')")
     @GetMapping("/list")
     public TableDataInfo list(MeetingRecords meetingRecords) {
-        startPage();
         List<MeetingRecords> list = meetingRecordsService.selectMeetingRecordsList(meetingRecords);
         return getDataTable(list);
     }
@@ -55,14 +54,14 @@ public class MeetingRecordsController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:records:query')")
     @GetMapping(value = "/{recordId}")
-    public AjaxResult getInfo(@PathVariable("recordId") Long recordId) {
+    public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
         return success(meetingRecordsService.selectMeetingRecordsByRecordId(recordId));
     }
 
     /**
      * 新增会议记录
      */
-    //@PreAuthorize("@ss.hasPermi('system:records:add')")
+    @PreAuthorize("@ss.hasPermi('system:records:add')")
     @Log(title = "会议记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeetingRecords meetingRecords) {
@@ -72,7 +71,7 @@ public class MeetingRecordsController extends BaseController {
     /**
      * 修改会议记录
      */
-    //@PreAuthorize("@ss.hasPermi('system:records:edit')")
+    @PreAuthorize("@ss.hasPermi('system:records:edit')")
     @Log(title = "会议记录", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody MeetingRecords meetingRecords) {
@@ -85,7 +84,7 @@ public class MeetingRecordsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:records:remove')")
     @Log(title = "会议记录", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{recordIds}")
-    public AjaxResult remove(@PathVariable Long[] recordIds) {
+    public AjaxResult remove(@PathVariable String[] recordIds) {
         return toAjax(meetingRecordsService.deleteMeetingRecordsByRecordIds(recordIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/sign/SignInController.java

@@ -19,22 +19,20 @@ import java.util.List;
  * 会议室签到Controller
  *
  * @author boman
- * @date 2024-10-28
+ * @date 2024-11-04
  */
 @RestController
 @RequestMapping("/sign")
-public class SignInController extends BaseController
-{
+public class SignInController extends BaseController {
     @Autowired
     private ISignInService signInService;
 
-/**
- * 查询会议室签到列表
- */
-@PreAuthorize("@ss.hasPermi('system:in:list')")
-@GetMapping("/list")
-    public TableDataInfo list(SignIn signIn)
-    {
+    /**
+     * 查询会议室签到列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SignIn signIn) {
         startPage();
         List<SignIn> list = signInService.selectSignInList(signIn);
         return getDataTable(list);
@@ -46,8 +44,7 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:in:export')")
     @Log(title = "会议室签到", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SignIn signIn)
-    {
+    public void export(HttpServletResponse response, SignIn signIn) {
         List<SignIn> list = signInService.selectSignInList(signIn);
         ExcelUtil<SignIn> util = new ExcelUtil<SignIn>(SignIn.class);
         util.exportExcel(response, list, "会议室签到数据");
@@ -58,8 +55,7 @@ public class SignInController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:in:query')")
     @GetMapping(value = "/{signInId}")
-    public AjaxResult getInfo(@PathVariable("signInId") Long signInId)
-    {
+    public AjaxResult getInfo(@PathVariable("signInId") Long signInId) {
         return success(signInService.selectSignInBySignInId(signInId));
     }
 
@@ -69,8 +65,7 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:in:add')")
     @Log(title = "会议室签到", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SignIn signIn)
-    {
+    public AjaxResult add(@RequestBody SignIn signIn) {
         return toAjax(signInService.insertSignIn(signIn));
     }
 
@@ -80,8 +75,7 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:in:edit')")
     @Log(title = "会议室签到", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody SignIn signIn)
-    {
+    public AjaxResult edit(@RequestBody SignIn signIn) {
         return toAjax(signInService.updateSignIn(signIn));
     }
 
@@ -91,8 +85,7 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:in:remove')")
     @Log(title = "会议室签到", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{signInIds}")
-    public AjaxResult remove(@PathVariable Long[] signInIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] signInIds) {
         return toAjax(signInService.deleteSignInBySignInIds(signInIds));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/MeetingRecords.java

@@ -9,14 +9,14 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 会议记录对象 meeting_records
  * 
  * @author boman
- * @date 2024-10-22
+ * @date 2024-11-04
  */
 public class MeetingRecords extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 记录id */
-    private Long recordId;
+    private String recordId;
 
     /** 会议id(关联会议预约表) */
     @Excel(name = "会议id(关联会议预约表)")
@@ -26,25 +26,36 @@ public class MeetingRecords extends BaseEntity
     @Excel(name = "记录内容")
     private String recordContent;
 
-    public void setRecordId(Long recordId) 
-    {
-        this.recordId = recordId;
-    }
+    /** 说话人ID */
+    @Excel(name = "说话人ID")
+    private Long userId;
 
-    public Long getRecordId() 
-    {
+    /** 说话头像地址 */
+    @Excel(name = "说话头像地址")
+    private String avatar;
+
+    /** 说话人昵称 */
+    @Excel(name = "说话人昵称")
+    private String nickName;
+
+
+    public String getRecordId() {
         return recordId;
     }
-    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) 
-    {
-        this.conferenceRoomOrderId = conferenceRoomOrderId;
+
+    public void setRecordId(String recordId) {
+        this.recordId = recordId;
     }
 
-    public Long getConferenceRoomOrderId() 
-    {
+    public Long getConferenceRoomOrderId() {
         return conferenceRoomOrderId;
     }
-    public void setRecordContent(String recordContent) 
+
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public void setRecordContent(String recordContent)
     {
         this.recordContent = recordContent;
     }
@@ -53,6 +64,33 @@ public class MeetingRecords extends BaseEntity
     {
         return recordContent;
     }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setAvatar(String avatar) 
+    {
+        this.avatar = avatar;
+    }
+
+    public String getAvatar() 
+    {
+        return avatar;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
 
     @Override
     public String toString() {
@@ -60,6 +98,9 @@ public class MeetingRecords extends BaseEntity
             .append("recordId", getRecordId())
             .append("conferenceRoomOrderId", getConferenceRoomOrderId())
             .append("recordContent", getRecordContent())
+            .append("userId", getUserId())
+            .append("avatar", getAvatar())
+            .append("nickName", getNickName())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())

ruoyi-system/src/main/java/com/ruoyi/system/domain/SignIn.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 会议室签到对象 sign_in
  * 
  * @author boman
- * @date 2024-10-28
+ * @date 2024-11-04
  */
 public class SignIn extends BaseEntity
 {
@@ -25,17 +25,21 @@ public class SignIn extends BaseEntity
     @Excel(name = "会议室预约ID")
     private Long conferenceRoomOrderId;
 
-    /** 签到用户id */
-    @Excel(name = "签到用户id")
-    private Long signUserId;
-
     /** 会议室ID */
     @Excel(name = "会议室ID")
     private Long conferenceRoomId;
 
-    /** 签到用户名称 */
-    @Excel(name = "签到用户名称")
-    private String signUserName;
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 用户头像地址 */
+    @Excel(name = "用户头像地址")
+    private String avatar;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String nickName;
 
     /** 签到时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -64,32 +68,41 @@ public class SignIn extends BaseEntity
     {
         return conferenceRoomOrderId;
     }
-    public void setSignUserId(Long signUserId) 
+    public void setConferenceRoomId(Long conferenceRoomId) 
     {
-        this.signUserId = signUserId;
+        this.conferenceRoomId = conferenceRoomId;
     }
 
-    public Long getSignUserId() 
+    public Long getConferenceRoomId() 
     {
-        return signUserId;
+        return conferenceRoomId;
     }
-    public void setConferenceRoomId(Long conferenceRoomId) 
+    public void setUserId(Long userId) 
     {
-        this.conferenceRoomId = conferenceRoomId;
+        this.userId = userId;
     }
 
-    public Long getConferenceRoomId() 
+    public Long getUserId() 
     {
-        return conferenceRoomId;
+        return userId;
+    }
+    public void setAvatar(String avatar) 
+    {
+        this.avatar = avatar;
+    }
+
+    public String getAvatar() 
+    {
+        return avatar;
     }
-    public void setSignUserName(String signUserName) 
+    public void setNickName(String nickName) 
     {
-        this.signUserName = signUserName;
+        this.nickName = nickName;
     }
 
-    public String getSignUserName() 
+    public String getNickName() 
     {
-        return signUserName;
+        return nickName;
     }
     public void setSignTime(Date signTime) 
     {
@@ -115,9 +128,10 @@ public class SignIn extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("signInId", getSignInId())
             .append("conferenceRoomOrderId", getConferenceRoomOrderId())
-            .append("signUserId", getSignUserId())
             .append("conferenceRoomId", getConferenceRoomId())
-            .append("signUserName", getSignUserName())
+            .append("userId", getUserId())
+            .append("avatar", getAvatar())
+            .append("nickName", getNickName())
             .append("signTime", getSignTime())
             .append("createDept", getCreateDept())
             .append("createBy", getCreateBy())

ruoyi-system/src/main/java/com/ruoyi/system/mapper/MeetingRecordsMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 会议记录Mapper接口
  * 
  * @author boman
- * @date 2024-10-22
+ * @date 2024-11-04
  */
 public interface MeetingRecordsMapper 
 {
@@ -18,7 +18,7 @@ public interface MeetingRecordsMapper
      * @param recordId 会议记录主键
      * @return 会议记录
      */
-    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId);
+    public MeetingRecords selectMeetingRecordsByRecordId(String recordId);
 
     /**
      * 查询会议记录列表
@@ -50,7 +50,7 @@ public interface MeetingRecordsMapper
      * @param recordId 会议记录主键
      * @return 结果
      */
-    public int deleteMeetingRecordsByRecordId(Long recordId);
+    public int deleteMeetingRecordsByRecordId(String recordId);
 
     /**
      * 批量删除会议记录
@@ -58,5 +58,5 @@ public interface MeetingRecordsMapper
      * @param recordIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteMeetingRecordsByRecordIds(Long[] recordIds);
+    public int deleteMeetingRecordsByRecordIds(String[] recordIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SignInMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 会议室签到Mapper接口
  * 
  * @author boman
- * @date 2024-10-28
+ * @date 2024-11-04
  */
 public interface SignInMapper 
 {

ruoyi-system/src/main/java/com/ruoyi/system/service/IMeetingRecordsService.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 会议记录Service接口
  * 
  * @author boman
- * @date 2024-10-22
+ * @date 2024-11-04
  */
 public interface IMeetingRecordsService 
 {
@@ -18,7 +18,7 @@ public interface IMeetingRecordsService
      * @param recordId 会议记录主键
      * @return 会议记录
      */
-    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId);
+    public MeetingRecords selectMeetingRecordsByRecordId(String recordId);
 
     /**
      * 查询会议记录列表
@@ -50,7 +50,7 @@ public interface IMeetingRecordsService
      * @param recordIds 需要删除的会议记录主键集合
      * @return 结果
      */
-    public int deleteMeetingRecordsByRecordIds(Long[] recordIds);
+    public int deleteMeetingRecordsByRecordIds(String[] recordIds);
 
     /**
      * 删除会议记录信息
@@ -58,5 +58,5 @@ public interface IMeetingRecordsService
      * @param recordId 会议记录主键
      * @return 结果
      */
-    public int deleteMeetingRecordsByRecordId(Long recordId);
+    public int deleteMeetingRecordsByRecordId(String recordId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISignInService.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 会议室签到Service接口
  * 
  * @author boman
- * @date 2024-10-28
+ * @date 2024-11-04
  */
 public interface ISignInService 
 {

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

@@ -1,8 +1,11 @@
 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.MeetingRecords;
 import com.ruoyi.system.mapper.MeetingRecordsMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.IMeetingRecordsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,87 +14,105 @@ import java.util.List;
 
 /**
  * 会议记录Service业务层处理
- * 
+ *
  * @author boman
- * @date 2024-10-22
+ * @date 2024-11-04
  */
 @Service
-public class MeetingRecordsServiceImpl implements IMeetingRecordsService 
-{
+public class MeetingRecordsServiceImpl implements IMeetingRecordsService {
     @Autowired
     private MeetingRecordsMapper meetingRecordsMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
     /**
      * 查询会议记录
-     * 
+     *
      * @param recordId 会议记录主键
      * @return 会议记录
      */
     @Override
-    public MeetingRecords selectMeetingRecordsByRecordId(Long recordId)
-    {
+    public MeetingRecords selectMeetingRecordsByRecordId(String recordId) {
         return meetingRecordsMapper.selectMeetingRecordsByRecordId(recordId);
     }
 
     /**
      * 查询会议记录列表
-     * 
+     *
      * @param meetingRecords 会议记录
      * @return 会议记录
      */
     @Override
-    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords)
-    {
+    public List<MeetingRecords> selectMeetingRecordsList(MeetingRecords meetingRecords) {
         return meetingRecordsMapper.selectMeetingRecordsList(meetingRecords);
     }
 
     /**
      * 新增会议记录
-     * 
+     *
      * @param meetingRecords 会议记录
      * @return 结果
      */
     @Override
-    public int insertMeetingRecords(MeetingRecords meetingRecords)
-    {
-        meetingRecords.setCreateTime(DateUtils.getNowDate());
-        return meetingRecordsMapper.insertMeetingRecords(meetingRecords);
+    public int insertMeetingRecords(MeetingRecords meetingRecords) {
+
+        int row = 0;
+        String recordId = meetingRecords.getRecordId();
+        Long userId = meetingRecords.getUserId();
+        SysUser sysUser = sysUserMapper.selectUserById(userId);
+        if (sysUser != null) {
+            String avatar = sysUser.getAvatar();
+            if (StringUtils.isNotBlank(avatar)) {
+                meetingRecords.setAvatar(avatar);
+            }
+            String nickName = sysUser.getNickName();
+            if (StringUtils.isNotBlank(nickName)) {
+                meetingRecords.setNickName(nickName);
+            }
+            if (StringUtils.isNotBlank(recordId)){
+                //先去查询是否存在
+                MeetingRecords meetingRecordsOld = meetingRecordsMapper.selectMeetingRecordsByRecordId(recordId);
+                if (meetingRecordsOld != null) {
+                    row = meetingRecordsMapper.updateMeetingRecords(meetingRecords);
+                } else {
+                    row = meetingRecordsMapper.insertMeetingRecords(meetingRecords);
+                }
+            }
+        }
+        return row;
     }
 
     /**
      * 修改会议记录
-     * 
+     *
      * @param meetingRecords 会议记录
      * @return 结果
      */
     @Override
-    public int updateMeetingRecords(MeetingRecords meetingRecords)
-    {
+    public int updateMeetingRecords(MeetingRecords meetingRecords) {
         meetingRecords.setUpdateTime(DateUtils.getNowDate());
         return meetingRecordsMapper.updateMeetingRecords(meetingRecords);
     }
 
     /**
      * 批量删除会议记录
-     * 
+     *
      * @param recordIds 需要删除的会议记录主键
      * @return 结果
      */
     @Override
-    public int deleteMeetingRecordsByRecordIds(Long[] recordIds)
-    {
+    public int deleteMeetingRecordsByRecordIds(String[] recordIds) {
         return meetingRecordsMapper.deleteMeetingRecordsByRecordIds(recordIds);
     }
 
     /**
      * 删除会议记录信息
-     * 
+     *
      * @param recordId 会议记录主键
      * @return 结果
      */
     @Override
-    public int deleteMeetingRecordsByRecordId(Long recordId)
-    {
+    public int deleteMeetingRecordsByRecordId(String recordId) {
         return meetingRecordsMapper.deleteMeetingRecordsByRecordId(recordId);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SignInServiceImpl.java

@@ -1,8 +1,11 @@
 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SignIn;
 import com.ruoyi.system.mapper.SignInMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISignInService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,88 +14,108 @@ import java.util.List;
 
 /**
  * 会议室签到Service业务层处理
- * 
+ *
  * @author boman
- * @date 2024-10-28
+ * @date 2024-11-04
  */
 @Service
-public class SignInServiceImpl implements ISignInService 
-{
+public class SignInServiceImpl implements ISignInService {
     @Autowired
     private SignInMapper signInMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
 
     /**
      * 查询会议室签到
-     * 
+     *
      * @param signInId 会议室签到主键
      * @return 会议室签到
      */
     @Override
-    public SignIn selectSignInBySignInId(Long signInId)
-    {
+    public SignIn selectSignInBySignInId(Long signInId) {
         return signInMapper.selectSignInBySignInId(signInId);
     }
 
     /**
      * 查询会议室签到列表
-     * 
+     *
      * @param signIn 会议室签到
      * @return 会议室签到
      */
     @Override
-    public List<SignIn> selectSignInList(SignIn signIn)
-    {
+    public List<SignIn> selectSignInList(SignIn signIn) {
         return signInMapper.selectSignInList(signIn);
     }
 
     /**
      * 新增会议室签到
-     * 
+     *
      * @param signIn 会议室签到
      * @return 结果
      */
     @Override
-    public int insertSignIn(SignIn signIn)
-    {
-        signIn.setCreateTime(DateUtils.getNowDate());
+    public int insertSignIn(SignIn signIn) {
+        int row = 0;
+        Long userId = signIn.getUserId();
+        SysUser sysUser = sysUserMapper.selectUserById(userId);
+        if (sysUser != null) {
+            String avatar = sysUser.getAvatar();
+            if (StringUtils.isNotBlank(avatar)) {
+                signIn.setAvatar(avatar);
+            }
+            String nickName = sysUser.getNickName();
+            if (StringUtils.isNotBlank(nickName)) {
+                signIn.setNickName(nickName);
+            }
+        }
         signIn.setSignTime(DateUtils.getNowDate());
-        return signInMapper.insertSignIn(signIn);
+        //先去查询用户是否已经签到
+        SignIn sign = new SignIn();
+        sign.setConferenceRoomOrderId(signIn.getConferenceRoomOrderId());
+        sign.setUserId(userId);
+        List<SignIn> signIns = signInMapper.selectSignInList(sign);
+        if (signIns != null && signIns.size() > 0) {
+            Long signInId = signIns.get(0).getSignInId();
+            signIn.setSignInId(signInId);
+            row = signInMapper.updateSignIn(signIn);
+        } else {
+            row = signInMapper.insertSignIn(signIn);
+        }
+        return row;
     }
 
     /**
      * 修改会议室签到
-     * 
+     *
      * @param signIn 会议室签到
      * @return 结果
      */
     @Override
-    public int updateSignIn(SignIn signIn)
-    {
+    public int updateSignIn(SignIn signIn) {
         signIn.setUpdateTime(DateUtils.getNowDate());
         return signInMapper.updateSignIn(signIn);
     }
 
     /**
      * 批量删除会议室签到
-     * 
+     *
      * @param signInIds 需要删除的会议室签到主键
      * @return 结果
      */
     @Override
-    public int deleteSignInBySignInIds(Long[] signInIds)
-    {
+    public int deleteSignInBySignInIds(Long[] signInIds) {
         return signInMapper.deleteSignInBySignInIds(signInIds);
     }
 
     /**
      * 删除会议室签到信息
-     * 
+     *
      * @param signInId 会议室签到主键
      * @return 结果
      */
     @Override
-    public int deleteSignInBySignInId(Long signInId)
-    {
+    public int deleteSignInBySignInId(Long signInId) {
         return signInMapper.deleteSignInBySignInId(signInId);
     }
 }

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

@@ -8,6 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recordId"    column="record_id"    />
         <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
         <result property="recordContent"    column="record_content"    />
+        <result property="userId"    column="user_id"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="nickName"    column="nick_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -15,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMeetingRecordsVo">
-        select record_id, conference_room_order_id, record_content, create_time, update_by, update_time, remark from meeting_records
+        select record_id, conference_room_order_id, record_content, user_id, avatar, nick_name, create_time, update_by, update_time, remark from meeting_records
     </sql>
 
     <select id="selectMeetingRecordsList" parameterType="MeetingRecords" resultMap="MeetingRecordsResult">
@@ -23,10 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="conferenceRoomOrderId != null "> and conference_room_order_id = #{conferenceRoomOrderId}</if>
             <if test="recordContent != null  and recordContent != ''"> and record_content = #{recordContent}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <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
     </select>
     
-    <select id="selectMeetingRecordsByRecordId" parameterType="Long" resultMap="MeetingRecordsResult">
+    <select id="selectMeetingRecordsByRecordId" parameterType="string" resultMap="MeetingRecordsResult">
         <include refid="selectMeetingRecordsVo"/>
         where record_id = #{recordId}
     </select>
@@ -34,20 +41,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertMeetingRecords" parameterType="MeetingRecords" useGeneratedKeys="true" keyProperty="recordId">
         insert into meeting_records
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="conferenceRoomOrderId != null">conference_room_order_id,</if>
+            <if test="recordId != null and recordId != ''">record_id,</if>
+            <if test="conferenceRoomOrderId != null ">conference_room_order_id,</if>
             <if test="recordContent != null">record_content,</if>
-            <if test="createTime != null">create_time,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="avatar != null">avatar,</if>
+            <if test="nickName != null and nickName != ''">nick_name,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="recordId != null and recordId != ''">#{recordId},</if>
             <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
             <if test="recordContent != null">#{recordContent},</if>
-            <if test="createTime != null">#{createTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="avatar != null">#{avatar},</if>
+            <if test="nickName != null and nickName != ''">#{nickName},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            sysdate()
          </trim>
     </insert>
 
@@ -56,15 +71,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
             <if test="recordContent != null">record_content = #{recordContent},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            create_time = sysdate(),
         </trim>
         where record_id = #{recordId}
     </update>
 
-    <delete id="deleteMeetingRecordsByRecordId" parameterType="Long">
+    <delete id="deleteMeetingRecordsByRecordId" parameterType="String">
         delete from meeting_records where record_id = #{recordId}
     </delete>
 

ruoyi-system/src/main/resources/mapper/system/SignInMapper.xml

@@ -7,9 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="SignIn" id="SignInResult">
         <result property="signInId"    column="sign_in_id"    />
         <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
-        <result property="signUserId"    column="sign_user_id"    />
         <result property="conferenceRoomId"    column="conference_room_id"    />
-        <result property="signUserName"    column="sign_user_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="nickName"    column="nick_name"    />
         <result property="signTime"    column="sign_time"    />
         <result property="createDept"    column="create_dept"    />
         <result property="createBy"    column="create_by"    />
@@ -20,16 +21,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSignInVo">
-        select sign_in_id, conference_room_order_id, sign_user_id, conference_room_id, sign_user_name, sign_time, create_dept, create_by, create_time, update_by, update_time, remark from sign_in
+        select sign_in_id, conference_room_order_id, conference_room_id, user_id, avatar, nick_name, sign_time, create_dept, create_by, create_time, update_by, update_time, remark from sign_in
     </sql>
 
     <select id="selectSignInList" parameterType="SignIn" resultMap="SignInResult">
         <include refid="selectSignInVo"/>
         <where>  
             <if test="conferenceRoomOrderId != null "> and conference_room_order_id = #{conferenceRoomOrderId}</if>
-            <if test="signUserId != null "> and sign_user_id = #{signUserId}</if>
             <if test="conferenceRoomId != null "> and conference_room_id = #{conferenceRoomId}</if>
-            <if test="signUserName != null  and signUserName != ''"> and sign_user_name like concat('%', #{signUserName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
+            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="signTime != null "> and sign_time = #{signTime}</if>
             <if test="createDept != null "> and create_dept = #{createDept}</if>
         </where>
@@ -44,29 +46,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into sign_in
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="conferenceRoomOrderId != null">conference_room_order_id,</if>
-            <if test="signUserId != null">sign_user_id,</if>
             <if test="conferenceRoomId != null">conference_room_id,</if>
-            <if test="signUserName != null">sign_user_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="avatar != null">avatar,</if>
+            <if test="nickName != null">nick_name,</if>
             <if test="signTime != null">sign_time,</if>
             <if test="createDept != null">create_dept,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
-            <if test="signUserId != null">#{signUserId},</if>
             <if test="conferenceRoomId != null">#{conferenceRoomId},</if>
-            <if test="signUserName != null">#{signUserName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="avatar != null">#{avatar},</if>
+            <if test="nickName != null">#{nickName},</if>
             <if test="signTime != null">#{signTime},</if>
             <if test="createDept != null">#{createDept},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            sysdate()
          </trim>
     </insert>
 
@@ -74,9 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update sign_in
         <trim prefix="SET" suffixOverrides=",">
             <if test="conferenceRoomOrderId != null">conference_room_order_id = #{conferenceRoomOrderId},</if>
-            <if test="signUserId != null">sign_user_id = #{signUserId},</if>
             <if test="conferenceRoomId != null">conference_room_id = #{conferenceRoomId},</if>
-            <if test="signUserName != null">sign_user_name = #{signUserName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="signTime != null">sign_time = #{signTime},</if>
             <if test="createDept != null">create_dept = #{createDept},</if>
             <if test="createBy != null">create_by = #{createBy},</if>