知识点英语专题处理

src/main/java/com/ssj/dao/weixin/zuoyb/dao/ZuoybKnowHowDetailsSortDao.java

@@ -78,4 +78,16 @@ public interface ZuoybKnowHowDetailsSortDao extends JpaRepository<ZuoybKnowHowDe
 
 	@Query(nativeQuery = true, value = "select * from zyb_know_how_details_sort where stat=1 and grade =?1 and course_name=?2 and type=?3 and semester=?4 and alias=?5 limit 1")
 	ZuoybKnowHowDetailsSort findKnowHow(String grade,String subject,int version,int semester,String unit);
+
+	@Query(nativeQuery = true, value = "update zyb_know_how_details_sort set  alias=?3 where  how_id=?1 and stat = ?2")
+	@Modifying
+    void updateAliasByStatAndName(String howId, int stat, String name);
+
+	@Query(nativeQuery = true, value = "update zyb_know_how_details_sort set  alias=?3 where  how_details_id=?1 and stat = ?2")
+	@Modifying
+	void updateAliasByStatAndNameAndDetailId(String howDetailId, int stat, String name);
+
+	@Query(nativeQuery = true, value = "update zyb_know_how_details_sort set  alias=?3 where  how_details_kd_id=?1 and stat = ?2")
+	@Modifying
+	void updateAliasByStatAndNameAndKdId(String kdId, int stat, String name);
 }

src/main/java/com/ssj/dao/weixin/zuoyb/dao/impl/ZuoybQueryDaoImpl.java

@@ -575,6 +575,10 @@ public class ZuoybQueryDaoImpl  implements ZuoybQueryDao{
 			selSQL.append("and t.id = ? \n");
 			queryParams.add(params.get("LIKE_id"));
 		}
+		if(params.get("isZt") != null && !params.get("isZt").equals("")){
+			selSQL.append("and t.is_zt = ? \n");
+			queryParams.add(params.get("isZt"));
+		}
 	        if(params.get("EQ_grade") != null && !params.get("EQ_grade").equals("")){
 	        	selSQL.append("and s.grade_num = ? \n");
 	        	queryParams.add(params.get("EQ_grade"));

src/main/java/com/ssj/service/weixin/zuoyb/service/ZuoybKnowHowDetailsSortService.java

@@ -80,4 +80,15 @@ public interface ZuoybKnowHowDetailsSortService extends BaseService<ZuoybKnowHow
 	 */
 	List<ZuoybKnowHowDetailsSort> findByHowDetailIdAndTypeAndGradeAndSemester(List<String> howDetailIds, String grade, int semester, int type);
 
+	/**
+	 * 更新专题知识点单元的name
+	 * @param howId
+	 * @param stat
+	 * @param name
+	 */
+    void updateAliasByStatAndName(String howId, int stat, String name);
+
+	void updateAliasByStatAndNameAndDetailId(String id, int i, String name);
+
+	void updateAliasByStatAndNameAndKdId(String id, int i, String name);
 }

src/main/java/com/ssj/service/weixin/zuoyb/service/impl/ZuoybKnowHowDetailsSortServiceImpl.java

@@ -137,4 +137,19 @@ public class ZuoybKnowHowDetailsSortServiceImpl extends BaseServiceImpl<ZuoybKno
 	public List<ZuoybKnowHowDetailsSort> findByHowDetailIdAndTypeAndGradeAndSemester(List<String> howDetailIds, String grade, int semester, int type) {
 		return kmtKnowledgeMapper.findByHowDetailIdAndTypeAndGradeAndSemester(howDetailIds, grade, semester, type);
 	}
