Antiloveg лет назад: 8
Родитель
Сommit
2526d7e6d3

+ 4 - 1
schema/20170725-lectureUser.sql

@@ -5,4 +5,7 @@ CREATE TABLE `lecture_user` (
   `last_update_time` DATETIME NULL COMMENT '最近一次咨询时间',
   `last_update_time` DATETIME NULL COMMENT '最近一次咨询时间',
   PRIMARY KEY (`lid`, `uid`))
   PRIMARY KEY (`lid`, `uid`))
 ENGINE = InnoDB DEFAULT CHARSET=utf8mb4
 ENGINE = InnoDB DEFAULT CHARSET=utf8mb4
-COMMENT = '科技讲堂报名'
+COMMENT = '科技讲堂报名';
+
+alter table `lecture` 
+add column `lecturer` varchar(45) NULL comment '讲师';

+ 2 - 2
src/main/java/com/goafanti/LectureUser/service/impl/LectureUserServiceImpl.java

@@ -64,7 +64,7 @@ public class LectureUserServiceImpl extends BaseMybatisDao<LectureUserMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 			pSize = 10;
 		}
 		}
-		return (Pagination<LectureUserListBo>) findPage("findActivityUserListByPage", "findActivityUserCount",
+		return (Pagination<LectureUserListBo>) findPage("findLectureUserListByPage", "findLectureUserCount",
 				disposeLectureList(lectureName, mobile, number, username, null), pNo, pSize);
 				disposeLectureList(lectureName, mobile, number, username, null), pNo, pSize);
 	}
 	}
 
 
@@ -79,7 +79,7 @@ public class LectureUserServiceImpl extends BaseMybatisDao<LectureUserMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 			pSize = 10;
 		}
 		}
-		return (Pagination<LectureUserListBo>) findPage("findActivityOrgListByPage", "findActivityOrgCount",
+		return (Pagination<LectureUserListBo>) findPage("findLectureOrgListByPage", "findLectureOrgCount",
 				disposeLectureList(lectureName, mobile, number, null, unitName), pNo, pSize);
 				disposeLectureList(lectureName, mobile, number, null, unitName), pNo, pSize);
 	}
 	}
 
 

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -173,7 +173,7 @@
   		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
   		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
   	<if test="unitName != null">
   	<if test="unitName != null">
-  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
   	order by au.last_update_time desc
   	order by au.last_update_time desc
   	<if test="page_sql!=null">
   	<if test="page_sql!=null">
@@ -199,7 +199,7 @@
   		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
   		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
   	<if test="unitName != null">
   	<if test="unitName != null">
-  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
   </select>
   </select>
   
   

+ 21 - 7
src/main/java/com/goafanti/common/mapper/LectureMapper.xml

@@ -14,10 +14,11 @@
     <result column="hot" property="hot" jdbcType="INTEGER" />
     <result column="hot" property="hot" jdbcType="INTEGER" />
     <result column="dynamic" property="dynamic" jdbcType="INTEGER" />
     <result column="dynamic" property="dynamic" jdbcType="INTEGER" />
     <result column="end_time" property="endTime" jdbcType="TIMESTAMP" />
     <result column="end_time" property="endTime" jdbcType="TIMESTAMP" />
+    <result column="lecturer" property="lecturer" jdbcType="VARCHAR" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List" >
   <sql id="Base_Column_List" >
     id, uid, lecture_time, create_time, last_update_time, name, summary, deleted_sign, lecture_url,
     id, uid, lecture_time, create_time, last_update_time, name, summary, deleted_sign, lecture_url,
-    hot, dynamic, end_time
+    hot, dynamic, end_time, lecturer
   </sql>
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     select 
@@ -36,7 +37,7 @@
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{lectureTime,jdbcType=TIMESTAMP}, 
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{lectureTime,jdbcType=TIMESTAMP}, 
       #{createTime,jdbcType=TIMESTAMP}, #{lastUpdateTime,jdbcType=TIMESTAMP}, #{name,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{lastUpdateTime,jdbcType=TIMESTAMP}, #{name,jdbcType=VARCHAR}, 
       #{summary,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{lectureUrl,jdbcType=VARCHAR},
       #{summary,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{lectureUrl,jdbcType=VARCHAR},
