From a8500f95a75915a3474bf81db87a78bccedbc0c6 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 31 Oct 2022 01:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=85=B3=E8=81=94=E5=BA=94?=
=?UTF-8?q?=E7=94=A8=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jlw/dao/StudentMergeApplicationDao.java | 26 ++
.../jlw/entity/StudentMergeApplication.java | 145 +++++++++
.../StudentMergeApplicationService.java | 153 +++++++++
.../StudentMergeApplicationController.java | 194 ++++++++++++
.../query/StudentMergeApplicationQuery.java | 138 +++++++++
.../sql/jlw/studentMergeApplication.md | 293 ++++++++++++++++++
.../js/jlw/studentMergeApplication/add.js | 38 +++
.../js/jlw/studentMergeApplication/del.js | 23 ++
.../js/jlw/studentMergeApplication/edit.js | 28 ++
.../js/jlw/studentMergeApplication/index.js | 171 ++++++++++
.../studentMergeApplicationApi.js | 18 ++
.../jlw/studentMergeApplication/add.html | 64 ++++
.../jlw/studentMergeApplication/edit.html | 64 ++++
.../jlw/studentMergeApplication/index.html | 29 ++
14 files changed, 1384 insertions(+)
create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java
create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/StudentMergeApplication.java
create mode 100644 web/src/main/java/com/ibeetl/jlw/service/StudentMergeApplicationService.java
create mode 100644 web/src/main/java/com/ibeetl/jlw/web/StudentMergeApplicationController.java
create mode 100644 web/src/main/java/com/ibeetl/jlw/web/query/StudentMergeApplicationQuery.java
create mode 100644 web/src/main/resources/sql/jlw/studentMergeApplication.md
create mode 100644 web/src/main/resources/static/js/jlw/studentMergeApplication/add.js
create mode 100644 web/src/main/resources/static/js/jlw/studentMergeApplication/del.js
create mode 100644 web/src/main/resources/static/js/jlw/studentMergeApplication/edit.js
create mode 100644 web/src/main/resources/static/js/jlw/studentMergeApplication/index.js
create mode 100644 web/src/main/resources/static/js/jlw/studentMergeApplication/studentMergeApplicationApi.js
create mode 100644 web/src/main/resources/templates/jlw/studentMergeApplication/add.html
create mode 100644 web/src/main/resources/templates/jlw/studentMergeApplication/edit.html
create mode 100644 web/src/main/resources/templates/jlw/studentMergeApplication/index.html
diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java
new file mode 100644
index 00000000..865c10a2
--- /dev/null
+++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java
@@ -0,0 +1,26 @@
+package com.ibeetl.jlw.dao;
+
+import com.ibeetl.jlw.entity.StudentMergeApplication;
+import com.ibeetl.jlw.web.query.StudentMergeApplicationQuery;
+import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.SqlResource;
+import org.beetl.sql.mapper.annotation.Update;
+
+import java.util.List;
+
+/**
+ * 学生关联应用-排序 Dao
+ */
+@SqlResource("jlw.studentMergeApplication")
+public interface StudentMergeApplicationDao extends BaseMapper<StudentMergeApplication>{
+ PageQuery<StudentMergeApplication> queryByCondition(PageQuery query);
+ PageQuery<StudentMergeApplication> queryByConditionQuery(PageQuery query);
+ @Update
+ void deleteStudentMergeApplicationByIds(String ids);
+ @Update
+ int updateGivenByIds(StudentMergeApplicationQuery studentMergeApplicationQuery);
+ List<StudentMergeApplication> getByIds(String ids);
+ List<StudentMergeApplication> getValuesByQuery(StudentMergeApplicationQuery studentMergeApplicationQuery);
+ List<StudentMergeApplication> getValuesByQueryNotWithPermission(StudentMergeApplicationQuery studentMergeApplicationQuery);
+}
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentMergeApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentMergeApplication.java
new file mode 100644
index 00000000..28cc4e66
--- /dev/null
+++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentMergeApplication.java
@@ -0,0 +1,145 @@
+package com.ibeetl.jlw.entity;
+
+import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import org.beetl.sql.annotation.entity.AssignID;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/*
+* 学生-关联-应用-排序
+* gen by Spring Boot2 Admin 2022-10-31
+*/
+public class StudentMergeApplication extends BaseEntity{
+
+ //教师-应用关联ID
+ @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+ // @SeqID(name = ORACLE_CORE_SEQ_NAME)
+ @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.StudentMergeApplication")
+
+ private Long studentMergeApplicationId ;
+
+ //学生ID
+ @Dict(type="student.student_name.student_status=1")
+
+ private Long studentId ;
+
+ //应用ID
+ @Dict(type="resources_application.application_name.1=1")
+
+ private Long resourcesApplicationId ;
+
+ //排序
+
+ private Integer studentMergeApplicationOrderIndex ;
+
+ //创建时间
+
+ private Date studentMergeApplicationAddTime ;
+
+ //组织ID
+
+ private Long orgId ;
+
+ //用户ID
+
+ private Long userId ;
+
+ public StudentMergeApplication(){
+ }
+
+ /**教师-应用关联ID
+ *@return
+ */
+ public Long getStudentMergeApplicationId(){
+ return studentMergeApplicationId;
+ }
+ /**教师-应用关联ID
+ *@param studentMergeApplicationId
+ */
+ public void setStudentMergeApplicationId(Long studentMergeApplicationId){
+ this.studentMergeApplicationId = studentMergeApplicationId;
+ }
+
+ /**学生ID
+ *@return
+ */
+ public Long getStudentId(){
+ return studentId;
+ }
+ /**学生ID
+ *@param studentId
+ */
+ public void setStudentId(Long studentId){
+ this.studentId = studentId;
+ }
+
+ /**应用ID
+ *@return
+ */
+ public Long getResourcesApplicationId(){
+ return resourcesApplicationId;
+ }
+ /**应用ID
+ *@param resourcesApplicationId
+ */
+ public void setResourcesApplicationId(Long resourcesApplicationId){
+ this.resourcesApplicationId = resourcesApplicationId;
+ }
+
+ /**排序
+ *@return
+ */
+ public Integer getStudentMergeApplicationOrderIndex(){
+ return studentMergeApplicationOrderIndex;
+ }
+ /**排序
+ *@param studentMergeApplicationOrderIndex
+ */
+ public void setStudentMergeApplicationOrderIndex(Integer studentMergeApplicationOrderIndex){
+ this.studentMergeApplicationOrderIndex = studentMergeApplicationOrderIndex;
+ }
+
+ /**创建时间
+ *@return
+ */
+ public Date getStudentMergeApplicationAddTime(){
+ return studentMergeApplicationAddTime;
+ }
+ /**创建时间
+ *@param studentMergeApplicationAddTime
+ */
+ public void setStudentMergeApplicationAddTime(Date studentMergeApplicationAddTime){
+ this.studentMergeApplicationAddTime = studentMergeApplicationAddTime;
+ }
+
+ /**组织ID
+ *@return
+ */
+ public Long getOrgId(){
+ return orgId;
+ }
+ /**组织ID
+ *@param orgId
+ */
+ public void setOrgId(Long orgId){
+ this.orgId = orgId;
+ }
+
+ /**用户ID
+ *@return
+ */
+ public Long getUserId(){
+ return userId;
+ }
+ /**用户ID
+ *@param userId
+ */
+ public void setUserId(Long userId){
+ this.userId = userId;
+ }
+
+
+}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentMergeApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentMergeApplicationService.java
new file mode 100644
index 00000000..7a1e56e6
--- /dev/null
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentMergeApplicationService.java
@@ -0,0 +1,153 @@
+package com.ibeetl.jlw.service;
+
+import cn.jlw.util.ToolUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.service.CoreBaseService;
+import com.ibeetl.admin.core.util.PlatformException;
+import com.ibeetl.admin.core.web.JsonResult;
+import com.ibeetl.admin.core.web.JsonReturnCode;
+import com.ibeetl.jlw.dao.StudentMergeApplicationDao;
+import com.ibeetl.jlw.entity.StudentMergeApplication;
+import com.ibeetl.jlw.web.query.StudentMergeApplicationQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.beetl.sql.core.SqlId;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 学生关联应用-排序 Service
+ * 当分布式ID开启后请勿使用insert(*,true)
+ */
+
+@Service
+@Transactional
+@Validated
+public class StudentMergeApplicationService extends CoreBaseService<StudentMergeApplication>{
+
+ @Autowired private StudentMergeApplicationDao studentMergeApplicationDao;
+
+ public PageQuery<StudentMergeApplication>queryByCondition(PageQuery query){
+ PageQuery ret = studentMergeApplicationDao.queryByCondition(query);
+ queryListAfter(ret.getList());
+ return ret;
+ }
+
+ public PageQuery<StudentMergeApplication>queryByConditionQuery(PageQuery query){
+ PageQuery ret = studentMergeApplicationDao.queryByConditionQuery(query);
+ queryListAfter(ret.getList());
+ return ret;
+ }
+
+ public void deleteByList(List list){
+ String ids = "";
+ ToolUtils.deleteNullList(list);
+ for(int i=0;null != list && i<list.size();i++){
+ ids += list.get(i).toString()+(i==list.size()-1?"":",");
+ }
+ if(StringUtils.isNotBlank(ids)){
+ studentMergeApplicationDao.deleteStudentMergeApplicationByIds(ids);
+ }
+ }
+
+ public void deleteStudentMergeApplication(String ids){
+ try {
+ studentMergeApplicationDao.deleteStudentMergeApplicationByIds(ids);
+ } catch (Exception e) {
+ throw new PlatformException("批量删除学生关联应用-排序失败", e);
+ }
+ }
+
+ public String addAll(StudentMergeApplicationQuery studentMergeApplicationQuery){
+ String msg = "";
+ List<StudentMergeApplication> studentMergeApplicationList = new ArrayList<>();
+ try {
+ studentMergeApplicationList = JSON.parseArray(studentMergeApplicationQuery.getStudentMergeApplicationJsonStr(), StudentMergeApplication.class);
+ } catch (Exception e) {
+ try {
+ studentMergeApplicationList.add(JSONObject.parseObject(studentMergeApplicationQuery.getStudentMergeApplicationJsonStr(), StudentMergeApplication.class));
+ } catch (Exception e1) {}
+ }
+ ToolUtils.deleteNullList(studentMergeApplicationList);
+ if(null != studentMergeApplicationList && studentMergeApplicationList.size()>0){
+ for(int i=0;i<studentMergeApplicationList.size();i++){
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationList.get(i);
+ studentMergeApplication.setUserId(studentMergeApplicationQuery.getUserId());
+ studentMergeApplication.setOrgId(studentMergeApplicationQuery.getOrgId());
+ }
+ insertBatch(studentMergeApplicationList);
+ }
+ return msg;
+ }
+
+ public JsonResult add(StudentMergeApplicationQuery studentMergeApplicationQuery){
+ String msg = "";
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationQuery.pojo();
+ studentMergeApplicationDao.insert(studentMergeApplication);
+ studentMergeApplicationQuery.setStudentMergeApplicationId(studentMergeApplication.getStudentMergeApplicationId());
+ JsonResult jsonResult = new JsonResult();
+ jsonResult.setData(studentMergeApplication.getStudentMergeApplicationId());//自增的ID丢进去
+ jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
+ jsonResult.setMsg(msg);
+ return jsonResult;
+ }
+
+ public String edit(StudentMergeApplicationQuery studentMergeApplicationQuery){
+ String msg = "";
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationQuery.pojo();
+ studentMergeApplicationDao.updateTemplateById(studentMergeApplication);
+ return msg;
+ }
+
+ public String updateGivenByIds(StudentMergeApplicationQuery studentMergeApplicationQuery){
+ String msg = "";
+ if(StringUtils.isNotBlank(studentMergeApplicationQuery.get_given())){
+ boolean flag = studentMergeApplicationDao.updateGivenByIds(studentMergeApplicationQuery) > 0;
+ if(!flag){
+ msg = "更新指定参数失败";
+ }
+ }else{
+ msg = "指定参数为空";
+ }
+ return msg;
+ }
+
+ public List<StudentMergeApplication> getValues (Object paras){
+ return sqlManager.select(SqlId.of("jlw.studentMergeApplication.getStudentMergeApplicationValues"), StudentMergeApplication.class, paras);
+ }
+
+ public List<StudentMergeApplication> getValuesByQuery (StudentMergeApplicationQuery studentMergeApplicationQuery){
+ return studentMergeApplicationDao.getValuesByQuery(studentMergeApplicationQuery);
+ }
+
+ public List<StudentMergeApplication> getValuesByQueryNotWithPermission (StudentMergeApplicationQuery studentMergeApplicationQuery){
+ return studentMergeApplicationDao.getValuesByQueryNotWithPermission(studentMergeApplicationQuery);
+ }
+
+ public StudentMergeApplication getInfo (Long studentMergeApplicationId){
+ StudentMergeApplicationQuery studentMergeApplicationQuery = new StudentMergeApplicationQuery();
+ studentMergeApplicationQuery.setStudentMergeApplicationId(studentMergeApplicationId);
+ List<StudentMergeApplication> list = studentMergeApplicationDao.getValuesByQuery(studentMergeApplicationQuery);
+ if(null != list && list.size()>0){
+ return list.get(0);
+ }else{
+ return null;
+ }
+ }
+
+ public StudentMergeApplication getInfo (StudentMergeApplicationQuery studentMergeApplicationQuery){
+ List<StudentMergeApplication> list = studentMergeApplicationDao.getValuesByQuery(studentMergeApplicationQuery);
+ if(null != list && list.size()>0){
+ return list.get(0);
+ }else{
+ return null;
+ }
+ }
+
+}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentMergeApplicationController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentMergeApplicationController.java
new file mode 100644
index 00000000..b648b4b1
--- /dev/null
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentMergeApplicationController.java
@@ -0,0 +1,194 @@
+package com.ibeetl.jlw.web;
+
+import cn.jlw.Interceptor.SCoreUser;
+import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Function;
+import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.web.JsonResult;
+import com.ibeetl.jlw.entity.StudentMergeApplication;
+import com.ibeetl.jlw.service.StudentMergeApplicationService;
+import com.ibeetl.jlw.web.query.StudentMergeApplicationQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+/**
+ * 学生关联应用-排序 学生-关联-应用-排序 接口
+ * 切记不要对非线程安全的静态变量进行写操作
+ */
+
+@RestController
+@Validated
+public class StudentMergeApplicationController{
+
+ private final Log log = LogFactory.getLog(this.getClass());
+ private static final String MODEL = "/jlw/studentMergeApplication";
+ private static final String API = "/api/studentMergeApplication";
+
+
+ @Autowired private StudentMergeApplicationService studentMergeApplicationService;
+
+ @Autowired FileService fileService;
+
+ /* 前端接口 */
+
+ @PostMapping(API + "/getPageList.do")
+ public JsonResult<PageQuery> getPageList(StudentMergeApplicationQuery condition,@SCoreUser CoreUser coreUser){
+ if(null == coreUser){
+ return JsonResult.failMessage("请登录后再操作");
+ }else{
+ PageQuery page = condition.getPageQuery();
+ studentMergeApplicationService.queryByConditionQuery(page);
+ return JsonResult.success(page);
+ }
+ }
+
+
+ @GetMapping(API + "/getInfo.do")
+ public JsonResult<StudentMergeApplication>getInfo(StudentMergeApplicationQuery param,@SCoreUser CoreUser coreUser) {
+ if(null == coreUser){
+ return JsonResult.failMessage("请登录后再操作");
+ }else{
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationService.getInfo(param);
+ return JsonResult.success(studentMergeApplication);
+ }
+ }
+
+
+ @GetMapping(API + "/getList.do")
+ public JsonResult<List<StudentMergeApplication>>getList(StudentMergeApplicationQuery param,@SCoreUser CoreUser coreUser) {
+ if(null == coreUser){
+ return JsonResult.failMessage("请登录后再操作");
+ }else{
+ List<StudentMergeApplication>list = studentMergeApplicationService.getValuesByQuery(param);
+ return JsonResult.success(list);
+ }
+ }
+
+
+ /* 后台页面 */
+
+ @GetMapping(MODEL + "/index.do")
+ @Function("studentMergeApplication.query")
+ public ModelAndView index() {
+ ModelAndView view = new ModelAndView("/jlw/studentMergeApplication/index.html") ;
+ view.addObject("search", StudentMergeApplicationQuery.class.getName());
+ return view;
+ }
+
+ @GetMapping(MODEL + "/edit.do")
+ @Function("studentMergeApplication.edit")
+ public ModelAndView edit(Long studentMergeApplicationId) {
+ ModelAndView view = new ModelAndView("/jlw/studentMergeApplication/edit.html");
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationService.queryById(studentMergeApplicationId);
+ view.addObject("studentMergeApplication", studentMergeApplication);
+ return view;
+ }
+
+ @GetMapping(MODEL + "/add.do")
+ @Function("studentMergeApplication.add")
+ public ModelAndView add(Long studentMergeApplicationId) {
+ ModelAndView view = new ModelAndView("/jlw/studentMergeApplication/add.html");
+ if(null != studentMergeApplicationId){
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationService.queryById(studentMergeApplicationId);
+ view.addObject("studentMergeApplication", studentMergeApplication);
+ }else {
+ view.addObject("studentMergeApplication", new StudentMergeApplication());
+ }
+ return view;
+ }
+
+ /* 后台接口 */
+
+ @PostMapping(MODEL + "/list.json")
+ @Function("studentMergeApplication.query")
+ public JsonResult<PageQuery> list(StudentMergeApplicationQuery condition){
+ PageQuery page = condition.getPageQuery();
+ studentMergeApplicationService.queryByCondition(page);
+ return JsonResult.success(page);
+ }
+
+ @PostMapping(MODEL + "/addAll.json")
+ @Function("studentMergeApplication.add")
+ public JsonResult addAll(StudentMergeApplicationQuery studentMergeApplicationQuery,@SCoreUser CoreUser coreUser){
+ if(null == coreUser){
+ return JsonResult.failMessage("请登录后再操作");
+ }else{
+ studentMergeApplicationQuery.setUserId(coreUser.getId());
+ studentMergeApplicationQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentMergeApplicationService.addAll(studentMergeApplicationQuery);
+ if (StringUtils.isBlank(msg)) {
+ return JsonResult.success();
+ } else {
+ return JsonResult.failMessage("新增失败,"+msg);
+ }
+ }
+ }
+
+ @PostMapping(MODEL + "/add.json")
+ @Function("studentMergeApplication.add")
+ public JsonResult add(@Validated(ValidateConfig.ADD.class) StudentMergeApplicationQuery studentMergeApplicationQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+ if(result.hasErrors()){
+ return JsonResult.failMessage(result);
+ }else{
+ studentMergeApplicationQuery.setUserId(coreUser.getId());
+ studentMergeApplicationQuery.setOrgId(coreUser.getOrgId());
+ return studentMergeApplicationService.add(studentMergeApplicationQuery);
+ }
+ }
+
+ @PostMapping(MODEL + "/edit.json")
+ @Function("studentMergeApplication.edit")
+ public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentMergeApplicationQuery studentMergeApplicationQuery, BindingResult result) {
+ if(result.hasErrors()){
+ return JsonResult.failMessage(result);
+ }else {
+ studentMergeApplicationQuery.setUserId(null);
+ studentMergeApplicationQuery.setOrgId(null);
+ String msg = studentMergeApplicationService.edit(studentMergeApplicationQuery);
+ if (StringUtils.isBlank(msg)) {
+ return JsonResult.success();
+ } else {
+ return JsonResult.failMessage("更新失败,"+msg);
+ }
+ }
+ }
+
+
+ @GetMapping(MODEL + "/view.json")
+ @Function("studentMergeApplication.query")
+ public JsonResult<StudentMergeApplication>queryInfo(Long studentMergeApplicationId) {
+ StudentMergeApplication studentMergeApplication = studentMergeApplicationService.queryById( studentMergeApplicationId);
+ return JsonResult.success(studentMergeApplication);
+ }
+
+ @GetMapping(MODEL + "/getValues.json")
+ @Function("studentMergeApplication.query")
+ public JsonResult<List<StudentMergeApplication>>getValues(StudentMergeApplicationQuery param) {
+ List<StudentMergeApplication>list = studentMergeApplicationService.getValuesByQuery(param);
+ return JsonResult.success(list);
+ }
+
+
+ @PostMapping(MODEL + "/delete.json")
+ @Function("studentMergeApplication.delete")
+ @ResponseBody
+ public JsonResult delete(String ids) {
+ studentMergeApplicationService.deleteStudentMergeApplication(ids);
+ return JsonResult.success();
+ }
+
+
+}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentMergeApplicationQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentMergeApplicationQuery.java
new file mode 100644
index 00000000..475e5357
--- /dev/null
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentMergeApplicationQuery.java
@@ -0,0 +1,138 @@
+package com.ibeetl.jlw.web.query;
+
+import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Query;
+import com.ibeetl.admin.core.web.query.PageParam;
+import com.ibeetl.jlw.entity.StudentMergeApplication;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ *学生关联应用-排序查询
+ */
+public class StudentMergeApplicationQuery extends PageParam {
+ @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+ @Query(name = "教师-应用关联ID", display = false)
+ private Long studentMergeApplicationId;
+ @Query(name = "学生ID", display = true,type=Query.TYPE_DICT,dict="student.student_name.student_status=1")
+ private Long studentId;
+ @Query(name = "应用ID", display = true,type=Query.TYPE_DICT,dict="resources_application.application_name.1=1")
+ private Long resourcesApplicationId;
+ @Query(name = "排序", display = false)
+ private Integer studentMergeApplicationOrderIndex;
+ @Query(name = "创建时间", display = false)
+ private Date studentMergeApplicationAddTime;
+ @Query(name = "组织ID", display = false)
+ private Long orgId;
+ @Query(name = "用户ID", display = false)
+ private Long userId;
+
+ private String studentMergeApplicationIdPlural;
+ private String studentIdPlural;
+ private String resourcesApplicationIdPlural;
+ private String orgIdPlural;
+ private String userIdPlural;
+
+ private String studentMergeApplicationJsonStr;//json格式
+
+ private String _given;//指定更新的特定字段，多个逗号隔开
+
+ public Long getStudentMergeApplicationId(){
+ return studentMergeApplicationId;
+ }
+ public void setStudentMergeApplicationId(Long studentMergeApplicationId ){
+ this.studentMergeApplicationId = studentMergeApplicationId;
+ }
+ public Long getStudentId(){
+ return studentId;
+ }
+ public void setStudentId(Long studentId ){
+ this.studentId = studentId;
+ }
+ public Long getResourcesApplicationId(){
+ return resourcesApplicationId;
+ }
+ public void setResourcesApplicationId(Long resourcesApplicationId ){
+ this.resourcesApplicationId = resourcesApplicationId;
+ }
+ public Integer getStudentMergeApplicationOrderIndex(){
+ return studentMergeApplicationOrderIndex;
+ }
+ public void setStudentMergeApplicationOrderIndex(Integer studentMergeApplicationOrderIndex ){
+ this.studentMergeApplicationOrderIndex = studentMergeApplicationOrderIndex;
+ }
+ public Date getStudentMergeApplicationAddTime(){
+ return studentMergeApplicationAddTime;
+ }
+ public void setStudentMergeApplicationAddTime(Date studentMergeApplicationAddTime ){
+ this.studentMergeApplicationAddTime = studentMergeApplicationAddTime;
+ }
+ public Long getOrgId(){
+ return orgId;
+ }
+ public void setOrgId(Long orgId ){
+ this.orgId = orgId;
+ }
+ public Long getUserId(){
+ return userId;
+ }
+ public void setUserId(Long userId ){
+ this.userId = userId;
+ }
+
+ public StudentMergeApplication pojo(){
+ StudentMergeApplication pojo = new StudentMergeApplication();
+ pojo.setStudentMergeApplicationId(this.getStudentMergeApplicationId());
+ pojo.setStudentId(this.getStudentId());
+ pojo.setResourcesApplicationId(this.getResourcesApplicationId());
+ pojo.setStudentMergeApplicationOrderIndex(this.getStudentMergeApplicationOrderIndex());
+ pojo.setStudentMergeApplicationAddTime(this.getStudentMergeApplicationAddTime());
+ pojo.setOrgId(this.getOrgId());
+ pojo.setUserId(this.getUserId());
+ return pojo;
+ }
+
+ public String getStudentMergeApplicationIdPlural(){
+ return studentMergeApplicationIdPlural;
+ }
+ public void setStudentMergeApplicationIdPlural(String studentMergeApplicationIdPlural){
+ this.studentMergeApplicationIdPlural = studentMergeApplicationIdPlural;
+ }
+ public String getStudentIdPlural(){
+ return studentIdPlural;
+ }
+ public void setStudentIdPlural(String studentIdPlural){
+ this.studentIdPlural = studentIdPlural;
+ }
+ public String getResourcesApplicationIdPlural(){
+ return resourcesApplicationIdPlural;
+ }
+ public void setResourcesApplicationIdPlural(String resourcesApplicationIdPlural){
+ this.resourcesApplicationIdPlural = resourcesApplicationIdPlural;
+ }
+ public String getOrgIdPlural(){
+ return orgIdPlural;
+ }
+ public void setOrgIdPlural(String orgIdPlural){
+ this.orgIdPlural = orgIdPlural;
+ }
+ public String getUserIdPlural(){
+ return userIdPlural;
+ }
+ public void setUserIdPlural(String userIdPlural){
+ this.userIdPlural = userIdPlural;
+ }
+ public String getStudentMergeApplicationJsonStr(){
+ return studentMergeApplicationJsonStr;
+ }
+ public void setStudentMergeApplicationJsonStr(String studentMergeApplicationJsonStr ){
+ this.studentMergeApplicationJsonStr = studentMergeApplicationJsonStr;
+ }
+ public String get_given() {
+ return _given;
+ }
+ public void set_given(String _given) {
+ this._given = _given;
+ }
+}
diff --git a/web/src/main/resources/sql/jlw/studentMergeApplication.md b/web/src/main/resources/sql/jlw/studentMergeApplication.md
new file mode 100644
index 00000000..3eb08c27
--- /dev/null
+++ b/web/src/main/resources/sql/jlw/studentMergeApplication.md
@@ -0,0 +1,293 @@
+queryByCondition
+===
+* 根据不为空的参数进行分页查询
+
+ select
+ @pageTag(){
+ t.*
+ @}
+ from student_merge_application t
+ where 1=1
+ @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
+ and #function("studentMergeApplication.query")#
+ @if(!isEmpty(studentMergeApplicationId)){
+ and t.student_merge_application_id =#studentMergeApplicationId#
+ @}
+ @if(!isEmpty(studentMergeApplicationIdPlural)){
+ and find_in_set(t.student_merge_application_id,#studentMergeApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentId)){
+ and t.student_id =#studentId#
+ @}
+ @if(!isEmpty(studentIdPlural)){
+ and find_in_set(t.student_id,#studentIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentMergeApplicationOrderIndex)){
+ and t.student_merge_application_order_index =#studentMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(studentMergeApplicationAddTime)){
+ and t.student_merge_application_add_time =#studentMergeApplicationAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+queryByConditionQuery
+===
+* 根据不为空的参数进行分页查询(无权限)
+
+ select
+ @pageTag(){
+ t.*
+ @}
+ from student_merge_application t
+ where 1=1
+ @if(!isEmpty(studentMergeApplicationId)){
+ and t.student_merge_application_id =#studentMergeApplicationId#
+ @}
+ @if(!isEmpty(studentMergeApplicationIdPlural)){
+ and find_in_set(t.student_merge_application_id,#studentMergeApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentId)){
+ and t.student_id =#studentId#
+ @}
+ @if(!isEmpty(studentIdPlural)){
+ and find_in_set(t.student_id,#studentIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentMergeApplicationOrderIndex)){
+ and t.student_merge_application_order_index =#studentMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(studentMergeApplicationAddTime)){
+ and t.student_merge_application_add_time =#studentMergeApplicationAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+
+
+deleteStudentMergeApplicationByIds
+===
+
+* 批量删除
+
+ delete from student_merge_application where find_in_set(student_merge_application_id,#ids#)
+
+
+
+getByIds
+===
+
+select * from student_merge_application where find_in_set(student_merge_application_id,#ids#)
+
+
+updateGivenByIds
+===
+
+* 批量更新指定字段，无论此字段是否有值
+
+ update student_merge_application
+ set
+ @if(contain("studentId",_given)){
+ @if(isEmpty(studentId)){
+ student_id = null ,
+ @}else{
+ student_id = #studentId# ,
+ @}
+ @}
+ @if(contain("resourcesApplicationId",_given)){
+ @if(isEmpty(resourcesApplicationId)){
+ resources_application_id = null ,
+ @}else{
+ resources_application_id = #resourcesApplicationId# ,
+ @}
+ @}
+ @if(contain("studentMergeApplicationOrderIndex",_given)){
+ @if(isEmpty(studentMergeApplicationOrderIndex)){
+ student_merge_application_order_index = null ,
+ @}else{
+ student_merge_application_order_index = #studentMergeApplicationOrderIndex# ,
+ @}
+ @}
+ @if(contain("studentMergeApplicationAddTime",_given)){
+ @if(isEmpty(studentMergeApplicationAddTime)){
+ student_merge_application_add_time = null ,
+ @}else{
+ student_merge_application_add_time = #studentMergeApplicationAddTime# ,
+ @}
+ @}
+ @if(contain("orgId",_given)){
+ @if(isEmpty(orgId)){
+ org_id = null ,
+ @}else{
+ org_id = #orgId# ,
+ @}
+ @}
+ @if(contain("userId",_given)){
+ @if(isEmpty(userId)){
+ user_id = null ,
+ @}else{
+ user_id = #userId# ,
+ @}
+ @}
+ student_merge_application_id = student_merge_application_id
+ where find_in_set(student_merge_application_id,#studentMergeApplicationIdPlural#)
+
+
+
+getStudentMergeApplicationValues
+===
+
+* 根据不为空的参数进行查询
+
+ select t.*
+ from student_merge_application t
+ where 1=1
+ @if(!isEmpty(studentMergeApplicationId)){
+ and t.student_merge_application_id =#studentMergeApplicationId#
+ @}
+ @if(!isEmpty(studentId)){
+ and t.student_id =#studentId#
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(studentMergeApplicationOrderIndex)){
+ and t.student_merge_application_order_index =#studentMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(studentMergeApplicationAddTime)){
+ and t.student_merge_application_add_time =#studentMergeApplicationAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+
+
+getValuesByQuery
+===
+
+* 根据不为空的参数进行查询
+
+ select t.*
+ from student_merge_application t
+ where 1=1 and #function("studentMergeApplication.query")#
+ @if(!isEmpty(studentMergeApplicationId)){
+ and t.student_merge_application_id =#studentMergeApplicationId#
+ @}
+ @if(!isEmpty(studentMergeApplicationIdPlural)){
+ and find_in_set(t.student_merge_application_id,#studentMergeApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentId)){
+ and t.student_id =#studentId#
+ @}
+ @if(!isEmpty(studentIdPlural)){
+ and find_in_set(t.student_id,#studentIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentMergeApplicationOrderIndex)){
+ and t.student_merge_application_order_index =#studentMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(studentMergeApplicationAddTime)){
+ and t.student_merge_application_add_time =#studentMergeApplicationAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+getValuesByQueryNotWithPermission
+===
+
+* 根据不为空的参数进行查询（不包含权限）
+
+ select t.*
+ from student_merge_application t
+ where 1=1
+ @if(!isEmpty(studentMergeApplicationId)){
+ and t.student_merge_application_id =#studentMergeApplicationId#
+ @}
+ @if(!isEmpty(studentMergeApplicationIdPlural)){
+ and find_in_set(t.student_merge_application_id,#studentMergeApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentId)){
+ and t.student_id =#studentId#
+ @}
+ @if(!isEmpty(studentIdPlural)){
+ and find_in_set(t.student_id,#studentIdPlural#)
+ @}
+ @if(!isEmpty(resourcesApplicationId)){
+ and t.resources_application_id =#resourcesApplicationId#
+ @}
+ @if(!isEmpty(resourcesApplicationIdPlural)){
+ and find_in_set(t.resources_application_id,#resourcesApplicationIdPlural#)
+ @}
+ @if(!isEmpty(studentMergeApplicationOrderIndex)){
+ and t.student_merge_application_order_index =#studentMergeApplicationOrderIndex#
+ @}
+ @if(!isEmpty(studentMergeApplicationAddTime)){
+ and t.student_merge_application_add_time =#studentMergeApplicationAddTime#
+ @}
+ @if(!isEmpty(orgId)){
+ and t.org_id =#orgId#
+ @}
+ @if(!isEmpty(orgIdPlural)){
+ and find_in_set(t.org_id,#orgIdPlural#)
+ @}
+ @if(!isEmpty(userId)){
+ and t.user_id =#userId#
+ @}
+ @if(!isEmpty(userIdPlural)){
+ and find_in_set(t.user_id,#userIdPlural#)
+ @}
+
+
+
diff --git a/web/src/main/resources/static/js/jlw/studentMergeApplication/add.js b/web/src/main/resources/static/js/jlw/studentMergeApplication/add.js
new file mode 100644
index 00000000..65cc2746
--- /dev/null
+++ b/web/src/main/resources/static/js/jlw/studentMergeApplication/add.js
@@ -0,0 +1,38 @@
+layui.define([ 'form', 'laydate', 'table','studentMergeApplicationApi'], function(exports) {
+ var form = layui.form;
+ var studentMergeApplicationApi = layui.studentMergeApplicationApi;
+ var index = layui.index;
+ var view = {
+ init:function(){
+ Lib.initGenrealForm($("#addForm"),form);
+ this.initSubmit();
+ },
+ initSubmit:function(){
+ $("#addButton").click(function(){
+ form.on('submit(form)', function(){
+ var studentMergeApplicationId = $("#addForm input[name='studentMergeApplicationId']").val();
+ if(!$.isEmpty(studentMergeApplicationId)){
+ studentMergeApplicationApi.updateStudentMergeApplication($('#addForm'),function(){
+ parent.window.dataReload();
+ Common.info("更新成功");
+ Lib.closeFrame();
+ });
+ }else{
+ studentMergeApplicationApi.addStudentMergeApplication($('#addForm'),function(){
+ parent.window.dataReload();
+ Common.info("添加成功");
+ Lib.closeFrame();
+ });
+ }
+
+ });
+ });
+
+ $("#addButton-cancel").click(function(){
+ Lib.closeFrame();
+ });
+ }
+
+ }
+ exports('add',view);
+});
diff --git a/web/src/main/resources/static/js/jlw/studentMergeApplication/del.js b/web/src/main/resources/static/js/jlw/studentMergeApplication/del.js
new file mode 100644
index 00000000..4d1e435b
--- /dev/null
+++ b/web/src/main/resources/static/js/jlw/studentMergeApplication/del.js
@@ -0,0 +1,23 @@
+layui.define(['table', 'studentMergeApplicationApi'], function(exports) {
+ var studentMergeApplicationApi = layui.studentMergeApplicationApi;
+ var table=layui.table;
+ var view = {
+ init:function(){
+ },
+ delBatch:function(){
+ var data = Common.getMoreDataFromTable(table,"studentMergeApplicationTable");
+ if(data==null){
+ return ;
+ }
+ Common.openConfirm("确认要删除这些学生关联应用-排序?",function(){
+ var ids =Common.concatBatchId(data,"studentMergeApplicationId");
+ studentMergeApplicationApi.del(ids,function(){
+ Common.info("删除成功");
+ dataReload();
+ })
+ })
+ }
+ }
+ exports('del',view);
+
+});
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/studentMergeApplication/edit.js b/web/src/main/resources/static/js/jlw/studentMergeApplication/edit.js
new file mode 100644
index 00000000..e50b9e2a
--- /dev/null
+++ b/web/src/main/resources/static/js/jlw/studentMergeApplication/edit.js
@@ -0,0 +1,28 @@
+layui.define([ 'form', 'laydate', 'table','studentMergeApplicationApi'], function(exports) {
+ var form = layui.form;
+ var studentMergeApplicationApi = layui.studentMergeApplicationApi;
+ var index = layui.index;
+ var view = {
+ init:function(){
+ Lib.initGenrealForm($("#updateForm"),form);
+ this.initSubmit();
+ },
+ initSubmit:function(){
+ $("#updateButton").click(function(){
+ form.on('submit(form)', function(){
+ studentMergeApplicationApi.updateStudentMergeApplication($('#updateForm'),function(){
+ parent.window.dataReload();
+ Common.info("更新成功");
+ Lib.closeFrame();
+ });
+ });
+ });
+ $("#updateButton-cancel").click(function(){
+ Lib.closeFrame();
+ });
+ }
+
+ }
+ exports('edit',view);
+
+});
\ No newline at end of file
diff --git a/web/src/main/resources/static/js/jlw/studentMergeApplication/index.js b/web/src/main/resources/static/js/jlw/studentMergeApplication/index.js
new file mode 100644
index 00000000..6513488c
--- /dev/null
+++ b/web/src/main/resources/static/js/jlw/studentMergeApplication/index.js
@@ -0,0 +1,171 @@
+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+ var form = layui.form;
+ var laydate = layui.laydate;
+ var table = layui.table;
+ var studentMergeApplicationTable = null;
+ var view ={
+ init:function(){
+ var that = this
+ this.initTable();
+ this.initSearchForm();
+ this.initToolBar();
+ window.dataReload = function(){
+ Lib.doSearchForm($("#searchForm"),studentMergeApplicationTable)
+ that.initToolBar();
+ }
+ },
+ initTable:function(){
+ var sx_ = localStorage.getItem("studentMergeApplicationTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
+ if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
+ studentMergeApplicationTable = table.render({
+ elem : '#studentMergeApplicationTable',
+ height : Lib.getTableHeight(1),
+ cellMinWidth: 100,
+ method : 'post',
+ url : Common.ctxPath + '/jlw/studentMergeApplication/list.json' // 数据接口
+ ,page : Lib.tablePage // 开启分页
+ ,toolbar: '#toolbar_studentMergeApplication' //自定义头部左侧工具栏
+ ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+ ,limit : 10,
+ cols : [ [ // 表头
+ {
+ type : 'checkbox',
+
+ },
+ {
+ field : 'studentMergeApplicationId',
+ title : '教师-应用关联ID',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['studentMergeApplicationId'])?false:sx_['studentMergeApplicationId'],
+
+ width : 60,
+ },
+ {
+ field : 'studentIdText', //数据字典类型为 student.student_name.student_status=1
+ title : '学生ID',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['studentIdText'])?false:sx_['studentIdText'],
+ },
+ {
+ field : 'resourcesApplicationIdText', //数据字典类型为 resources_application.application_name.1=1
+ title : '应用ID',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['resourcesApplicationIdText'])?false:sx_['resourcesApplicationIdText'],
+ },
+ {
+ field : 'studentMergeApplicationOrderIndex',
+ title : '排序',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['studentMergeApplicationOrderIndex'])?false:sx_['studentMergeApplicationOrderIndex'],
+ },
+ {
+ field : 'studentMergeApplicationAddTime',
+ title : '创建时间',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['studentMergeApplicationAddTime'])?false:sx_['studentMergeApplicationAddTime'],
+ },
+ {
+ field : 'orgId',
+ title : '组织ID',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
+ },
+ {
+ field : 'userId',
+ title : '用户ID',
+ align:"center",
+ hideField :false,
+ hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
+ }
+ ,{
+ field : 'operation_',title : '操作',align:"center", templet: function (d) {
+ var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
+ htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
+ return htm;
+ }
+ }
+
+ ] ]
+
+ });
+
+ table.on('checkbox(studentMergeApplicationTable)', function(obj){
+ var studentMergeApplication = obj.data;
+ if(obj.checked){
+ //按钮逻辑Lib.buttonEnable()
+ }else{
+
+ }
+ })
+ },
+
+ initSearchForm:function(){
+ Lib.initSearchForm( $("#searchForm"),studentMergeApplicationTable,form);
+ },
+
+ initToolBar:function(){
+ toolbar = {
+ add: function () {
+ var url = "/jlw/studentMergeApplication/add.do";
+ Common.openDlg(url,"学生关联应用-排序管理>新增");
+ },
+ edit: function () {
+ var data = Common.getOneFromTable(table,"studentMergeApplicationTable");
+ if(data==null){
+ return ;
+ }
+ var url = "/jlw/studentMergeApplication/add.do?studentMergeApplicationId="+data.studentMergeApplicationId;
+ Common.openDlg(url,"学生关联应用-排序管理>"+data.studentMergeApplicationId+">编辑");
+ },
+ del: function () {
+ layui.use(['del'], function(){
+ var delView = layui.del
+ delView.delBatch();
+ });
+ },
+ search: function () {
+ Lib.doSearchForm($("#searchForm"), studentMergeApplicationTable, 1);
+ view.initToolBar()
+ },
+ refresh: function () {
+ searchForm.reset();
+ Lib.doSearchForm($("#searchForm"), studentMergeApplicationTable, 1);
+ view.initToolBar()
+ },
+ }
+ //触发事件
+ $('.ext-toolbar').on('click', function() {
+ var type = $(this).data('type');
+ toolbar[type] ? toolbar[type].call(this) : '';
+ });
+
+ }, initTableTool: table.on('tool(studentMergeApplicationTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'edit') {
+ var url = "/jlw/studentMergeApplication/add.do?studentMergeApplicationId="+data.studentMergeApplicationId;
+ Common.openDlg(url,"学生关联应用-排序管理>"+data.studentMergeApplicationId+">编辑");
+ }else if(obj.event === "del"){
+ layer.confirm('是否确定删除该信息？', function (index) {
+ var ret = Common.postAjax("/jlw/studentMergeApplication/delete.json",{ids:data.studentMergeApplicationId});
+ layer.msg(ret.code == 0?"删除成功！":ret.msg, {
+ offset: ['50%'],
+ icon: ret.code == 0?1:2,
+ time: 1500 //2秒关闭（如果不配置，默认是3秒）
+ },function (){
+ if(ret.code == 0){
+ Lib.tableRefresh();
+ }
+ });
+ });
+ }
+ })
+ }
+ exports('index',view);
+
+});
diff --git a/web/src/main/resources/static/js/jlw/studentMergeApplication/studentMergeApplicationApi.js b/web/src/main/resources/static/js/jlw/studentMergeApplication/studentMergeApplicationApi.js
new file mode 100644
index 00000000..67a05b69
--- /dev/null
+++ b/web/src/main/resources/static/js/jlw/studentMergeApplication/studentMergeApplicationApi.js
@@ -0,0 +1,18 @@
+/*访问后台的代码*/
+layui.define([], function(exports) {
+ var api={
+ updateStudentMergeApplication:function(form,callback){
+ Lib.submitForm("/jlw/studentMergeApplication/edit.json",form,{},callback)
+ },
+ addStudentMergeApplication:function(form,callback){
+ Lib.submitForm("/jlw/studentMergeApplication/add.json",form,{},callback)
+ },
+ del:function(ids,callback){
+ Common.post("/jlw/studentMergeApplication/delete.json",{"ids":ids},function(){
+ callback();
+ })
+ }
+
+ };
+ exports('studentMergeApplicationApi',api);
+});
\ No newline at end of file
diff --git a/web/src/main/resources/templates/jlw/studentMergeApplication/add.html b/web/src/main/resources/templates/jlw/studentMergeApplication/add.html
new file mode 100644
index 00000000..0830249c
--- /dev/null
+++ b/web/src/main/resources/templates/jlw/studentMergeApplication/add.html
@@ -0,0 +1,64 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/studentMergeApplication/"}){ -->
+
+<form class="layui-form" id="addForm">
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">学生ID</label>
+ <div class="layui-input-inline">
+ <layui:simpleDictSelect style='layui-input-inline' type="student.student_name.student_status=1"
+ id="studentId" name="studentId" value="${studentMergeApplication.studentId}" layVerify="" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">应用ID</label>
+ <div class="layui-input-inline">
+ <layui:simpleDictSelect style='layui-input-inline' type="resources_application.application_name.1=1"
+ id="resourcesApplicationId" name="resourcesApplicationId" value="${studentMergeApplication.resourcesApplicationId}" layVerify="" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">排序</label>
+ <div class="layui-input-inline">
+ <input type="text" id="studentMergeApplicationOrderIndex" name="studentMergeApplicationOrderIndex" value="${studentMergeApplication.studentMergeApplicationOrderIndex}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">创建时间</label>
+ <div class="layui-input-inline">
+ <input type="text" id="studentMergeApplicationAddTime" name="studentMergeApplicationAddTime" value="${studentMergeApplication.studentMergeApplicationAddTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">组织ID</label>
+ <div class="layui-input-inline">
+ <input type="text" id="orgId" name="orgId" value="${studentMergeApplication.orgId}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">用户ID</label>
+ <div class="layui-input-inline">
+ <input type="text" id="userId" name="userId" value="${studentMergeApplication.userId}" class="layui-input" >
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+ <input type="hidden" name="studentMergeApplicationId" value="${studentMergeApplication.studentMergeApplicationId}" />
+ <layui:submitButtons id="addButton" buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['add'], function(){
+ var studentMergeApplicationAdd = layui.add
+ studentMergeApplicationAdd.init();
+});
+</script>
diff --git a/web/src/main/resources/templates/jlw/studentMergeApplication/edit.html b/web/src/main/resources/templates/jlw/studentMergeApplication/edit.html
new file mode 100644
index 00000000..bdf7e8d7
--- /dev/null
+++ b/web/src/main/resources/templates/jlw/studentMergeApplication/edit.html
@@ -0,0 +1,64 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/studentMergeApplication/"}){ -->
+
+<form class="layui-form" id="updateForm">
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">学生ID</label>
+ <div class="layui-input-inline">
+ <layui:simpleDictSelect style='layui-input-inline' type="student.student_name.student_status=1"
+ id="studentId" name="studentId" value="${studentMergeApplication.studentId}" layVerify="" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">应用ID</label>
+ <div class="layui-input-inline">
+ <layui:simpleDictSelect style='layui-input-inline' type="resources_application.application_name.1=1"
+ id="resourcesApplicationId" name="resourcesApplicationId" value="${studentMergeApplication.resourcesApplicationId}" layVerify="" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">排序</label>
+ <div class="layui-input-inline">
+ <input type="text" id="studentMergeApplicationOrderIndex" name="studentMergeApplicationOrderIndex" value="${studentMergeApplication.studentMergeApplicationOrderIndex}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">创建时间</label>
+ <div class="layui-input-inline">
+ <input type="text" id="studentMergeApplicationAddTime" name="studentMergeApplicationAddTime" value="${studentMergeApplication.studentMergeApplicationAddTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">组织ID</label>
+ <div class="layui-input-inline">
+ <input type="text" id="orgId" name="orgId" value="${studentMergeApplication.orgId}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">用户ID</label>
+ <div class="layui-input-inline">
+ <input type="text" id="userId" name="userId" value="${studentMergeApplication.userId}" class="layui-input" >
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+ <input type="hidden" name="studentMergeApplicationId" value="${studentMergeApplication.studentMergeApplicationId}" />
+ <layui:submitButtons id="updateButton" buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['edit'], function(){
+ var studentMergeApplicationEdit = layui.edit
+ studentMergeApplicationEdit.init();
+});
+</script>
diff --git a/web/src/main/resources/templates/jlw/studentMergeApplication/index.html b/web/src/main/resources/templates/jlw/studentMergeApplication/index.html
new file mode 100644
index 00000000..0e732c5e
--- /dev/null
+++ b/web/src/main/resources/templates/jlw/studentMergeApplication/index.html
@@ -0,0 +1,29 @@
+<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/studentMergeApplication/"}){ -->
+<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+</layui:searchForm>
+<table id="studentMergeApplicationTable" lay-filter="studentMergeApplicationTable"></table>
+<!--#} -->
+
+<script type="text/html" id="toolbar_studentMergeApplication">
+ <div class="layui-btn-container">
+ <div class="layui-btn-group" >
+ <!--# if(core.searchIsShow(search)) {-->
+ <layui:accessButton function="studentMergeApplication.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton>
+ <!--# }-->
+ <layui:accessButton function="studentMergeApplication.add" action="add">添加</layui:accessButton>
+ <layui:accessButton function="studentMergeApplication.edit" action="edit">修改</layui:accessButton>
+ <layui:accessButton function="studentMergeApplication.del" action="del">删除</layui:accessButton>
+ <!--# if(!isEmpty(search)) {-->
+ <layui:accessButton function="studentMergeApplication.query" action="refresh"><i class="layui-icon"></i>刷新</layui:accessButton>
+ <!--# }-->
+ </div>
+ </div>
+</script>
+<script>
+
+layui.use(['index'], function(){
+ var index = layui.index;
+ index.init();
+});
+
+</script>