+
+	@Override
+	public void updateAliasByStatAndName(String howId, int stat, String name) {
+		zuoybKnowHowDetailsSortDao.updateAliasByStatAndName(howId,stat,name);
+	}
+
+	@Override
+	public void updateAliasByStatAndNameAndDetailId(String howDetailId, int stat, String name) {
+		zuoybKnowHowDetailsSortDao.updateAliasByStatAndNameAndDetailId(howDetailId,stat,name);
+	}
+
+	@Override
+	public void updateAliasByStatAndNameAndKdId(String kdId, int stat, String name) {
+		zuoybKnowHowDetailsSortDao.updateAliasByStatAndNameAndKdId(kdId,stat,name);
+	}
 }

src/main/java/com/ssj/sys/controller/SysZuoybController.java

@@ -6,6 +6,7 @@ import com.ssj.bean.sys.sort.domain.Sort;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.bean.weixin.zyb.domain.*;
 import com.ssj.framework.basic.common.bean.SplitPage;
+import com.ssj.framework.basic.config.bean.VersionConfig;
 import com.ssj.framework.core.common.controller.BaseController;
 import com.ssj.framework.core.util.StringUtil;
 import com.ssj.framework.core.util.SystemResourceLocator;
@@ -13,6 +14,7 @@ import com.ssj.service.sys.sort.service.SortService;
 import com.ssj.service.weixin.library.service.ILibJoinService;
 import com.ssj.service.weixin.zuoyb.service.*;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.Cell;