-      #{hot,jdbcType=INTEGER}, #{dynamic,jdbcType=INTEGER}, #{endTime,jdbcType=TIMESTAMP})
+      #{hot,jdbcType=INTEGER}, #{dynamic,jdbcType=INTEGER}, #{endTime,jdbcType=TIMESTAMP}, #{lecturer,jdbcType=VARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Lecture" >
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Lecture" >
     insert into lecture
     insert into lecture
@@ -77,6 +78,9 @@
       <if test="endTime != null" >
       <if test="endTime != null" >
         end_time,
         end_time,
       </if>
       </if>
+      <if test="lecturer != null" >
+        lecturer,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
       <if test="id != null" >
@@ -112,9 +116,12 @@
       <if test="dynamic != null" >
       <if test="dynamic != null" >
         #{dynamic,jdbcType=INTEGER},
         #{dynamic,jdbcType=INTEGER},
       </if>
       </if>
-       <if test="endTime != null" >
+      <if test="endTime != null" >
         #{endTime,jdbcType=TIMESTAMP},
         #{endTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="lecturer != null" >
+        #{lecturer,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Lecture" >
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Lecture" >
@@ -153,6 +160,9 @@
       <if test="endTime != null" >
       <if test="endTime != null" >
         end_time = #{endTime,jdbcType=TIMESTAMP},
         end_time = #{endTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+       <if test="lecturer != null" >
+        lecturer = #{lecturer,jdbcType=VARCHAR},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
@@ -168,7 +178,8 @@
       lecture_url = #{lectureUrl,jdbcType=VARCHAR},
       lecture_url = #{lectureUrl,jdbcType=VARCHAR},
       hot = #{hot,jdbcType=INTEGER},
       hot = #{hot,jdbcType=INTEGER},
       dynamic = #{dynamic,jdbcType=INTEGER},
       dynamic = #{dynamic,jdbcType=INTEGER},
-      end_time = #{endTime,jdbcType=TIMESTAMP}
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      lecturer = #{lecturer,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
   
   
@@ -192,7 +203,8 @@
 	  		ui.username,
 	  		ui.username,
 	  		l.hot,
 	  		l.hot,
 	  		l.dynamic,
 	  		l.dynamic,
-	  		l.end_time as endTime
+	  		l.end_time as endTime,
+	  		l.lecturer
 	  	from lecture l
 	  	from lecture l
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 
 	  	where 
@@ -269,7 +281,8 @@
 	  		ui.username,
 	  		ui.username,
 	  		l.hot,
 	  		l.hot,
 	  		l.dynamic,
 	  		l.dynamic,
-	  		l.end_time as endTime
+	  		l.end_time as endTime,
+	  		l.lecturer
 	  	from lecture l
 	  	from lecture l
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 
 	  	where 
@@ -288,7 +301,8 @@
 	  		ui.username,
 	  		ui.username,
 	  		l.hot,
 	  		l.hot,
 	  		l.dynamic,
 	  		l.dynamic,
-	  		l.end_time as endTime
+	  		l.end_time as endTime,
+	  		l.lecturer
 	  	from lecture l
 	  	from lecture l
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 
 	  	where 

+ 115 - 1
src/main/java/com/goafanti/common/mapper/LectureUserMapper.xml

@@ -82,11 +82,125 @@
   
   
    <delete id="batchDeleteByPrimaryKey" parameterType="java.util.List">
    <delete id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	delete
   	delete
-  		from activity_user
+  		from lecture_user
   	where id in
   	where id in
   	<foreach item="item" index="index" collection="list" open="("
   	<foreach item="item" index="index" collection="list" open="("
 			separator="," close=")">
 			separator="," close=")">
 			#{item}
 			#{item}
 	</foreach>
 	</foreach>
   </delete>
   </delete>
