|
@@ -23,6 +23,8 @@ import com.ssj.framework.core.common.controller.BaseController;
|
|
|
import com.ssj.framework.core.util.HttpRemote;
|
|
|
import com.ssj.framework.core.util.ResponseEntity;
|
|
|
import com.ssj.framework.core.util.SystemResourceLocator;
|
|
|
+import com.ssj.school.book.entity.SchoolBookDetail;
|
|
|
+import com.ssj.school.book.service.ISchoolBookService;
|
|
|
import com.ssj.service.sys.fx.service.MerchantAreaService;
|
|
|
import com.ssj.service.sys.fx.service.MerchantService;
|
|
|
import com.ssj.service.sys.problem.service.IBanbenDetailService;
|
|
@@ -96,6 +98,9 @@ public class SysProblemController extends BaseController{
|
|
|
private MerchantService merchantService;
|
|
|
@Autowired
|
|
|
private MerchantAreaService areaService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ISchoolBookService schoolBookService;
|
|
|
|
|
|
/**
|
|
|
*
|
|
@@ -876,6 +881,7 @@ public String updateviplist(Model model,
|
|
|
response.success("添加成功");
|
|
|
return response;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 删除
|
|
|
* @param id
|
|
@@ -1062,4 +1068,120 @@ public String updateviplist(Model model,
|
|
|
response.success("添加成功");
|
|
|
return response;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * -----------学校关联练习册---------
|
|
|
+ */
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param model
|
|
|
+ * @param pageSize
|
|
|
+ * @param pageNo
|
|
|
+ * @return
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
+ @RequestMapping("/schoolBookList")
|
|
|
+ public String schoolBookList(Model model,
|
|
|
+ @RequestParam(required = false, defaultValue = "10") int pageSize,
|
|
|
+ @RequestParam(required = false, defaultValue = "1") int pageNo) {
|
|
|
+ Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ //学校名称
|
|
|
+ params.put("name", request.getParameter("name")==null?"":request.getParameter("name"));
|
|
|
+ SplitPage sp = new SplitPage();
|
|
|
+ sp.setAction(request.getRequestURI());
|
|
|
+ sp.setPageNo(pageNo);
|
|
|
+ sp.setPageSize(pageSize);
|
|
|
+ sp.setParams(params);
|
|
|
+ Page<Map<String, Object>> page= schoolBookService.findBookDetailPage(params, initPage(pageNo,pageSize));
|
|
|
+ sp.setRowCnt((int) page.getTotalElements());
|
|
|
+ model.addAttribute("list", page.getContent());
|
|
|
+ model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
|
+ model.addAttribute("page", sp);
|
|
|
+ model.addAttribute("search", params);
|
|
|
+ //model.addAttribute("version",SystemResourceLocator.getVersionList());
|
|
|
+ return "sys/school/schoolBookList";
|
|
|
+ }
|
|
|
+
|
|
|
+ @RequestMapping("/schoolBookAdd")
|
|
|
+ public String schoolBookAdd(Model model) {
|
|
|
+
|
|
|
+ return "sys/school/bookAdd";
|
|
|
+ }
|
|
|
+
|
|
|
+ @RequestMapping(value = "/bookSave", method = RequestMethod.POST)
|
|
|
+ @ResponseBody
|
|
|
+ public Response bookSave(String bookId,String schoolId) {
|
|
|
+ Response response = new Response();
|
|
|
+ if(bookId.endsWith(",")){bookId.substring(0,bookId.length()-1);}
|
|
|
+ String[] bookIds = bookId.split(",");
|
|
|
+ for (int i = 0; i < bookIds.length; i++) {
|
|
|
+ SchoolBookDetail detail = schoolBookService.findDataBySchoolIdAndBookId(schoolId,bookIds[i]);
|
|
|
+ if(Objects.nonNull(detail)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ detail = new SchoolBookDetail();
|
|
|
+ detail.setBookId(bookIds[i]);
|
|
|
+ detail.setCreateTime(new Date());
|
|
|
+ detail.setSchoolId(schoolId);
|
|
|
+ detail.setSchoolName(cnAreaService.getById(schoolId).getName());
|
|
|
+ schoolBookService.save(detail);
|
|
|
+ }
|
|
|
+
|
|
|
+ response.success("添加成功");
|
|
|
+ return response;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 删除
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ * 创建人:sh
|
|
|
+ * 2017年9月26日 下午3:13:43
|
|
|
+ * @Response
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/bookDelete", method = RequestMethod.POST)
|
|
|
+ @ResponseBody
|
|
|
+ public Response bookDelete(@RequestParam(value = "id")String id) {
|
|
|
+ Response response = new Response();
|
|
|
+ schoolBookService.delete(id);
|
|
|
+ response.success("删除成功");
|
|
|
+ return response;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param model
|
|
|
+ * @param pageSize
|
|
|
+ * @param pageNo
|
|
|
+ * @return
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
+ @RequestMapping("/bookList")
|
|
|
+ public String bookList(Model model,
|
|
|
+ @RequestParam(required = false, defaultValue = "10") int pageSize,
|
|
|
+ @RequestParam(required = false, defaultValue = "1") int pageNo) {
|
|
|
+ Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ //学校名称
|
|
|
+ params.put("name", request.getParameter("name")==null?"":request.getParameter("name"));
|
|
|
+ params.put("grade", request.getParameter("grade")==null?"":request.getParameter("grade"));
|
|
|
+ params.put("subject", request.getParameter("subject")==null?"":request.getParameter("subject"));
|
|
|
+ params.put("version", request.getParameter("version")==null?"":request.getParameter("version"));
|
|
|
+ SplitPage sp = new SplitPage();
|
|
|
+ sp.setAction(request.getRequestURI());
|
|
|
+ sp.setPageNo(pageNo);
|
|
|
+ sp.setPageSize(pageSize);
|
|
|
+ sp.setParams(params);
|
|
|
+ Page<Map<String, Object>> page= schoolBookService.bookList(params, initPage(pageNo,pageSize));
|
|
|
+ sp.setRowCnt((int) page.getTotalElements());
|
|
|
+ model.addAttribute("list", page.getContent());
|
|
|
+ model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
|
+ model.addAttribute("page", sp);
|
|
|
+ model.addAttribute("search", params);
|
|
|
+ model.addAttribute("grade", sortService.getParamValByCode("grade"));
|
|
|
+ model.addAttribute("zyb_course", sortService.getParamValByCode("zyb_course"));
|
|
|
+ model.addAttribute("version",SystemResourceLocator.getVersionList());
|
|
|
+ return "sys/school/bookList";
|
|
|
+ }
|
|
|
}
|