@@ -778,6 +780,7 @@ public class SysZuoybController extends BaseController {
 		params.put("beginDate", request.getParameter("beginDate")==null? "":request.getParameter("beginDate"));
 		params.put("endDate", request.getParameter("endDate")==null? "":request.getParameter("endDate"));
 		params.put("LIKE_id", request.getParameter("LIKE_id")==null?"":request.getParameter("LIKE_id"));
+		params.put("isZt", request.getParameter("isZt")==null?"":request.getParameter("isZt"));
 
 
 
@@ -894,34 +897,70 @@ public class SysZuoybController extends BaseController {
 	public Response knowHowSave(ZuoybKnowHow how) {
 		Response response = new Response();
 		how.setCreateTime(new Date());
+		boolean iaAdd = StringUtils.isBlank(how.getId())?true:false;
 		how = zuoybKnowHowService.save(how);
-		String[] version = how.getVersion();
-		if (version != null && version.length > 0) {
-			String grade = "";
-			List<Sort> list = sortService.getParamValByCode("grade");
-			Integer gradeNum = how.getGradeNum();
-			for (Sort sort : list) {
-				if (sort.getAliases().equals(gradeNum.toString())) {
-					grade = sort.getName();
-					break;
-				}
+		if(how.getCourseName().equals("英语") && how.getIsZt().intValue() == 1){
+			//1、新增专题单元
+			if(iaAdd){
+				//获取英语版本
+				List<VersionConfig> versionList =   SystemResourceLocator.getVersionList("英语").get("英语");
+				ZuoybKnowHow finalHow = how;
+				versionList.forEach(o->{
+					//获取年级
+					List<Sort> list = sortService.getParamValByCode("grade");
+					for (Sort sort : list) {
+						ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
+						howsort.setCreateTime(new Date());
+						howsort.setType(o.getVersionType());
+						howsort.setHowId(finalHow.getId());
+						howsort.setCourseName(finalHow.getCourseName());
+						howsort.setNum(finalHow.getNum());
+						howsort.setAlias(finalHow.getName());
+						howsort.setLibId(finalHow.getLibId());
+						howsort.setStat(1);
+						howsort.setGrade(sort.getName());
+						howsort.setGradeNum(Integer.parseInt(sort.getAliases()));
+						for(int i=1;i<3;i++){
+							howsort.setSemester(i);
+							zuoybKnowHowDetailsSortService.save(howsort);
+						}
+					}
+				});
+			}else{
+				//修改sort表的alias
+				zuoybKnowHowDetailsSortService.updateAliasByStatAndName(how.getId(),1,how.getName());
 			}
-			for (String string : version) {
-				ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
-				howsort.setCreateTime(new Date());
-				howsort.setType(Integer.parseInt(string));
-				howsort.setHowId(how.getId());
-				howsort.setCourseName(how.getCourseName());
-				howsort.setNum(how.getNum());
-				howsort.setAlias(how.getName());
-				howsort.setLibId(how.getLibId());
-				howsort.setStat(1);
-				howsort.setGrade(grade);
-				howsort.setGradeNum(how.getGradeNum());
-				howsort.setSemester(how.getSemester());
-				zuoybKnowHowDetailsSortService.save(howsort);
+
+		}else{
+			String[] version = how.getVersion();
+			if (version != null && version.length > 0) {
+				String grade = "";
+				List<Sort> list = sortService.getParamValByCode("grade");
+				Integer gradeNum = how.getGradeNum();
+				for (Sort sort : list) {
+					if (sort.getAliases().equals(gradeNum.toString())) {
+						grade = sort.getName();
+						break;
+					}
+				}
+				for (String string : version) {
+					ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
+					howsort.setCreateTime(new Date());
+					howsort.setType(Integer.parseInt(string));
+					howsort.setHowId(how.getId());
+					howsort.setCourseName(how.getCourseName());
+					howsort.setNum(how.getNum());
+					howsort.setAlias(how.getName());
+					howsort.setLibId(how.getLibId());
+					howsort.setStat(1);
+					howsort.setGrade(grade);
+					howsort.setGradeNum(how.getGradeNum());
+					howsort.setSemester(how.getSemester());
+					zuoybKnowHowDetailsSortService.save(howsort);
+				}
 			}
 		}
+
 		response.success("添加成功");
 		return response;
 	}
@@ -1269,7 +1308,7 @@ public class SysZuoybController extends BaseController {
 	}
 	/**
 	 * 作业知识点基础数据保存
-	 * @param content
+	 * @param
 	 * @return
 	 * 创建人：ZhangCaibao
 	 * 2017年7月5日 上午10:40:51
@@ -1280,48 +1319,96 @@ public class SysZuoybController extends BaseController {
 	public Response knowHowDetailSave(ZuoybKnowHowDetails how) {
 		Response response = new Response();
 		how.setCreateTime(new Date());
+		boolean iaAdd = StringUtils.isBlank(how.getId())?true:false;
 		how = zuoybKnowHowDetailsService.save(how);
+		ZuoybKnowHow zuoybKnowHow = zuoybKnowHowService.getById(how.getHowId());
+		if(zuoybKnowHow.getCourseName().equals("英语") && zuoybKnowHow.getIsZt().intValue() == 1){
+			//1、新增专题单元
+			if(iaAdd){
+				//获取英语版本
+				List<VersionConfig> versionList =   SystemResourceLocator.getVersionList("英语").get("英语");
+				ZuoybKnowHowDetails finalHow = how;
+				versionList.forEach(o->{
+					//获取年级
+					List<Sort> list = sortService.getParamValByCode("grade");
+					for (Sort sort : list) {
+						ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
+						howsort.setCreateTime(new Date());
+						howsort.setHowDetailsId(finalHow.getId());
+						howsort.setType(o.getVersionType());
+						howsort.setHowId(finalHow.getHowId());
+						howsort.setCourseName(zuoybKnowHow.getCourseName());
+						howsort.setNum(finalHow.getNum());
+						howsort.setAlias(finalHow.getName());
+						howsort.setLibId(finalHow.getLibId());
+						howsort.setStat(2);
+						howsort.setGrade(sort.getName());
+						howsort.setGradeNum(Integer.parseInt(sort.getAliases()));
+
+
+						howsort.setMemorize(finalHow.getMemorize());
+						howsort.setUnderstanding(finalHow.getUnderstanding());
+						howsort.setApply(finalHow.getApply());
+						howsort.setModule(finalHow.getModule());
+						howsort.setTwoModule(finalHow.getTwoModule());
+						howsort.setJxmb(finalHow.getJxmb());
+						howsort.setZdbx(finalHow.getZdbx());
+						howsort.setYdsl(finalHow.getYdsl());
+						for(int i=1;i<3;i++){
+							howsort.setSemester(i);
+							zuoybKnowHowDetailsSortService.save(howsort);
+						}
+						zuoybKnowHowDetailsSortService.save(howsort);
+					}
+				});
+			}else{
+				//修改sort表的alias
+				zuoybKnowHowDetailsSortService.updateAliasByStatAndNameAndDetailId(how.getId(),2,how.getName());
+			}
 
-		String[] version = how.getVersion();
-		if (version != null && version.length > 0) {
-			String grade = "";
-			List<Sort> list = sortService.getParamValByCode("grade");
-			Integer gradeNum = how.getGradeNum();
-			for (Sort sort : list) {
-				if (sort.getAliases().equals(gradeNum.toString())) {
-					grade = sort.getName();
-					break;
+		}else{
+			String[] version = how.getVersion();
+			if (version != null && version.length > 0) {
+				String grade = "";
+				List<Sort> list = sortService.getParamValByCode("grade");
+				Integer gradeNum = how.getGradeNum();
+				for (Sort sort : list) {
+					if (sort.getAliases().equals(gradeNum.toString())) {
+						grade = sort.getName();
+						break;
+					}
+				}
+//				ZuoybKnowHow zuoybKnowHow = zuoybKnowHowService.getById(how.getHowId());
+				for (String string : version) {
+					ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
+					howsort.setCreateTime(new Date());
+					howsort.setHowDetailsId(how.getId());
+					howsort.setType(Integer.parseInt(string));
+					howsort.setHowId(how.getHowId());
+					howsort.setCourseName(zuoybKnowHow.getCourseName());
+					howsort.setNum(how.getNum());
+					howsort.setAlias(how.getName());
+					howsort.setLibId(how.getLibId());
+					howsort.setStat(2);
+					howsort.setGrade(grade);
+					howsort.setGradeNum(how.getGradeNum());
+					howsort.setSemester(how.getSemester());
+
+					howsort.setMemorize(how.getMemorize());
+					howsort.setUnderstanding(how.getUnderstanding());
+					howsort.setApply(how.getApply());
+					howsort.setModule(how.getModule());
+					howsort.setTwoModule(how.getTwoModule());
+					howsort.setJxmb(how.getJxmb());
+					howsort.setZdbx(how.getZdbx());
+					howsort.setYdsl(how.getYdsl());
+
+					howsort=zuoybKnowHowDetailsSortService.save(howsort);
 				}
-			}
-			ZuoybKnowHow zuoybKnowHow = zuoybKnowHowService.getById(how.getHowId());
-			for (String string : version) {
-				ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
-				howsort.setCreateTime(new Date());
-				howsort.setHowDetailsId(how.getId());
-				howsort.setType(Integer.parseInt(string));
-				howsort.setHowId(how.getHowId());
-				howsort.setCourseName(zuoybKnowHow.getCourseName());
-				howsort.setNum(how.getNum());
-				howsort.setAlias(how.getName());
-				howsort.setLibId(how.getLibId());
-				howsort.setStat(2);
-				howsort.setGrade(grade);
-				howsort.setGradeNum(how.getGradeNum());
-				howsort.setSemester(how.getSemester());
-
-				howsort.setMemorize(how.getMemorize());
-				howsort.setUnderstanding(how.getUnderstanding());
-				howsort.setApply(how.getApply());
-				howsort.setModule(how.getModule());
-				howsort.setTwoModule(how.getTwoModule());
-				howsort.setJxmb(how.getJxmb());
-				howsort.setZdbx(how.getZdbx());
-				howsort.setYdsl(how.getYdsl());
-
-				howsort=zuoybKnowHowDetailsSortService.save(howsort);
 			}
 		}
 
+
 		response.success("添加成功");
 		return response;
 	}
@@ -1390,40 +1477,75 @@ public class SysZuoybController extends BaseController {
 	public Response knowHowDetailKdSave(  ZuoybKnowHowDetailsKd  how) {
 		Response response = new Response();
 		how.setCreateTime(new Date());
+		boolean iaAdd = StringUtils.isBlank(how.getId())?true:false;
 		how = zuoybKnowHowDetailsKdService.save(how);
+		ZuoybKnowHow zuoybKnowHow = zuoybKnowHowService.getById(how.getHowId());
+		if(zuoybKnowHow.getCourseName().equals("英语") && zuoybKnowHow.getIsZt().intValue() == 1){
+			//1、新增专题单元
+			if(iaAdd){
+				//获取英语版本
+				List<VersionConfig> versionList =   SystemResourceLocator.getVersionList("英语").get("英语");
+				ZuoybKnowHowDetailsKd finalHow = how;
+				versionList.forEach(o->{
+					//获取年级
+					List<Sort> list = sortService.getParamValByCode("grade");
+					for (Sort sort : list) {
+						ZuoybKnowHowDetailsSort howsort = new ZuoybKnowHowDetailsSort();
+						howsort.setCreateTime(new Date());
+						howsort.setHowDetailsId(finalHow.getHowDetailsId());
+						howsort.setHowDetailsKdId(finalHow.getId());
+						howsort.setType(o.getVersionType());
+						howsort.setHowId(finalHow.getHowId());
+						howsort.setCourseName(zuoybKnowHow.getCourseName());
+						howsort.setNum(finalHow.getNum());
+						howsort.setAlias(finalHow.getName());
+						howsort.setLibId(zuoybKnowHow.getLibId());
+						howsort.setStat(3);
+						howsort.setGrade(sort.getName());
+						howsort.setGradeNum(Integer.parseInt(sort.getAliases()));
+						for(int i=1;i<3;i++){
+							howsort.setSemester(i);
+							zuoybKnowHowDetailsSortService.save(howsort);
+						}
+					}
+				});
+			}else{
+				//修改sort表的alias
+				zuoybKnowHowDetailsSortService.updateAliasByStatAndNameAndKdId(how.getId(),3,how.getName());
+			}
 
-
-		String [] version = how.getVersion();
-		if(version!=null && version.length>0){
-			String grade = "";
-			List<Sort> list=sortService.getParamValByCode("grade");
-			Integer gradeNum = how.getGradeNum();
-			for (Sort sort : list) {
-				if(sort.getAliases().equals(gradeNum.toString())){
-					grade =sort.getName();
-					break;
+		}else{
+			String [] version = how.getVersion();
+			if(version!=null && version.length>0){
+				String grade = "";
+				List<Sort> list=sortService.getParamValByCode("grade");
+				Integer gradeNum = how.getGradeNum();
+				for (Sort sort : list) {
+					if(sort.getAliases().equals(gradeNum.toString())){
+						grade =sort.getName();
+						break;
+					}
+				}
+//				ZuoybKnowHow  zuoybKnowHow=	zuoybKnowHowService.getById(how.getHowId());
+				for (String string : version) {
+					ZuoybKnowHowDetailsSort  howsort = new ZuoybKnowHowDetailsSort();
+					howsort.setCreateTime(new Date());
+					howsort.setHowDetailsId(how.getHowDetailsId());
+					howsort.setHowDetailsKdId(how.getId());
+					howsort.setType(Integer.parseInt(string));
+					howsort.setHowId(how.getHowId());
+					howsort.setCourseName(zuoybKnowHow.getCourseName());
+					howsort.setNum(how.getNum());
+					howsort.setAlias(how.getName());
+					howsort.setLibId(zuoybKnowHow.getLibId());
+					howsort.setStat(3);
+					howsort.setGrade(grade);
+					howsort.setGradeNum(how.getGradeNum());
+					howsort.setSemester(how.getSemester());
+					howsort=zuoybKnowHowDetailsSortService.save(howsort);
 				}
-			}
-			ZuoybKnowHow  zuoybKnowHow=	zuoybKnowHowService.getById(how.getHowId());
-			for (String string : version) {
-				ZuoybKnowHowDetailsSort  howsort = new ZuoybKnowHowDetailsSort();
-				howsort.setCreateTime(new Date());
-				howsort.setHowDetailsId(how.getHowDetailsId());
-				howsort.setHowDetailsKdId(how.getId());
-				howsort.setType(Integer.parseInt(string));
-				howsort.setHowId(how.getHowId());
-				howsort.setCourseName(zuoybKnowHow.getCourseName());
-				howsort.setNum(how.getNum());
-				howsort.setAlias(how.getName());
-				howsort.setLibId(zuoybKnowHow.getLibId());
-				howsort.setStat(3);
-				howsort.setGrade(grade);
-				howsort.setGradeNum(how.getGradeNum());
-				howsort.setSemester(how.getSemester());
-				howsort=zuoybKnowHowDetailsSortService.save(howsort);
 			}
 		}
-
 		response.success("添加成功");
 		return response;
 	}

src/main/resources/templates/sys/fx/merchantAllEdit.html

@@ -345,12 +345,6 @@
 							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'signServiceAdd(\''+${item.id}+'\')'" class="tablelink">加油包</a>
 							<a href="javascript:;" th:onclick="'openNew2(\''+${item.libId}+'\')'" th:if="${item.status!=1 && item.libId != null}"   class="tablelink">设置</a>
 						</di>
-						<di th:if="
-						${ #httpSession.getAttribute('admin') !=null && #lists.contains(#httpSession.getAttribute('admin').authorities,'商户管理员')}
-						">
-							<a href="javascript:;" th:if="${item.posType==2 && item.status!=1 && ( item.type == 4) }"  th:onclick="'libServiceAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
-							<a href="javascript:;" th:if="${item.posType==3 && item.status!=1 && ( item.type == 4) }"  th:onclick="'libServiceScAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
-						</di>
 						<a href="javascript:;" th:if="${item.status!=1 && item.libId != null}"  th:onclick="'libServiceXfAdd(\''+${item.id}+'\')'" class="tablelink">续费</a>
 					 </td>
 					

src/main/resources/templates/sys/zuoyb/knowHowAdd.html

@@ -92,20 +92,6 @@
 				 	<label th:each="version:${versions['数学'] }" class="other" th:style="${how!=null && how.courseName!=null && how.courseName eq '数学' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  th:value="${version.versionType }" />[[${version.versionName}]]</label>
 			 	 	<label th:each="version:${versions['语文'] }" class="chinese" th:style="${how!=null && how.courseName!=null && how.courseName eq '语文' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  th:value="${version.versionType }" />[[${version.versionName}]]</label>
 			 		<label th:each="version:${versions['英语'] }" class="english" th:style="${how!=null && how.courseName!=null && how.courseName eq '英语' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  th:value="${version.versionType }" />[[${version.versionName}]]</label>
-			
-				
-<!-- 				    <label class="other" th:style="${how!=null && how.courseName!=null && how.courseName eq '数学' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  value="1" />北师大</label> -->
-<!-- 					<label class="other" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '数学' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  value="2" />人教版</label> -->
-<!-- 					<label class="other" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '数学' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  value="5" />江苏版</label> -->
-<!-- 					<label class="other" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '数学' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  value="6" />思维拓展</label> -->
-					
-<!-- 					<label class="chinese" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '语文' ? '' : 'display: none'}"><input type="checkbox" class="version" name="version"  value="2" />人教(部编)</label> -->
-					
-<!-- 					<label class="english" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '英语' ? '' : 'display: none'}"><input type="checkbox" class="version"  name="version"  value="2" />教科版</label> -->
-<!-- 					<label class="english" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '英语' ? '' : 'display: none'}"><input type="checkbox" class="version"   name="version"  value="3" />沪教版（新）</label> -->
-<!-- 					<label class="english" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '英语' ? '' : 'display: none'}"><input type="checkbox" class="version"   name="version"  value="7" />朗文版</label> -->
-<!-- 					<label class="english" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '英语' ? 'width: 100px;' : 'display: none;width: 100px;'}"><input type="checkbox" class="version"   name="version"  value="8" />人教版（PEP）</label> -->
-<!-- 					<label class="english" th:style="${how!=null && how.courseName!=null &&  how.courseName eq '英语' ? '' : 'display: none'}"><input type="checkbox" class="version"   name="version"  value="9" />牛津版</label> -->
 				</div>
 			 </li>
 			  <li class="clearfix schoolgrade" th:if="${#strings.isEmpty(how.id)}" style="display: none ">

src/main/resources/templates/sys/zuoyb/knowHowList.html

@@ -52,25 +52,20 @@
 					</select>
 		</li>
 		<li>
+		<label>专题</label>
+					<select class="scinput select_width" name="isZt" id="isZt" >
+					     <option value=""    >全部</option>
+					      <option value="1"  th:selected="${ search.get('isZt') eq '1' }"  >是</option>
+						 <option  value="0"  th:selected="${ search.get('isZt') eq '0' }" >否</option>
+					</select>
+		</li>
+		<li>
 		<label>版本</label>
 					<select class="scinput select_width2" name="banben" id="banben" >
 					 	<option value=""    >全部</option>
 					     <option th:each="version:${versions['数学'] }"  th:selected="${search.get('banben') eq (version.versionType+'') && search.get('EQ_courseName') eq '数学'}"  th:value="${version.versionType }">[[${version.courseName +':'+version.versionName}]]</option>
 						 <option th:each="version:${versions['语文'] }"  th:selected="${search.get('banben') eq (version.versionType+'') && search.get('EQ_courseName') eq '语文'}"  th:value="${version.versionType }">[[${version.courseName +':'+version.versionName}]]</option>
 					 	 <option th:each="version:${versions['英语'] }"  th:selected="${search.get('banben') eq (version.versionType+'') && search.get('EQ_courseName') eq '英语'}"  th:value="${version.versionType }">[[${version.courseName +':'+version.versionName}]]</option>
-					
-<!-- 						 <option  value="1" th:selected="${ search.get('banben') eq '1'  && search.get('EQ_courseName')  eq '数学'  }"   >北师大</option> -->
-<!-- 						 <option  value="2" th:selected="${ search.get('banben') eq '2' && search.get('EQ_courseName')  eq '数学' }"  >人教版</option> -->
-<!-- 						 <option  value="5" th:selected="${ search.get('banben') eq '5' && search.get('EQ_courseName')  eq '数学' }"  >江苏版</option> -->
-<!-- 						 <option  value="6" th:selected="${ search.get('banben') eq '6' && search.get('EQ_courseName')  eq '数学' }"  >思维拓展</option> -->
-						
-<!-- 						 <option  value="2" th:selected="${ search.get('banben') eq '2' && search.get('EQ_courseName')  eq '语文' }"  >人教(部编)</option> -->
-						 
-<!-- 						 <option value="2" th:selected="${ search.get('banben') eq '2' && search.get('EQ_courseName') eq '英语' }"   >教科版</option> -->
-<!-- 						 <option  value="3" th:selected="${ search.get('banben') eq '3' }"  >沪教版（新）</option> -->
-<!-- 						 <option  value="7" th:selected="${ search.get('banben') eq '7' }"  >朗文版</option> -->
-<!-- 						 <option  value="8" th:selected="${ search.get('banben') eq '8' }"  >人教版（PEP）</option> -->
-<!-- 						 <option  value="9" th:selected="${ search.get('banben') eq '9' }"  >牛津版</option> -->
 					</select>
 		</li>
 		<li>