From 32bfcc1dd6d82ad7129e274f25c881b8132f0151 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 27 Mar 2025 16:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E9=94=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E5=8F=8A=E9=A2=84=E8=A7=88=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DownKccldbxzServiceImpl.java | 230 +++++++++++++++++- .../mapper/xml/Xxhbfxcjmxb0015Mapper.xml | 1 + .../controller/XxhbjwxtxsmdController.java | 8 + .../xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java | 29 +-- .../controller/ZyInfoStudentController.java | 178 ++++++++++++++ .../zyInfoStudent/entity/ZyInfoStudent.java | 175 +++++++++++++ .../mapper/ZyInfoStudentMapper.java | 17 ++ .../mapper/xml/ZyInfoStudentMapper.xml | 5 + .../service/IZyInfoStudentService.java | 14 ++ .../impl/ZyInfoStudentServiceImpl.java | 21 ++ .../bl/downKccldbxz/DownKccldbxz.data.ts | 10 +- .../views/bl/xxhbfxcj/Xxhbfxcjmxb0015.data.ts | 5 + .../views/bl/xxhbfxcj/Xxhbfxcjmxb0015List.vue | 13 +- .../xxhbfxcj/components/StudengZyylForm.vue | 133 ++++++++++ .../xxhbfxcj/components/StudengZyylModal.vue | 64 +++++ .../bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue | 43 ++-- .../views/bl/xxhbjwxtjxrw/XzkckhclList.vue | 61 ++--- 17 files changed, 918 insertions(+), 89 deletions(-) create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/controller/ZyInfoStudentController.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/entity/ZyInfoStudent.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/ZyInfoStudentMapper.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/IZyInfoStudentService.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java create mode 100644 jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylForm.vue create mode 100644 jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylModal.vue diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/downKccldbxz/service/impl/DownKccldbxzServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/downKccldbxz/service/impl/DownKccldbxzServiceImpl.java index 4ed2d2f..9fdc23c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/downKccldbxz/service/impl/DownKccldbxzServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/downKccldbxz/service/impl/DownKccldbxzServiceImpl.java @@ -2,6 +2,13 @@ package org.jeecg.modules.demo.downKccldbxz.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.demo.downKccldbxz.entity.DownKccldbxz; import org.jeecg.modules.demo.downKccldbxz.mapper.DownKccldbxzMapper; import org.jeecg.modules.demo.downKccldbxz.service.IDownKccldbxzService; @@ -10,18 +17,28 @@ import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw; import org.jeecg.modules.demo.xxhbjwxtjxrw.service.IXxhbjwxtjxrwService; import org.jeecg.modules.demo.xxhbjwxtscwjxx.entity.Xxhbjwxtscwjxx; import org.jeecg.modules.demo.xxhbjwxtscwjxx.service.IXxhbjwxtscwjxxService; +import org.jeecg.modules.demo.xxhbjwxtxsmd.entity.Xxhbjwxtxsmd; +import org.jeecg.modules.demo.xxhbjwxtxsmd.service.IXxhbjwxtxsmdService; import org.jeecg.modules.utils.SFTPUtil; import org.jeecg.modules.utils.SftpConfig; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.zip.ZipEntry; @@ -42,9 +59,15 @@ public class DownKccldbxzServiceImpl extends ServiceImpl xxhbjwxtscwQueryWrapper = new QueryWrapper<>(); xxhbjwxtscwQueryWrapper.eq("kcrwdm",item.getKcrwdm()); - String type = "bl0-pfbz,bl0-zyyq,bl1-pfbz,bl0-zyyq,bl2-pfbz,bl0-zyyq,bl3-pfbz,bl0-zyyq,bl4-pfbz,bl0-zyyq,bl5-pfbz,bl0-zyyq,qt-01,qt-02,qt-03,qt-04,qt-05,qt-06,qt-07,qt-08"; - xxhbjwxtscwQueryWrapper.in("type",type.split(",")); List list2 = xxhbjwxtscwjxxService.list(xxhbjwxtscwQueryWrapper); + String downPath = getDownloadPath("downloadTemp/"+ finalTitle+"/"+item.getKcmc()+"/"+item.getTeaxm()); + //下载所有的文件信心 list2.forEach(item2->{ sfysj[0] = "1"; String imgPath = item2.getPath(); - String path = "downloadTemp/"+ finalTitle+"/"+item.getKcmc()+"/"+item.getTeaxm(); - - - + String imgArrPath[] = imgPath.split("/"); + String path = downPath+"/"+imgArrPath[imgArrPath.length-2]; Map map = SFTPUtil.download(sftpConfig,imgPath,getDownloadPath(path)); - String localFilePath = map.get("fileName"); System.out.println("------------------------>" + localFilePath); }); + //生产excle + String directoryPath = downPath; + exportXls(item, getDownloadPath(directoryPath), "学生成绩"); }); if(sfysj[0].equals("0")){ downKccldbxz.setStatus("3"); @@ -191,4 +214,197 @@ public class DownKccldbxzServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("kcrwdm",xxhbjwxtjxrw.getKcrwdm()); + List list = xxhbjwxtxsmdService.list(queryWrapper); + String sfjx = "0";//是否继续，有数据返回1，没数据返回0 + for(int i=0;i + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java index 86c2460..9807918 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java @@ -323,6 +323,14 @@ public class XxhbjwxtxsmdController extends JeecgController> selectZhjxList(Xxhbjwxtxsmd xxhbjwxtxsmd) { + List zhjxList = xxhbjwxtxsmdService.selectZhjxList(xxhbjwxtxsmd); + return Result.OK(zhjxList); + } + + @ApiOperation(value="教务系统学生名单-分页列表查询", notes="教务系统学生名单-分页列表查询") @GetMapping(value = "/getXsmdxxByFjtype") public Result> getXsmdxxByFjtype(Xxhbjwxtxsmd xxhbjwxtxsmd, diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java index f802a47..20cc60e 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java @@ -31,99 +31,80 @@ public class Xxhbjwxtxsmd implements Serializable { private static final long serialVersionUID = 1L; /**kcrwdm*/ - @Excel(name = "kcrwdm", width = 15) @ApiModelProperty(value = "kcrwdm") private java.lang.String kcrwdm; /**nj*/ - @Excel(name = "nj", width = 15) @ApiModelProperty(value = "nj") private java.lang.String nj; /**xsztmc*/ - @Excel(name = "xsztmc", width = 15) @ApiModelProperty(value = "xsztmc") private java.lang.String xsztmc; /**zymc*/ - @Excel(name = "zymc", width = 15) @ApiModelProperty(value = "zymc") private java.lang.String zymc; /**xsbh*/ - @Excel(name = "xsbh", width = 15) + @Excel(name = "学生编号", width = 15) @ApiModelProperty(value = "xsbh") private java.lang.String xsbh; /**xsxm*/ - @Excel(name = "xsxm", width = 15) + @Excel(name = "学生姓名", width = 15) @ApiModelProperty(value = "xsxm") private java.lang.String xsxm; /**kcmc*/ - @Excel(name = "kcmc", width = 15) + @Excel(name = "课程名称", width = 15) @ApiModelProperty(value = "kcmc") private java.lang.String kcmc; /**kclb*/ - @Excel(name = "kclb", width = 15) @ApiModelProperty(value = "kclb") private java.lang.String kclb; /**teaxm*/ - @Excel(name = "teaxm", width = 15) @ApiModelProperty(value = "teaxm") private java.lang.String teaxm; /**cj1*/ - @Excel(name = "cj1", width = 15) @ApiModelProperty(value = "cj1") private java.lang.String cj1; /**cj2*/ - @Excel(name = "cj2", width = 15) @ApiModelProperty(value = "cj2") private java.lang.String cj2; /**cj3*/ - @Excel(name = "cj3", width = 15) @ApiModelProperty(value = "cj3") private java.lang.String cj3; /**cj4*/ - @Excel(name = "cj4", width = 15) @ApiModelProperty(value = "cj4") private java.lang.String cj4; /**cj5*/ - @Excel(name = "cj5", width = 15) @ApiModelProperty(value = "cj5") private java.lang.String cj5; /**cj1mc*/ - @Excel(name = "cj1mc", width = 15) @ApiModelProperty(value = "cj1mc") private java.lang.String cj1mc; /**cj2mc*/ - @Excel(name = "cj2mc", width = 15) @ApiModelProperty(value = "cj2mc") private java.lang.String cj2mc; /**cj3mc*/ - @Excel(name = "cj3mc", width = 15) @ApiModelProperty(value = "cj3mc") private java.lang.String cj3mc; /**cj4mc*/ - @Excel(name = "cj4mc", width = 15) @ApiModelProperty(value = "cj4mc") private java.lang.String cj4mc; /**cj5mc*/ - @Excel(name = "cj5mc", width = 15) @ApiModelProperty(value = "cj5mc") private java.lang.String cj5mc; /**zcj*/ - @Excel(name = "zcj", width = 15) + + @Excel(name = "总成绩", width = 15) @ApiModelProperty(value = "zcj") private java.lang.String zcj; /**cjfsmc*/ - @Excel(name = "cjfsmc", width = 15) @ApiModelProperty(value = "cjfsmc") private java.lang.String cjfsmc; /**xdfsmc*/ - @Excel(name = "xdfsmc", width = 15) @ApiModelProperty(value = "xdfsmc") private java.lang.String xdfsmc; /**ksxzmc*/ - @Excel(name = "ksxzmc", width = 15) @ApiModelProperty(value = "ksxzmc") private java.lang.String ksxzmc; /**jxbrs*/ - @Excel(name = "jxbrs", width = 15) @ApiModelProperty(value = "jxbrs") private String jxbrs; diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/controller/ZyInfoStudentController.java new file mode 100644 index 0000000..ae43983 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/controller/ZyInfoStudentController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.demo.zyInfoStudent.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.zyInfoStudent.entity.ZyInfoStudent; +import org.jeecg.modules.demo.zyInfoStudent.service.IZyInfoStudentService; + +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: zy_info_student + * @Author: jeecg-boot + * @Date: 2025-03-27 + * @Version: V1.0 + */ +@Api(tags="zy_info_student") +@RestController +@RequestMapping("/zyInfoStudent/zyInfoStudent") +@Slf4j +public class ZyInfoStudentController extends JeecgController { + @Autowired + private IZyInfoStudentService zyInfoStudentService; + + /** + * 分页列表查询 + * + * @param zyInfoStudent + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "zy_info_student-分页列表查询") + @ApiOperation(value="zy_info_student-分页列表查询", notes="zy_info_student-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ZyInfoStudent zyInfoStudent, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyInfoStudent, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyInfoStudentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyInfoStudent + * @return + */ + @AutoLog(value = "zy_info_student-添加") + @ApiOperation(value="zy_info_student-添加", notes="zy_info_student-添加") + @RequiresPermissions("zyInfoStudent:zy_info_student:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyInfoStudent zyInfoStudent) { + zyInfoStudentService.save(zyInfoStudent); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyInfoStudent + * @return + */ + @AutoLog(value = "zy_info_student-编辑") + @ApiOperation(value="zy_info_student-编辑", notes="zy_info_student-编辑") + @RequiresPermissions("zyInfoStudent:zy_info_student:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZyInfoStudent zyInfoStudent) { + zyInfoStudentService.updateById(zyInfoStudent); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "zy_info_student-通过id删除") + @ApiOperation(value="zy_info_student-通过id删除", notes="zy_info_student-通过id删除") + @RequiresPermissions("zyInfoStudent:zy_info_student:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyInfoStudentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "zy_info_student-批量删除") + @ApiOperation(value="zy_info_student-批量删除", notes="zy_info_student-批量删除") + @RequiresPermissions("zyInfoStudent:zy_info_student:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyInfoStudentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "zy_info_student-通过id查询") + @ApiOperation(value="zy_info_student-通过id查询", notes="zy_info_student-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(id); + if(zyInfoStudent==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyInfoStudent); + } + + /** + * 导出excel + * + * @param request + * @param zyInfoStudent + */ + @RequiresPermissions("zyInfoStudent:zy_info_student:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyInfoStudent zyInfoStudent) { + return super.exportXls(request, zyInfoStudent, ZyInfoStudent.class, "zy_info_student"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("zyInfoStudent:zy_info_student:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyInfoStudent.class); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/entity/ZyInfoStudent.java new file mode 100644 index 0000000..db26dbf --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/entity/ZyInfoStudent.java @@ -0,0 +1,175 @@ +package org.jeecg.modules.demo.zyInfoStudent.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: zy_info_student + * @Author: jeecg-boot + * @Date: 2025-03-27 + * @Version: V1.0 + */ +@Data +@TableName("zy_info_student") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_info_student对象", description="zy_info_student") +public class ZyInfoStudent 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") + @DateTimeFormat(pattern="yyyy-MM-dd") + @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") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**作业名称*/ + @Excel(name = "作业名称", width = 15) + @ApiModelProperty(value = "作业名称") + private java.lang.String mainId; + /**作业附件*/ + @Excel(name = "作业附件", width = 15) + @ApiModelProperty(value = "作业附件") + private java.lang.String filePath; + /**外网相似律*/ + @Excel(name = "外网相似律", width = 15) + @ApiModelProperty(value = "外网相似律") + private java.lang.String wwxsl; + /**内网相似律*/ + @Excel(name = "内网相似律", width = 15) + @ApiModelProperty(value = "内网相似律") + private java.lang.String nwxsl; + /**aigc相似律*/ + @Excel(name = "aigc相似律", width = 15) + @ApiModelProperty(value = "aigc相似律") + private java.lang.String aigcxsl; + /**外网是否通过*/ + @Excel(name = "外网是否通过", width = 15) + @ApiModelProperty(value = "外网是否通过") + private java.lang.String wwsftg; + /**内网是否通过*/ + @Excel(name = "内网是否通过", width = 15) + @ApiModelProperty(value = "内网是否通过") + private java.lang.String nwsftg; + /**aigc是否通过*/ + @Excel(name = "aigc是否通过", width = 15) + @ApiModelProperty(value = "aigc是否通过") + private java.lang.String aigcsftg; + /**评分*/ + @Excel(name = "评分", width = 15) + @ApiModelProperty(value = "评分") + private java.lang.String score; + /**学生姓名*/ + @Excel(name = "学生姓名", width = 15) + @ApiModelProperty(value = "学生姓名") + private java.lang.String studentName; + /**pdf预览*/ + @Excel(name = "pdf预览", width = 15) + @ApiModelProperty(value = "pdf预览") + private java.lang.String pdfPath; + /**是否发布评分*/ + @Excel(name = "是否发布评分", width = 15) + @ApiModelProperty(value = "是否发布评分") + private java.lang.String scoreFabu; + /**存档类型*/ + @Excel(name = "存档类型", width = 15) + @ApiModelProperty(value = "存档类型") + private java.lang.String cdlx; + /**校内相似律*/ + @Excel(name = "校内相似律", width = 15) + @ApiModelProperty(value = "校内相似律") + private java.lang.String xnxsl; + /**校内是否通过*/ + @Excel(name = "校内是否通过", width = 15) + @ApiModelProperty(value = "校内是否通过") + private java.lang.String xnsftg; + /**发布时间*/ + @Excel(name = "发布时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "发布时间") + private java.util.Date publishTime; + /**互评次数*/ + @Excel(name = "互评次数", width = 15) + @ApiModelProperty(value = "互评次数") + private java.lang.String hpcs; + /**学生互评分数*/ + @Excel(name = "学生互评分数", width = 15) + @ApiModelProperty(value = "学生互评分数") + private java.lang.String xshpfs; + /**绩效分数*/ + @Excel(name = "绩效分数", width = 15) + @ApiModelProperty(value = "绩效分数") + private java.lang.String jxfs; + /**最终得分*/ + @Excel(name = "最终得分", width = 15) + @ApiModelProperty(value = "最终得分") + private java.lang.String zzdf; + /**绩效分数的2次奖励*/ + @Excel(name = "绩效分数的2次奖励", width = 15) + @ApiModelProperty(value = "绩效分数的2次奖励") + private java.lang.String jxfs2; + /**作业类型 0课程作业 1期末作业*/ + @Excel(name = "作业类型 0课程作业 1期末作业", width = 15) + @ApiModelProperty(value = "作业类型 0课程作业 1期末作业") + private java.lang.String zyLeixing; + /**批阅内容*/ + @Excel(name = "批阅内容", width = 15) + @ApiModelProperty(value = "批阅内容") + private java.lang.String pyContent; + /**批阅附件*/ + @Excel(name = "批阅附件", width = 15) + @ApiModelProperty(value = "批阅附件") + private java.lang.String pyFilePath; + /**是否上传考核材料（0否 1是）*/ + @Excel(name = "是否上传考核材料（0否 1是）", width = 15) + @ApiModelProperty(value = "是否上传考核材料（0否 1是）") + private java.lang.String sfsckhcl; + /**服务器存储地址*/ + @Excel(name = "服务器存储地址", width = 15) + @ApiModelProperty(value = "服务器存储地址") + private java.lang.String fwqPath; + /**考核材料上传时间*/ + @Excel(name = "考核材料上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "考核材料上传时间") + private java.util.Date khclTime; + /**批阅附件服务器地址*/ + @Excel(name = "批阅附件服务器地址", width = 15) + @ApiModelProperty(value = "批阅附件服务器地址") + private java.lang.String pyFwqFilePath; + /**驳回内容*/ + @Excel(name = "驳回内容", width = 15) + @ApiModelProperty(value = "驳回内容") + private java.lang.String bhContent; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/ZyInfoStudentMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/ZyInfoStudentMapper.java new file mode 100644 index 0000000..fb3ff0f --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/ZyInfoStudentMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.zyInfoStudent.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.zyInfoStudent.entity.ZyInfoStudent; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: zy_info_student + * @Author: jeecg-boot + * @Date: 2025-03-27 + * @Version: V1.0 + */ +public interface ZyInfoStudentMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml new file mode 100644 index 0000000..150d3f0 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.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/zyInfoStudent/service/IZyInfoStudentService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/IZyInfoStudentService.java new file mode 100644 index 0000000..0f1e0fb --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/IZyInfoStudentService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.zyInfoStudent.service; + +import org.jeecg.modules.demo.zyInfoStudent.entity.ZyInfoStudent; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: zy_info_student + * @Author: jeecg-boot + * @Date: 2025-03-27 + * @Version: V1.0 + */ +public interface IZyInfoStudentService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java new file mode 100644 index 0000000..3c00549 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.demo.zyInfoStudent.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.jeecg.modules.demo.zyInfoStudent.entity.ZyInfoStudent; +import org.jeecg.modules.demo.zyInfoStudent.mapper.ZyInfoStudentMapper; +import org.jeecg.modules.demo.zyInfoStudent.service.IZyInfoStudentService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: zy_info_student + * @Author: jeecg-boot + * @Date: 2025-03-27 + * @Version: V1.0 + */ +@Service +@DS("multi-datasource1") +public class ZyInfoStudentServiceImpl extends ServiceImpl implements IZyInfoStudentService { + +} diff --git a/jeecgboot-vue3/src/views/bl/downKccldbxz/DownKccldbxz.data.ts b/jeecgboot-vue3/src/views/bl/downKccldbxz/DownKccldbxz.data.ts index 2d94709..17a2057 100644 --- a/jeecgboot-vue3/src/views/bl/downKccldbxz/DownKccldbxz.data.ts +++ b/jeecgboot-vue3/src/views/bl/downKccldbxz/DownKccldbxz.data.ts @@ -13,22 +13,26 @@ export const columns: BasicColumn[] = [ { title: '学年学期', align: "center", - dataIndex: 'xnxq' + dataIndex: 'xnxq', + width: '200px' }, { title: '打包时间', align: "center", - dataIndex: 'createTime' + dataIndex: 'createTime', + width: '200px' }, { title: '状态', align: "center", - dataIndex: 'status_dictText' + dataIndex: 'status_dictText', + width: '200px' }, { title: '下载地址', align: "center", dataIndex: 'filePath', + width: '200px' }, ]; diff --git a/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015.data.ts b/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015.data.ts index 73292d8..0d9ebaa 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015.data.ts @@ -20,6 +20,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'fxcj' }, + { + title: '批阅信息', + align: "center", + dataIndex: 'fxcj' + }, { title: '附件', align: "center", diff --git a/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015List.vue b/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015List.vue index 4277f6d..a58f6db 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015List.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbfxcj/Xxhbfxcjmxb0015List.vue @@ -16,6 +16,7 @@ + @@ -31,6 +32,7 @@ import { getFileAccessHttpUrl } from '@/utils/common/compUtils'; import { encryptByBase64 } from '@/utils/cipher'; import WjxWjxxTmlbDjjgModal from './components/WjxWjxxTmlbDjjgModal.vue' + import StudengZyylModal from './components/StudengZyylModal.vue' const formRef = ref(); const queryParam = reactive({}); @@ -38,6 +40,7 @@ const toggleSearchStatus = ref(false); const registerModal = ref(); const WjxWjxxTmlbDjjgModalPage = ref(); + const StudengZyylModalPage = ref(); const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -82,10 +85,14 @@ //查看作业详细 function handleXiangxi(record){ + // console.log("🚀 ~ handleXiangxi ~ text:", record) + // var file1 = getFileAccessHttpUrl(record.path); + // var url = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1)); + // window.open(url,"_blank"); console.log("🚀 ~ handleXiangxi ~ text:", record) - var file1 = getFileAccessHttpUrl(record.path); - var url = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1)); - window.open(url,"_blank"); + StudengZyylModalPage.value.disableSubmit = true; + StudengZyylModalPage.value.edit(record.kid, false); + } //课程测验详细 diff --git a/jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylForm.vue b/jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylForm.vue new file mode 100644 index 0000000..f03b30a --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylForm.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylModal.vue b/jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylModal.vue new file mode 100644 index 0000000..63736b0 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbfxcj/components/StudengZyylModal.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue index ddefd09..44372b7 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue @@ -121,22 +121,6 @@ 返回 --> - - - - - - - -
@@ -183,6 +167,9 @@ 选课人数 ：{{ jxrwInfo?.value.jxbrs }} + + 一键打包下载 +
@@ -208,7 +195,7 @@
- ',urlParams); + defHttp.post({url:"/downKccldbxz/downKccldbxz/add",params:urlParams}).then(res=>{ + console.log("res--->",res) + }) +} + //成绩单 function handleCjd(record) { sfxk.value = 2; @@ -597,6 +596,16 @@ function handleView(record) { sfxk.value = 6; sfxk2.value = 0; activeKey.value = '1'; + + + //defHttp.get({url:'/xxhbjwxtxsmd/xxhbjwxtxsmd/selectZhjxList',params:{kcrwdm : record.kcrwdm , synfxcjdm : "! null"}}).then(res =>{ + // console.log('/xxhbjwxtxsmd/xxhbjwxtxsmd/selectZhjxList--->' , res); + // if(res!=null && res.length > 0 ){ + // zhjxsfxs.value = true; + // }else{ + // zhjxsfxs.value = false; + // } + //}) } function onChangeTab(tab) { diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue index 02f5855..5ddff4c 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue @@ -42,22 +42,6 @@ -
@@ -164,15 +148,6 @@ - 返回 @@ -181,7 +156,7 @@
- 1 课程考核3材料详情 + 1 课程考核材料详情
{{ jxrwInfo?.value.xnxqmc }}《{{ jxrwInfo?.value.kcmc }}》 @@ -204,6 +179,9 @@ 选课人数 ：{{ jxrwInfo?.value.jxbrs }} + + 一键打包下载 +
@@ -211,7 +189,7 @@
- + @@ -229,7 +207,7 @@
- + @@ -282,6 +261,7 @@ const xsysclXqFormModal = ref(); const queryParam = reactive({}); const queryParam2 = ref({}); const toggleSearchStatus = ref(false); +const zhjxsfxs = ref(true); const registerModal = ref(); const Xxhbfxcjb0016Modal = ref(); const Xxhbfxcjmxb0015Modal = ref(); @@ -353,7 +333,14 @@ const paginationYxkcProp = ref({ function handleTable2SelectRowChange(event) { console.log('--------rowchange----->',event); } - +//一键打包下载课程材料 +function handleDownZip(){ + var urlParams = {xnxq:jxrwInfo.value.xnxqmc, kkyxmc:jxrwInfo.value.kkyxmc,kcmc:jxrwInfo.value.kcmc,teaxm:jxrwInfo.value.teaxm} + console.log('urlParams--->',urlParams); + defHttp.post({url:"/downKccldbxz/downKccldbxz/add",params:urlParams}).then(res=>{ + console.log("res--->",res) + }) +} //成绩单 function handleCjd(record) { @@ -380,13 +367,7 @@ function handleXuanke() { searchQuery2(); } function handleXsysclxq(record) { - // console.log('👨‍⚕️handleXsysclxq', record); - // sfxk2.value = 5; - // xsysclXqFormModal.value.init(record); - - console.log('👨‍⚕️handleXsysclxq', record); var cltype = record.cltype; - console.log('cltype--->',cltype); if(cltype == '1'){ sfxk2.value = 6; Xxhbfxcjmxb0015Modal.value.init(record); @@ -541,6 +522,16 @@ function handleView(record) { sfxk.value = 6; sfxk2.value = 0; activeKey.value = '1'; + + //defHttp.get({url:'/xxhbjwxtxsmd/xxhbjwxtxsmd/selectZhjxList',params:{kcrwdm : record.kcrwdm , synfxcjdm : "! null"}}).then(res =>{ + // console.log('/xxhbjwxtxsmd/xxhbjwxtxsmd/selectZhjxList--->' , res); + // if(res!=null && res.length > 0 ){ + // zhjxsfxs.value = true; + // }else{ + // zhjxsfxs.value = false; + // } + //}) + } function onChangeTab(tab) {