新增 会议签到,会议纪要

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:

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

@@ -24,10 +24,14 @@ public class SignIn extends BaseEntity
     /** 会议室预约ID */
     @Excel(name = "会议室预约ID")
     private Long conferenceRoomOrderId;
+    /** 会议室预约名称 */
+    private String conferenceRoomOrderName;
 
     /** 会议室ID */
     @Excel(name = "会议室ID")
     private Long conferenceRoomId;
+    /** 会议室名称 */
+    private String conferenceRoomName;
 
     /** 用户id */
     @Excel(name = "用户id")
@@ -50,7 +54,23 @@ public class SignIn extends BaseEntity
     @Excel(name = "创建部门")
     private Long createDept;
 
-    public void setSignInId(Long signInId) 
+    public String getConferenceRoomOrderName() {
+        return conferenceRoomOrderName;
+    }
+
+    public void setConferenceRoomOrderName(String conferenceRoomOrderName) {
+        this.conferenceRoomOrderName = conferenceRoomOrderName;
+    }
+
+    public String getConferenceRoomName() {
+        return conferenceRoomName;
+    }
+
+    public void setConferenceRoomName(String conferenceRoomName) {
+        this.conferenceRoomName = conferenceRoomName;
+    }
+
+    public void setSignInId(Long signInId)
     {
         this.signInId = signInId;
     }

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

@@ -3,7 +3,9 @@ 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.ConferenceRoomOrder;
 import com.ruoyi.system.domain.SignIn;
+import com.ruoyi.system.mapper.ConferenceRoomOrderMapper;
 import com.ruoyi.system.mapper.SignInMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISignInService;
@@ -24,6 +26,8 @@ public class SignInServiceImpl implements ISignInService {
     private SignInMapper signInMapper;
     @Autowired
     private SysUserMapper sysUserMapper;
+    @Autowired
+    private ConferenceRoomOrderMapper conferenceRoomOrderMapper;
 
 
     /**
@@ -72,15 +76,21 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setSignTime(DateUtils.getNowDate());
         //先去查询用户是否已经签到
         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);
+        Long conferenceRoomOrderId = signIn.getConferenceRoomOrderId();
+        ConferenceRoomOrder conferenceRoomOrder = conferenceRoomOrderMapper.selectConferenceRoomOrderByConferenceRoomOrderId(conferenceRoomOrderId);
+        if (conferenceRoomOrder != null){
+            sign.setConferenceRoomName(conferenceRoomOrder.getConferenceRoomName());
+            sign.setConferenceRoomOrderName(conferenceRoomOrder.getConferenceName());
+            sign.setConferenceRoomOrderId(conferenceRoomOrderId);
+            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;
     }

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

@@ -7,7 +7,9 @@ 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="conferenceRoomOrderName"    column="conference_room_order_name"    />
         <result property="conferenceRoomId"    column="conference_room_id"    />
+        <result property="conferenceRoomName"    column="conference_room_name"    />
         <result property="userId"    column="user_id"    />
         <result property="avatar"    column="avatar"    />
         <result property="nickName"    column="nick_name"    />
@@ -21,14 +23,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSignInVo">
-        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
+        select sign_in_id, conference_room_order_id,conference_room_order_name, conference_room_id,conference_room_name, 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="conferenceRoomOrderName != null and conferenceRoomOrderName != ''"> and conference_room_order_name = #{conferenceRoomOrderName}</if>
             <if test="conferenceRoomId != null "> and conference_room_id = #{conferenceRoomId}</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != '' "> and conferenceRoomName = #{conference_room_name}</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>
@@ -46,7 +50,9 @@ 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="conferenceRoomOrderName != null and conferenceRoomOrderName != ''">conference_room_order_name,</if>
             <if test="conferenceRoomId != null">conference_room_id,</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != ''">conference_room_name,</if>
             <if test="userId != null">user_id,</if>
             <if test="avatar != null">avatar,</if>
             <if test="nickName != null">nick_name,</if>
@@ -60,7 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="conferenceRoomOrderId != null">#{conferenceRoomOrderId},</if>
+            <if test="conferenceRoomOrderName != null and conferenceRoomOrderName != ''">#{conferenceRoomOrderName},</if>
             <if test="conferenceRoomId != null">#{conferenceRoomId},</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != ''">#{conferenceRoomName},</if>
             <if test="userId != null">#{userId},</if>
             <if test="avatar != null">#{avatar},</if>
             <if test="nickName != null">#{nickName},</if>
@@ -78,7 +86,9 @@ 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="conferenceRoomOrderName != null and conferenceRoomOrderName != ''">conference_room_order_name = #{conferenceRoomOrderName},</if>
             <if test="conferenceRoomId != null">conference_room_id = #{conferenceRoomId},</if>
+            <if test="conferenceRoomName != null and conferenceRoomName != ''">conference_room_name = #{conferenceRoomName},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="avatar != null">avatar = #{avatar},</if>
             <if test="nickName != null">nick_name = #{nickName},</if>