Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml

@@ -29,6 +29,7 @@
 
         <result property="residenAffili"    column="residen_affili"   />
         <result property="appliAgentTitle"    column="appli_agent_title"   />
+        <result property="userId"    column="user_id"   />
 
     </resultMap>
 
@@ -37,8 +38,9 @@
         c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
         c.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
         c.residen_affili,c.appli_agent_title,
-        c.track_num,c.application_organ_id,c.application_organ_name
+        c.track_num,c.application_organ_id,c.application_organ_name,s.user_id
         from case_affiliate c
+        left join sys_user s on c.identity_num=s.id_card
         <where>
             <if test="caseAppliId != null ">
                 AND c.case_appli_id = #{caseAppliId}

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ReservedConferenceMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.ReservedConferenceMapper">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.ReservedConference" id="BaseResult">
+        <id     property="id"       column="id"      />
+        <result property="caseId"     column="case_id"    />
+        <result property="roomId"     column="room_id"    />
+        <result property="scheduleStartTime"        column="schedule_start_time"        />
+        <result property="scheduleEndTime"  column="schedule_end_time"  />
+
+    </resultMap>
+    <insert id="insert">
+        insert into reserved_conference(
+        case_id,
+        room_id,
+        schedule_start_time,
+        schedule_end_time
+        )values(
+                #{caseId},
+                #{roomId},
+                #{scheduleStartTime},
+                #{scheduleEndTime}
+        )
+    </insert>
+    <delete id="deleteByRoomId">
+        delete from reserved_conference where room_id=#{roomId}
+    </delete>
+    <select id="selectListByCaseId" resultMap="BaseResult">
+        select * from reserved_conference where case_id=#{caseId}
+    </select>
+
+
+</mapper>