zouxuan преди 5 години
родител
ревизия
87e1e32d5a

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherFreeTime.java

@@ -33,6 +33,9 @@ public class TeacherFreeTime {
 	
 	/**  */
 	private String sunday;
+
+	/**  */
+	private Integer holiday;
 	
 	private Integer totalTimes;
 	

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/TeacherFreeTimeService.java

@@ -5,4 +5,5 @@ import com.ym.mec.common.service.BaseService;
 
 public interface TeacherFreeTimeService extends BaseService<Integer, TeacherFreeTime> {
 
+    Object updateSet(TeacherFreeTime teacherFreeTime);
 }

+ 5 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherFreeTimeServiceImpl.java

@@ -20,4 +20,9 @@ public class TeacherFreeTimeServiceImpl extends BaseServiceImpl<Integer, Teacher
 		return teacherFreeTimeDao;
 	}
 
+	@Override
+	public Object updateSet(TeacherFreeTime teacherFreeTime) {
+
+		return null;
+	}
 }

+ 5 - 7
mec-biz/src/main/resources/config/mybatis/TeacherFreeTimeMapper.xml

@@ -14,6 +14,7 @@
 		<result column="friday_" property="friday" />
 		<result column="saturday_" property="saturday" />
 		<result column="sunday_" property="sunday" />
+		<result column="holiday_" property="holiday" />
 		<result column="total_times_" property="totalTimes" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -37,8 +38,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_free_time
-		(id_,user_id_,monday_,tuesday_,wednesday_,thursday_,friday_,saturday_,sunday_,total_times_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{monday},#{tuesday},#{wednesday},#{thursday},#{friday},#{saturday},#{sunday},#{totalTimes},#{createTime},#{updateTime})
+		(id_,user_id_,monday_,tuesday_,wednesday_,thursday_,friday_,saturday_,sunday_,holiday_,total_times_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{monday},#{tuesday},#{wednesday},#{thursday},#{friday},#{saturday},#{sunday},#{holiday},#{totalTimes},NOW(),NOW())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -54,8 +55,8 @@
 			<if test="thursday != null">
 				thursday_ = #{thursday},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
+			<if test="holiday != null">
+				holiday_ = #{holiday},
 			</if>
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
@@ -78,9 +79,6 @@
 			<if test="totalTimes != null">
 				total_times_ = #{totalTimes},
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

+ 2 - 5
mec-web/src/main/java/com/ym/mec/web/controller/TeacherFreeTimeController.java

@@ -36,16 +36,13 @@ public class TeacherFreeTimeController extends BaseController {
 	@ApiImplicitParam(name = "id", value = "ID编号", required = true, dataType = "Integer", paramType = "path")
 	@GetMapping(value = "/query")
 	public Object query(Integer id) {
-
 		return succeed(teacherFreeTimeService.get(id));
 	}
 
 	@ApiOperation("新增")
-	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/updateSet", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object add(TeacherFreeTime teacherFreeTime) {
-		Date date = new Date();
-		teacherFreeTime.setCreateTime(date);
-		return succeed(teacherFreeTimeService.insert(teacherFreeTime));
+		return succeed(teacherFreeTimeService.updateSet(teacherFreeTime));
 	}
 
 	@ApiOperation("更新")