Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/education/modules/base/dao/ScheduleSheetRecordDAO.java

@@ -15,5 +15,6 @@ public interface ScheduleSheetRecordDAO {
 	int delete(String id);
 	List<ScheduleSheetRecord> list();
 	ScheduleSheetRecord findByMonth(String month);
+	ScheduleSheetRecord findByBuilderId(String builderId);
 	List<ScheduleSheetRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/education/modules/base/service/impl/ScheduleSheetServiceImpl.java

@@ -138,7 +138,7 @@ public class ScheduleSheetServiceImpl implements ScheduleSheetService {
 			for (ScheduleBuilder scheduleBuilder:scheduleBuilderList) {
 
 				//之前是否有排课记录
-				ScheduleSheetRecord curItem = scheduleSheetRecordDAO.get(scheduleBuilder.getBuilderId());
+				ScheduleSheetRecord curItem = scheduleSheetRecordDAO.findByBuilderId(scheduleBuilder.getBuilderId());
 
 				if(curItem==null) {
 					if (StringUtils.isNotEmpty(scheduleBuilder.getRepeatSet())) {
@@ -191,7 +191,7 @@ public class ScheduleSheetServiceImpl implements ScheduleSheetService {
 												String courseHour = "";
 
 												while (start != end) {
-													courseHour += String.valueOf(start) + ",";
+													courseHour += String.valueOf(start) + ":00,";
 													start++;
 												}
 

common/src/main/resources/mapper/base/CommissionTemplate.xml

@@ -75,8 +75,8 @@
 		]]>
 		<where>
 			del_if=false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and template_name like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

common/src/main/resources/mapper/base/ScheduleSheetRecord.xml

@@ -72,7 +72,9 @@
 	<select id="findByMonth" resultMap="ScheduleSheetRecordMap">
 		select * from t_schedule_sheet_record where del_if = false and schedule_year_month = #{0} limit 1
 	</select>
-
+	<select id="findByBuilderId" resultMap="ScheduleSheetRecordMap">
+		select * from t_schedule_sheet_record where del_if = false and builder_id = #{0} limit 1
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="ScheduleSheetRecordMap">
 		<![CDATA[
 			select * from t_schedule_sheet_record

web/src/main/java/com/jpsoft/education/modules/base/controller/CommissionTemplateController.java

@@ -209,7 +209,7 @@ public class CommissionTemplateController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -225,8 +225,8 @@ public class CommissionTemplateController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }