diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java index ca0f5b6..722093f 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java @@ -262,8 +262,8 @@ public class QueryGenerator { //update-begin-author:scott date:2022-11-07 for:避免用户自定义表无默认字段{创建时间}，导致排序报错 //TODO 避免用户自定义表无默认字段创建时间，导致排序报错 if(DataBaseConstant.CREATE_TIME.equals(column) && !fieldColumnMap.containsKey(DataBaseConstant.CREATE_TIME)){ - column = "id"; - log.warn("检测到实体里没有字段createTime，改成采用ID排序！"); + column = ""; +// log.warn("检测到实体里没有字段createTime，改成采用ID排序！"); } //update-end-author:scott date:2022-11-07 for:避免用户自定义表无默认字段{创建时间}，导致排序报错 diff --git a/jeecg-boot/jeecg-module-demo/pom.xml b/jeecg-boot/jeecg-module-demo/pom.xml index 5439fcb..99770dc 100644 --- a/jeecg-boot/jeecg-module-demo/pom.xml +++ b/jeecg-boot/jeecg-module-demo/pom.xml @@ -16,6 +16,10 @@ org.jeecgframework.boot jeecg-boot-base-core + + org.jeecgframework.boot + jeecg-system-biz + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java index 9f3dc66..4b02318 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.kcKetangbiao.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,8 +10,12 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.kcKetangbiao.entity.KcKetangbiao; import org.jeecg.modules.demo.kcKetangbiao.service.IKcKetangbiaoService; @@ -20,6 +25,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -50,7 +57,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class KcKetangbiaoController extends JeecgController { @Autowired private IKcKetangbiaoService kcKetangbiaoService; - + + @Autowired + private IZjSqxxService zjSqxxService; /** * 分页列表查询 * @@ -81,6 +90,34 @@ public class KcKetangbiaoController extends JeecgController page = new Page(pageNo, pageSize); + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","1"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + kcKetangbiao.setXnxq(zjSqxx.getXnxq()); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + kcKetangbiao.setInKkdw(zjSqxx.getKkdw()); + } + if(StringUtils.isNotBlank(zjSqxx.getKcmc())){ + kcKetangbiao.setInKcmc(zjSqxx.getKcmc()); + } + } + if(StringUtils.equals("1",sfjx)){ + return Result.error("您未在授权期限内，不能进行查询！"); + } IPage pageList = kcKetangbiaoService.getKclblist(page, kcKetangbiao); return Result.OK(pageList); } @@ -195,4 +232,16 @@ public class KcKetangbiaoController extends JeecgController> checklist(KcKetangbiao kcKetangbiao, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = kcKetangbiaoService.checklist(page, kcKetangbiao); + return Result.OK(pageList); + } + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/entity/KcKetangbiao.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/entity/KcKetangbiao.java index ecd3a84..d0c206e 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/entity/KcKetangbiao.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/entity/KcKetangbiao.java @@ -344,6 +344,13 @@ public class KcKetangbiao implements Serializable { private String flag; + @TableField(exist = false) + private String inKkdw; + + @TableField(exist = false) + private String inKcmc; + + @TableField(exist = false) private KcDetectionMain detectionMain; @TableField(exist = false) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java index 22d9d8c..bace92c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java @@ -19,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface KcKetangbiaoMapper extends BaseMapper { IPage getKclblist(Page page, KcKetangbiao kcKetangbiao); + + IPage checklist(Page page, KcKetangbiao kcKetangbiao); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml index 62bd101..2a33205 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml @@ -37,6 +37,19 @@ #{item} + + + and ktb.kkdw in + + #{item} + + + + and ktb.kcmc in + + #{item} + + and ktb.kkdw = #{kcKetangbiao.kkdw} @@ -77,4 +90,13 @@ order by ktb.hh asc,kkdw.id asc,IF(tkxx.kcmc is null,'0','1') asc + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/IKcKetangbiaoService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/IKcKetangbiaoService.java index e958230..6b49a30 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/IKcKetangbiaoService.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/IKcKetangbiaoService.java @@ -17,4 +17,6 @@ public interface IKcKetangbiaoService extends IService { IPage getKclblist(Page page, KcKetangbiao kcKetangbiao); KcKetangbiao queryAllDataById(String id); + + IPage checklist(Page page, KcKetangbiao kcKetangbiao); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/impl/KcKetangbiaoServiceImpl.java index 76f85c2..2994d38 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/service/impl/KcKetangbiaoServiceImpl.java @@ -5,7 +5,10 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.demo.kcDetectionDetailed.entity.KcDetectionDetailed; import org.jeecg.modules.demo.kcDetectionDetailed.mapper.KcDetectionDetailedMapper; import org.jeecg.modules.demo.kcDetectionMain.entity.KcDetectionMain; @@ -13,11 +16,14 @@ import org.jeecg.modules.demo.kcDetectionMain.mapper.KcDetectionMainMapper; import org.jeecg.modules.demo.kcKetangbiao.entity.KcKetangbiao; import org.jeecg.modules.demo.kcKetangbiao.mapper.KcKetangbiaoMapper; import org.jeecg.modules.demo.kcKetangbiao.service.IKcKetangbiaoService; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; import java.util.List; /** @@ -95,4 +101,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl checklist(Page page, KcKetangbiao kcKetangbiao) { + return baseMapper.checklist(page,kcKetangbiao); + } } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java index 2fff4a3..0745b2f 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java @@ -37,12 +37,12 @@ public class Xxhbjwxtjxrw implements Serializable { @ApiModelProperty(value = "xnxqdm") private java.lang.String xnxqdm; /**kcmc*/ - @Excel(name = "kcmc", width = 15) - @ApiModelProperty(value = "kcmc") + @Excel(name = "课程名称", width = 15) + @ApiModelProperty(value = "课程名称") private java.lang.String kcmc; /**kcrwdm*/ - @Excel(name = "kcrwdm", width = 15) - @ApiModelProperty(value = "kcrwdm") + @Excel(name = "开课任务编号", width = 15) + @ApiModelProperty(value = "开课任务编号") private java.lang.String kcrwdm; /**kclb*/ @Excel(name = "kclb", width = 15) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/JwxtScwjxx.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/JwxtScwjxx.java index 2fb1357..165cb80 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/JwxtScwjxx.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/JwxtScwjxx.java @@ -25,19 +25,19 @@ public class JwxtScwjxx implements Serializable { private static final long serialVersionUID = 1L; /**name*/ - @Excel(name = "name", width = 15) - @ApiModelProperty(value = "name") + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") private String name; /**path*/ - @Excel(name = "path", width = 15) - @ApiModelProperty(value = "path") + @Excel(name = "文件", width = 15) + @ApiModelProperty(value = "文件") private String path; /**cjr*/ - @Excel(name = "cjr", width = 15) - @ApiModelProperty(value = "cjr") + @Excel(name = "创建人", width = 15) + @ApiModelProperty(value = "创建人") private String cjr; /**cjsj*/ - @Excel(name = "cjsj", width = 15) - @ApiModelProperty(value = "cjsj") + @Excel(name = "创建时间", width = 15) + @ApiModelProperty(value = "创建时间") private String cjsj; } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java index 4235479..15a7c83 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java @@ -32,20 +32,20 @@ import lombok.experimental.Accessors; public class Xxhbjwxtscwjxx implements Serializable { private static final long serialVersionUID = 1L; - /**name*/ - @Excel(name = "name", width = 15) - @ApiModelProperty(value = "name") - private java.lang.String name; - /**path*/ - @Excel(name = "path", width = 15) - @ApiModelProperty(value = "path") - private java.lang.String path; - /**cjr*/ - @Excel(name = "cjr", width = 15) - @ApiModelProperty(value = "cjr") - private java.lang.String cjr; - /**cjsj*/ - @Excel(name = "cjsj", width = 15) - @ApiModelProperty(value = "cjsj") - private java.lang.String cjsj; + /**name*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String name; + /**path*/ + @Excel(name = "文件", width = 15) + @ApiModelProperty(value = "文件") + private String path; + /**cjr*/ + @Excel(name = "创建人", width = 15) + @ApiModelProperty(value = "创建人") + private String cjr; + /**cjsj*/ + @Excel(name = "创建时间", width = 15) + @ApiModelProperty(value = "创建时间") + private String cjsj; } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java new file mode 100644 index 0000000..3546b27 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java @@ -0,0 +1,188 @@ +package org.jeecg.modules.demo.zjSqxx.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 专家授权信息 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Api(tags="专家授权信息") +@RestController +@RequestMapping("/zjSqxx/zjSqxx") +@Slf4j +public class ZjSqxxController extends JeecgController { + @Autowired + private IZjSqxxService zjSqxxService; + + /** + * 分页列表查询 + * + * @param zjSqxx + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "专家授权信息-分页列表查询") + @ApiOperation(value="专家授权信息-分页列表查询", notes="专家授权信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ZjSqxx zjSqxx, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zjSqxx, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zjSqxxService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zjSqxx + * @return + */ + @AutoLog(value = "专家授权信息-添加") + @ApiOperation(value="专家授权信息-添加", notes="专家授权信息-添加") + @RequiresPermissions("zjSqxx:zj_sqxx:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ZjSqxx zjSqxx) { + zjSqxxService.save(zjSqxx); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zjSqxx + * @return + */ + @AutoLog(value = "专家授权信息-编辑") + @ApiOperation(value="专家授权信息-编辑", notes="专家授权信息-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZjSqxx zjSqxx) { + zjSqxxService.updateById(zjSqxx); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "专家授权信息-通过id删除") + @ApiOperation(value="专家授权信息-通过id删除", notes="专家授权信息-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zjSqxxService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "专家授权信息-批量删除") + @ApiOperation(value="专家授权信息-批量删除", notes="专家授权信息-批量删除") + @RequiresPermissions("zjSqxx:zj_sqxx:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zjSqxxService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "专家授权信息-通过id查询") + @ApiOperation(value="专家授权信息-通过id查询", notes="专家授权信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ZjSqxx zjSqxx = zjSqxxService.getById(id); + if(zjSqxx==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zjSqxx); + } + + /** + * 导出excel + * + * @param request + * @param zjSqxx + */ + @RequiresPermissions("zjSqxx:zj_sqxx:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZjSqxx zjSqxx) { + return super.exportXls(request, zjSqxx, ZjSqxx.class, "专家授权信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("zjSqxx:zj_sqxx:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZjSqxx.class); + } + + + /** + * 添加新数据 + * @param zjSqxx + * @return + */ + @PostMapping(value = "/addNew") + public Result addNew(@RequestBody ZjSqxx zjSqxx) { + zjSqxxService.addNew(zjSqxx); + return Result.OK("添加成功！"); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/entity/ZjSqxx.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/entity/ZjSqxx.java new file mode 100644 index 0000000..5f77305 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/entity/ZjSqxx.java @@ -0,0 +1,113 @@ +package org.jeecg.modules.demo.zjSqxx.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 专家授权信息 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Data +@TableName("zj_sqxx") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zj_sqxx对象", description="专家授权信息") +public class ZjSqxx implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**用户id*/ + @Excel(name = "用户id", width = 15) + @ApiModelProperty(value = "用户id") + private java.lang.String userId; + /**教工号*/ + @Excel(name = "教工号", width = 15) + @ApiModelProperty(value = "教工号") + private java.lang.String zjNo; + /**专家姓名*/ + @Excel(name = "专家姓名", width = 15) + @ApiModelProperty(value = "专家姓名") + private java.lang.String zjName; + /**授权范围（0过程考核 1智慧教师 2毕业论文 3实习实践）*/ + @Excel(name = "授权范围（0过程考核 1智慧教师 2毕业论文 3实习实践）", width = 15, dicCode = "zj_sqfw") + @Dict(dicCode = "zj_sqfw") + @ApiModelProperty(value = "授权范围（0过程考核 1智慧教师 2毕业论文 3实习实践）") + private java.lang.String sqfw; + /**授权开始时间*/ + @Excel(name = "授权开始时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "授权开始时间") + private java.util.Date sqStartTime; + /**授权结束时间*/ + @Excel(name = "授权结束时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "授权结束时间") + private java.util.Date sqEndTime; + /**学年学期/毕业年份*/ + @Excel(name = "学年学期/毕业年份", width = 15) + @ApiModelProperty(value = "学年学期/毕业年份") + private java.lang.String xnxq; + /**课程所属专业*/ + @Excel(name = "课程所属专业", width = 15) + @ApiModelProperty(value = "课程所属专业") + private java.lang.String zydl; + /**课程名称*/ + @Excel(name = "课程名称", width = 15) + @ApiModelProperty(value = "课程名称") + private java.lang.String kcmc; + /**开课单位*/ + @Excel(name = "开课单位", width = 15) + @ApiModelProperty(value = "开课单位") + private java.lang.String kkdw; + /**授权状态（0正常，1过期）*/ + @Excel(name = "授权状态（0正常，1过期）", width = 15, dicCode = "zj_sqzt") + @Dict(dicCode = "zj_sqzt") + @ApiModelProperty(value = "授权状态（0正常，1过期）") + private java.lang.String sqzt; + /**课程类别*/ + @Excel(name = "课程类别", width = 15) + @ApiModelProperty(value = "课程类别") + private java.lang.String kclb; + + @TableField(exist = false) + private List sqDataList; + + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/mapper/ZjSqxxMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/mapper/ZjSqxxMapper.java new file mode 100644 index 0000000..c2bfb28 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/mapper/ZjSqxxMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.zjSqxx.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 专家授权信息 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface ZjSqxxMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/mapper/xml/ZjSqxxMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/mapper/xml/ZjSqxxMapper.xml new file mode 100644 index 0000000..8626196 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/mapper/xml/ZjSqxxMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/IZjSqxxService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/IZjSqxxService.java new file mode 100644 index 0000000..575e031 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/IZjSqxxService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.demo.zjSqxx.service; + +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 专家授权信息 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface IZjSqxxService extends IService { + + void addNew(ZjSqxx zjSqxx); +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java new file mode 100644 index 0000000..f2035d5 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java @@ -0,0 +1,49 @@ +package org.jeecg.modules.demo.zjSqxx.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.mapper.ZjSqxxMapper; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +/** + * @Description: 专家授权信息 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Service +public class ZjSqxxServiceImpl extends ServiceImpl implements IZjSqxxService { + + @Autowired + private ISysUserService sysUserService; + + @Override + public void addNew(ZjSqxx zjSqxx) { + List zjSqxxList = zjSqxx.getSqDataList(); + String userIdArr[] = zjSqxx.getUserId().split(","); + for(String userId:userIdArr){ + SysUser user = sysUserService.getById(userId); + + //先删除该用户的授权记录 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_id",userId); + baseMapper.delete(queryWrapper); + + for(ZjSqxx sq:zjSqxxList){ + sq.setId(null); + sq.setUserId(userId); + sq.setZjName(user.getRealname()); + sq.setZjNo(user.getUsername()); + baseMapper.insert(sq); + } + } + } +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/controller/ZyInfoScjlController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/controller/ZyInfoScjlController.java new file mode 100644 index 0000000..b1fb5ee --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/controller/ZyInfoScjlController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.demo.zyInfoScjl.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.zyInfoScjl.entity.ZyInfoScjl; +import org.jeecg.modules.demo.zyInfoScjl.service.IZyInfoScjlService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 作业上传记录 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Api(tags="作业上传记录") +@RestController +@RequestMapping("/zyInfoScjl/zyInfoScjl") +@Slf4j +public class ZyInfoScjlController extends JeecgController { + @Autowired + private IZyInfoScjlService zyInfoScjlService; + + /** + * 分页列表查询 + * + * @param zyInfoScjl + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "作业上传记录-分页列表查询") + @ApiOperation(value="作业上传记录-分页列表查询", notes="作业上传记录-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ZyInfoScjl zyInfoScjl, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyInfoScjl, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyInfoScjlService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyInfoScjl + * @return + */ + @AutoLog(value = "作业上传记录-添加") + @ApiOperation(value="作业上传记录-添加", notes="作业上传记录-添加") + @RequiresPermissions("zyInfoScjl:zy_info_scjl:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyInfoScjl zyInfoScjl) { + zyInfoScjlService.save(zyInfoScjl); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyInfoScjl + * @return + */ + @AutoLog(value = "作业上传记录-编辑") + @ApiOperation(value="作业上传记录-编辑", notes="作业上传记录-编辑") + @RequiresPermissions("zyInfoScjl:zy_info_scjl:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZyInfoScjl zyInfoScjl) { + zyInfoScjlService.updateById(zyInfoScjl); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "作业上传记录-通过id删除") + @ApiOperation(value="作业上传记录-通过id删除", notes="作业上传记录-通过id删除") + @RequiresPermissions("zyInfoScjl:zy_info_scjl:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyInfoScjlService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "作业上传记录-批量删除") + @ApiOperation(value="作业上传记录-批量删除", notes="作业上传记录-批量删除") + @RequiresPermissions("zyInfoScjl:zy_info_scjl:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyInfoScjlService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "作业上传记录-通过id查询") + @ApiOperation(value="作业上传记录-通过id查询", notes="作业上传记录-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ZyInfoScjl zyInfoScjl = zyInfoScjlService.getById(id); + if(zyInfoScjl==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyInfoScjl); + } + + /** + * 导出excel + * + * @param request + * @param zyInfoScjl + */ + @RequiresPermissions("zyInfoScjl:zy_info_scjl:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyInfoScjl zyInfoScjl) { + return super.exportXls(request, zyInfoScjl, ZyInfoScjl.class, "作业上传记录"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("zyInfoScjl:zy_info_scjl:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyInfoScjl.class); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/entity/ZyInfoScjl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/entity/ZyInfoScjl.java new file mode 100644 index 0000000..552de8f --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/entity/ZyInfoScjl.java @@ -0,0 +1,116 @@ +package org.jeecg.modules.demo.zyInfoScjl.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 作业上传记录 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Data +@TableName("zy_info_scjl") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_info_scjl对象", description="作业上传记录") +public class ZyInfoScjl implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**作业id*/ + @Excel(name = "作业id", width = 15) + @ApiModelProperty(value = "作业id") + private java.lang.String zyId; + /**作业名称*/ + @Excel(name = "作业名称", width = 15) + @ApiModelProperty(value = "作业名称") + private java.lang.String zyName; + /**作业类型*/ + @Excel(name = "作业类型", width = 15, dicCode = "zy_leixing") + @Dict(dicCode = "zy_leixing") + @ApiModelProperty(value = "作业类型") + private java.lang.String zyLeixing; + /**占比*/ + @Excel(name = "占比", width = 15) + @ApiModelProperty(value = "占比") + private java.lang.String zyZb; + /**开课单位*/ + @Excel(name = "开课单位", width = 15) + @ApiModelProperty(value = "开课单位") + private java.lang.String kkdw; + /**开课单位id*/ + @Excel(name = "开课单位id", width = 15) + @ApiModelProperty(value = "开课单位id") + private java.lang.String kkdwid; + /**课程名称*/ + @Excel(name = "课程名称", width = 15) + @ApiModelProperty(value = "课程名称") + private java.lang.String kcmc; + /**教工号*/ + @Excel(name = "教工号", width = 15) + @ApiModelProperty(value = "教工号") + private java.lang.String jgh; + /**授课教师*/ + @Excel(name = "授课教师", width = 15) + @ApiModelProperty(value = "授课教师") + private java.lang.String skjs; + /**授课地点*/ + @Excel(name = "授课地点", width = 15) + @ApiModelProperty(value = "授课地点") + private java.lang.String skdd; + /**课程性质*/ + @Excel(name = "课程性质", width = 15) + @ApiModelProperty(value = "课程性质") + private java.lang.String kcxz; + /**学年学期*/ + @Excel(name = "学年学期", width = 15) + @ApiModelProperty(value = "学年学期") + private java.lang.String xnxq; + /**文件*/ + @Excel(name = "文件", width = 15) + @ApiModelProperty(value = "文件") + private java.lang.String filePath; + /**学工号*/ + @Excel(name = "学工号", width = 15) + @ApiModelProperty(value = "学工号") + private java.lang.String studentNo; + /**学生姓名*/ + @Excel(name = "学生姓名", width = 15) + @ApiModelProperty(value = "学生姓名") + private java.lang.String studentName; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/mapper/ZyInfoScjlMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/mapper/ZyInfoScjlMapper.java new file mode 100644 index 0000000..6746a8b --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/mapper/ZyInfoScjlMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.zyInfoScjl.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.zyInfoScjl.entity.ZyInfoScjl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 作业上传记录 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface ZyInfoScjlMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/mapper/xml/ZyInfoScjlMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/mapper/xml/ZyInfoScjlMapper.xml new file mode 100644 index 0000000..7f1505b --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/mapper/xml/ZyInfoScjlMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/service/IZyInfoScjlService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/service/IZyInfoScjlService.java new file mode 100644 index 0000000..34b732a --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/service/IZyInfoScjlService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.zyInfoScjl.service; + +import org.jeecg.modules.demo.zyInfoScjl.entity.ZyInfoScjl; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 作业上传记录 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +public interface IZyInfoScjlService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/service/impl/ZyInfoScjlServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/service/impl/ZyInfoScjlServiceImpl.java new file mode 100644 index 0000000..9bb99a9 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoScjl/service/impl/ZyInfoScjlServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.zyInfoScjl.service.impl; + +import org.jeecg.modules.demo.zyInfoScjl.entity.ZyInfoScjl; +import org.jeecg.modules.demo.zyInfoScjl.mapper.ZyInfoScjlMapper; +import org.jeecg.modules.demo.zyInfoScjl.service.IZyInfoScjlService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 作业上传记录 + * @Author: jeecg-boot + * @Date: 2024-09-03 + * @Version: V1.0 + */ +@Service +public class ZyInfoScjlServiceImpl extends ServiceImpl implements IZyInfoScjlService { + +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 228171d..daf46ea 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1829,4 +1829,25 @@ public class SysUserController { public Result importAppUser(HttpServletRequest request, HttpServletResponse response)throws IOException { return sysUserService.importAppUser(request); } + + + /** + * 获取用户信息 + * @param jsonObject + * @return + */ + @RequestMapping(value = "/getInfoByIds", method = RequestMethod.POST) + public Result> getInfoByIds(@RequestBody JSONObject jsonObject) { + String userName = ""; + String ids = jsonObject.getString("ids"); + String arrIds[] = ids.split(","); + for (String id : arrIds) { + SysUser sysUser = sysUserService.getById(id); + userName += sysUser.getRealname() + ","; + } + Map map = new HashMap<>(); + map.put("userName",userName); + return Result.ok(map); + + } } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 06c05e8..f5430ee 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -190,7 +190,7 @@ mybatis-plus: table-underline: true configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 diff --git a/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.api.ts b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.api.ts index 7ab2895..6d59ed9 100644 --- a/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.api.ts +++ b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.api.ts @@ -5,6 +5,7 @@ const { createConfirm } = useMessage(); enum Api { list = '/kcKetangbiao/kcKetangbiao/list', + checklist = '/kcKetangbiao/kcKetangbiao/checklist', save='/kcKetangbiao/kcKetangbiao/add', edit='/kcKetangbiao/kcKetangbiao/edit', deleteOne = '/kcKetangbiao/kcKetangbiao/delete', @@ -29,6 +30,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const checklist = (params) => defHttp.get({ url: Api.checklist, params }); /** * 删除单个 diff --git a/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.data.ts b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.data.ts index dccb3ec..74c416e 100644 --- a/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.data.ts +++ b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiao.data.ts @@ -30,21 +30,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'zc' }, - { - title: '教职工类别', - align: "center", - dataIndex: 'jzglb' - }, { title: '选课人数', align: "center", dataIndex: 'xkrs' }, - { - title: '评课人数', - align: "center", - dataIndex: 'pkrs' - }, { title: '任务编号', align: "center", @@ -85,66 +75,6 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'week' }, - { - title: '节次开始时间', - align: "center", - dataIndex: 'hhks' - }, - { - title: '节次结束时间', - align: "center", - dataIndex: 'hhjs' - }, - { - title: '单双周', - align: "center", - dataIndex: 'dsz' - }, - { - title: '课堂开始日期', - align: "center", - dataIndex: 'wwks' - }, - { - title: '课堂结束日期', - align: "center", - dataIndex: 'wwjs' - }, - { - title: '直播方式', - align: "center", - dataIndex: 'zbfs' - }, - { - title: '会议id', - align: "center", - dataIndex: 'hyid' - }, - { - title: '会议号', - align: "center", - dataIndex: 'hyh' - }, - { - title: '会议密码', - align: "center", - dataIndex: 'hymm' - }, - { - title: '课程链接', - align: "center", - dataIndex: 'kclj' - }, - { - title: '备注', - align: "center", - dataIndex: 'beizhu' - }, - { - title: '直播平台', - align: "center", - dataIndex: 'zbpx' - }, { title: '开课单位id', align: "center", @@ -155,91 +85,6 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'skrq' }, - { - title: '课程表id', - align: "center", - dataIndex: 'kechengbiaoid' - }, - { - title: '听课次数', - align: "center", - dataIndex: 'tingkecishu' - }, - { - title: '开课周次', - align: "center", - dataIndex: 'kkzc' - }, - { - title: '第几周', - align: "center", - dataIndex: 'dijizhou' - }, - { - title: '授课周次1', - align: "center", - dataIndex: 'jkzc1' - }, - { - title: '是否停课', - align: "center", - dataIndex: 'sftk' - }, - { - title: '停课原因', - align: "center", - dataIndex: 'tkyy' - }, - { - title: '补课计划', - align: "center", - dataIndex: 'bkjh' - }, - { - title: '是否出镜，0-出镜，1-不出镜', - align: "center", - dataIndex: 'sfcj' - }, - { - title: '上课形式，0-线上，1-线下，2-线上线下混合', - align: "center", - dataIndex: 'skxs' - }, - { - title: 'kechengbiao1', - align: "center", - dataIndex: 'kechengbiao1' - }, - { - title: '是否新生课 0 = 是', - align: "center", - dataIndex: 'sfxsk' - }, - { - title: '教工号', - align: "center", - dataIndex: 'jgh' - }, - { - title: '备注', - align: "center", - dataIndex: 'bz' - }, - { - title: '状态', - align: "center", - dataIndex: 'zt' - }, - { - title: '教室编号', - align: "center", - dataIndex: 'jsbh' - }, - { - title: '是否删除（0：未删除，1：已删除）', - align: "center", - dataIndex: 'isDelete' - }, { title: '学年学期内部用', align: "center", @@ -247,6 +92,16 @@ export const columns: BasicColumn[] = [ }, ]; + +//列表数据 +export const columnsCheck: BasicColumn[] = [ + { + title: '课程名称', + align: "center", + dataIndex: 'kcmc' + }, +]; + // 高级查询数据 export const superQuerySchema = { kcbh: {title: '课程编号',order: 0,view: 'text', type: 'string',}, diff --git a/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiaoCheckList.vue b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiaoCheckList.vue new file mode 100644 index 0000000..98b9d89 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiaoCheckList.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiaoCheckModal.vue b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiaoCheckModal.vue new file mode 100644 index 0000000..5722da7 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/kcKetangbiao/KcKetangbiaoCheckModal.vue @@ -0,0 +1,74 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/JwxtMain.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/JwxtMain.vue new file mode 100644 index 0000000..8bb3419 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/JwxtMain.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts index cedc3f4..d699adb 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts @@ -6,22 +6,22 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: 'name', + title: '姓名', align: "center", dataIndex: 'name' }, { - title: 'path', + title: '文件', align: "center", dataIndex: 'path' }, { - title: 'cjr', + title: '创建人', align: "center", dataIndex: 'cjr' }, { - title: 'cjsj', + title: '创建时间', align: "center", dataIndex: 'cjsj' }, diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts index 9e8d627..50d6fbb 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts @@ -6,12 +6,12 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: 'kcrwdm', + title: '课程任务代码', align: "center", dataIndex: 'kcrwdm' }, { - title: 'nj', + title: '年级', align: "center", dataIndex: 'nj' }, diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxx.api.ts b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxx.api.ts new file mode 100644 index 0000000..a5ac533 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxx.api.ts @@ -0,0 +1,79 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/zjSqxx/zjSqxx/list', + save='/zjSqxx/zjSqxx/add', + edit='/zjSqxx/zjSqxx/edit', + addNew='/zjSqxx/zjSqxx/addNew', + + deleteOne = '/zjSqxx/zjSqxx/delete', + deleteBatch = '/zjSqxx/zjSqxx/deleteBatch', + importExcel = '/zjSqxx/zjSqxx/importExcel', + exportXls = '/zjSqxx/zjSqxx/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} + +export const saveNew = (params, isUpdate) => { + let url = Api.addNew; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxx.data.ts b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxx.data.ts new file mode 100644 index 0000000..0787199 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxx.data.ts @@ -0,0 +1,81 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '教工号', + align: "center", + dataIndex: 'zjNo' + }, + { + title: '专家姓名', + align: "center", + dataIndex: 'zjName' + }, + { + title: '授权范围', + align: "center", + dataIndex: 'sqfw_dictText' + }, + { + title: '授权开始时间', + align: "center", + dataIndex: 'sqStartTime', + customRender:({text}) =>{ + text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + return text; + }, + }, + { + title: '授权结束时间', + align: "center", + dataIndex: 'sqEndTime', + customRender:({text}) =>{ + text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + return text; + }, + }, + { + title: '学年学期/毕业年份', + align: "center", + dataIndex: 'xnxq' + }, + { + title: '课程所属专业', + align: "center", + dataIndex: 'zydl' + }, + { + title: '课程名称', + align: "center", + dataIndex: 'kcmc' + }, + { + title: '开课单位', + align: "center", + dataIndex: 'kkdw' + }, + { + title: '授权状态', + align: "center", + dataIndex: 'sqzt_dictText' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + userId: {title: '用户id',order: 0,view: 'text', type: 'string',}, + zjNo: {title: '教工号',order: 1,view: 'text', type: 'string',}, + zjName: {title: '专家姓名',order: 2,view: 'text', type: 'string',}, + sqfw: {title: '授权范围（0过程考核 1智慧教师 2毕业论文 3实习实践）',order: 3,view: 'list', type: 'string',dictCode: 'zj_sqfw',}, + sqStartTime: {title: '授权开始时间',order: 4,view: 'date', type: 'string',}, + sqEndTime: {title: '授权结束时间',order: 5,view: 'date', type: 'string',}, + xnxq: {title: '学年学期/毕业年份',order: 6,view: 'list', type: 'string',dictCode: 'xnxq',}, + zydl: {title: '课程所属专业',order: 7,view: 'text', type: 'string',}, + kcmc: {title: '课程名称',order: 8,view: 'textarea', type: 'string',}, + kkdw: {title: '开课单位',order: 9,view: 'textarea', type: 'string',}, + sqzt: {title: '授权状态（0正常，1过期）',order: 10,view: 'list', type: 'string',dictCode: 'zj_sqzt',}, +}; diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue new file mode 100644 index 0000000..83423e9 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue new file mode 100644 index 0000000..dc551f8 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue @@ -0,0 +1,386 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditModal.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditModal.vue new file mode 100644 index 0000000..8211fd1 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditModal.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue new file mode 100644 index 0000000..38c43c1 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue @@ -0,0 +1,436 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxModal.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxModal.vue new file mode 100644 index 0000000..218dca2 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxModal.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue index bfe18c8..172f33c 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue @@ -7,6 +7,9 @@ + + + @@ -15,6 +18,7 @@ import { ref } from 'vue'; import ZyHuizongList from '/@/views/bl/zyHuizong/ZyHuizongList.vue' import ZyHuizongXiangxiList from '/@/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue' +import ZyInfoScjlList from '/@/views/bl/zyInfoScjl/ZyInfoScjlList.vue' const activeKey = ref('1'); diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjl.api.ts b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjl.api.ts new file mode 100644 index 0000000..54e2095 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjl.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/zyInfoScjl/zyInfoScjl/list', + save='/zyInfoScjl/zyInfoScjl/add', + edit='/zyInfoScjl/zyInfoScjl/edit', + deleteOne = '/zyInfoScjl/zyInfoScjl/delete', + deleteBatch = '/zyInfoScjl/zyInfoScjl/deleteBatch', + importExcel = '/zyInfoScjl/zyInfoScjl/importExcel', + exportXls = '/zyInfoScjl/zyInfoScjl/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjl.data.ts b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjl.data.ts new file mode 100644 index 0000000..1c68a83 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjl.data.ts @@ -0,0 +1,90 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '作业名称', + align: "center", + dataIndex: 'zyName' + }, + { + title: '作业类型', + align: "center", + dataIndex: 'zyLeixing_dictText' + }, + { + title: '占比', + align: "center", + dataIndex: 'zyZb' + }, + { + title: '开课单位', + align: "center", + dataIndex: 'kkdw' + }, + { + title: '课程名称', + align: "center", + dataIndex: 'kcmc' + }, + { + title: '教工号', + align: "center", + dataIndex: 'jgh' + }, + { + title: '授课教师', + align: "center", + dataIndex: 'skjs' + }, + { + title: '授课地点', + align: "center", + dataIndex: 'skdd' + }, + { + title: '课程性质', + align: "center", + dataIndex: 'kcxz' + }, + { + title: '学年学期', + align: "center", + dataIndex: 'xnxq' + }, + { + title: '文件', + align: "center", + dataIndex: 'filePath' + }, + { + title: '学工号', + align: "center", + dataIndex: 'studentNo' + }, + { + title: '学生姓名', + align: "center", + dataIndex: 'studentName' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + zyName: {title: '作业名称',order: 0,view: 'text', type: 'string',}, + zyLeixing: {title: '作业类型',order: 1,view: 'list', type: 'string',dictCode: 'zy_leixing',}, + zyZb: {title: '占比',order: 2,view: 'text', type: 'string',}, + kkdw: {title: '开课单位',order: 3,view: 'text', type: 'string',}, + kcmc: {title: '课程名称',order: 4,view: 'text', type: 'string',}, + jgh: {title: '教工号',order: 5,view: 'text', type: 'string',}, + skjs: {title: '授课教师',order: 6,view: 'text', type: 'string',}, + skdd: {title: '授课地点',order: 7,view: 'text', type: 'string',}, + kcxz: {title: '课程性质',order: 8,view: 'text', type: 'string',}, + xnxq: {title: '学年学期',order: 9,view: 'text', type: 'string',}, + filePath: {title: '文件',order: 10,view: 'textarea', type: 'string',}, + studentNo: {title: '学工号',order: 11,view: 'text', type: 'string',}, + studentName: {title: '学生姓名',order: 12,view: 'text', type: 'string',}, +}; diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue new file mode 100644 index 0000000..f5cc577 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/components/ZyInfoScjlForm.vue b/jeecgboot-vue3/src/views/bl/zyInfoScjl/components/ZyInfoScjlForm.vue new file mode 100644 index 0000000..63babaa --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/components/ZyInfoScjlForm.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/components/ZyInfoScjlModal.vue b/jeecgboot-vue3/src/views/bl/zyInfoScjl/components/ZyInfoScjlModal.vue new file mode 100644 index 0000000..8a0a38e --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/components/ZyInfoScjlModal.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue new file mode 100644 index 0000000..18e8721 --- /dev/null +++ b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue @@ -0,0 +1,59 @@ + +