+  
+  <select id="findLectureUserListByPage" parameterType="String" resultType="com.goafanti.LectureUser.bo.LectureUserListBo">
+  	select
+  		lu.lid,
+  		lu.uid,
+  		lu.create_time as createTime,
+  		lu.last_update_time as lastUpdateTime,
+  		l.name as lectureName,
+  		u.number,
+  		u.mobile,
+  		ui.username,
+  		l.lecture_time as lectureTime,
+  		l.end_time as endTime
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join user_identity ui on ui.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 0 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="lectureName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by lu.lecture_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findLectureUserCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join user_identity ui on ui.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 0  
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="lectureName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
+  
+  <select id="findLectureOrgListByPage" parameterType="String" resultType="com.goafanti.LectureUser.bo.LectureUserListBo">
+  	select
+  		lu.lid,
+  		lu.uid,
+  		lu.create_time as createTime,
+  		lu.last_update_time as lastUpdateTime,
+  		l.name as lectureName,
+  		u.number,
+  		u.mobile,
+  		oi.unit_name as unitName,
+  		l.lecture_time as lectureTime,
+  		l.end_time as endTime
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join organization_identity oi on oi.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="lectureName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by lu.lecture_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findLectureOrgCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join organization_identity oi on oi.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
 </mapper>
 </mapper>

+ 18 - 8
src/main/java/com/goafanti/common/model/Lecture.java

@@ -66,6 +66,8 @@ public class Lecture {
 	 */
 	 */
 	private Date	endTime;
 	private Date	endTime;
 
 
+	private String	lecturer;
+
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
 	}
 	}
@@ -165,6 +167,14 @@ public class Lecture {
 		this.endTime = endTime;
 		this.endTime = endTime;
 	}
 	}
 
 
+	public String getLecturer() {
+		return lecturer;
+	}
+
+	public void setLecturer(String lecturer) {
+		this.lecturer = lecturer;
+	}
+
 	public String getLectureTimeFormattedDate() {
 	public String getLectureTimeFormattedDate() {
 		if (this.lectureTime == null) {
 		if (this.lectureTime == null) {
 			return null;
 			return null;
@@ -188,18 +198,18 @@ public class Lecture {
 	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
 	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
 
 
 	}
 	}
-	
-	public Integer getLectureStatus(){
-		if (this.lectureTime == null){
+
+	public Integer getLectureStatus() {
+		if (this.lectureTime == null) {
 			return ActivityStatus.ENROLL.getCode();
 			return ActivityStatus.ENROLL.getCode();
-		} 
-		if (new Date().getTime() > this.lectureTime.getTime()){
+		}
+		if (new Date().getTime() > this.lectureTime.getTime()) {
 			return ActivityStatus.CLOSED.getCode();
 			return ActivityStatus.CLOSED.getCode();
 		}
 		}
 		return ActivityStatus.ENROLL.getCode();
 		return ActivityStatus.ENROLL.getCode();
 	}
 	}
-	
-	public void setLectureStatus(Integer lectureStatus){
-		
+
+	public void setLectureStatus(Integer lectureStatus) {
+
 	}
 	}
 }
 }

+ 11 - 0
src/main/java/com/goafanti/lecture/bo/InputLecture.java

@@ -30,6 +30,9 @@ public class InputLecture {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	dynamic;
 	private Integer	dynamic;
 
 
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	lecturer;
+
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
 	}
 	}
@@ -86,4 +89,12 @@ public class InputLecture {
 		this.dynamic = dynamic;
 		this.dynamic = dynamic;
 	}
 	}
 
 
+	public String getLecturer() {
+		return lecturer;
+	}
+
+	public void setLecturer(String lecturer) {
+		this.lecturer = lecturer;
+	}
+
 }
 }

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html