Merge remote-tracking branch 'origin/new-exam' into new-exam

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

@@ -79,6 +79,11 @@ public class TdMeeting extends BaseEntity {
      */
     private String fileName;
 
+    /**
+     * 部门
+     */
+    private Long deptId;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckReport.java

@@ -109,6 +109,11 @@ public class TdCheckReport implements Serializable {
     @Excel(name = "备注")
     private String remark;
 
+    /**
+     * 部门
+     */
+    private Long deptId;
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

ruoyi-system/src/main/java/com/ruoyi/system/domain/place/TdPlace.java

@@ -65,6 +65,11 @@ public class TdPlace extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date afterTime;
 
+    /**
+     * 部门
+     */
+    private Long deptId;
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -20,13 +20,14 @@
             <result property="realScore" column="real_score" jdbcType="VARCHAR"/>
             <result property="percentageScore" column="percentage_score" jdbcType="VARCHAR"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         check_id,adduser,depart,
         check_start_time,check_end_time,check_type,
         area,framework,check_state,
-        check_name,create_time,total_score,real_score,percentage_score,remark
+        check_name,create_time,total_score,real_score,percentage_score,remark,dept_id
     </sql>
     <select id="selectTdCheckReportList" resultType="com.ruoyi.system.domain.check.TdCheckReport">
         select  <include refid="Base_Column_List"/> from  td_check_report

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

@@ -22,6 +22,7 @@
             <result property="updateBy"     column="update_by"      />
             <result property="updateTime"   column="update_time"    />
             <result property="remark"       column="remark"         />
+            <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -29,7 +30,7 @@
         meeting_address,meeting_usernum,meeting_host,
         meeting_type,meeting_state,agenda,
         summary,file_url,
-        file_name,create_by, create_time, update_by, update_time, remark
+        file_name,create_by, create_time, update_by, update_time, remark,dept_id
     </sql>
     <select id="selectTdMeetingList" resultType="com.ruoyi.system.domain.TdMeeting">
         select  <include refid="Base_Column_List"/> from  td_meeting

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

@@ -18,12 +18,13 @@
             <result property="afterRule" column="after_rule" jdbcType="VARCHAR"/>
             <result property="state" column="state" jdbcType="VARCHAR"/>
             <result property="isDissolve" column="is_dissolve" jdbcType="VARCHAR"/>
+            <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,place_name,place_rule,
         create_by,create_time,update_by,
-        update_time,remark,after_time,after_name,after_rule,state,is_dissolve
+        update_time,remark,after_time,after_name,after_rule,state,is_dissolve,dept_id
     </sql>
     <select id="selectTdPlaceList" resultType="com.ruoyi.system.domain.place.TdPlace">
         select  <include refid="Base_Column_List"/> from  td_place