From 8d41672e4fc30f2935ca11fb1a6d5393ad27d9fe Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 30 Jul 2024 20:41:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZyCcjgServiceImpl.java | 6 +- .../zyInfo/controller/ZyInfoController.java | 5 +- .../modules/kc/zyInfo/entity/ZyInfo.java | 4 + .../controller/ZyInfoStudentController.java | 70 ++++- .../zyInfoStudent/entity/ZyInfoStudent.java | 6 +- .../mapper/ZyInfoStudentMapper.java | 2 + .../mapper/xml/ZyInfoStudentMapper.xml | 6 + .../service/IZyInfoStudentService.java | 2 + .../impl/ZyInfoStudentServiceImpl.java | 6 + .../controller/ZyInfoStudentHpController.java | 239 ++++++++++++++++++ .../entity/ZyInfoStudentHp.java | 83 ++++++ .../mapper/ZyInfoStudentHpMapper.java | 17 ++ .../mapper/xml/ZyInfoStudentHpMapper.xml | 5 + .../service/IZyInfoStudentHpService.java | 14 + .../impl/ZyInfoStudentHpServiceImpl.java | 19 ++ .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-test.yml | 4 +- .../resources/jeecg/jeecg_config.properties | 2 +- 18 files changed, 481 insertions(+), 13 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/controller/ZyInfoStudentHpController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/entity/ZyInfoStudentHp.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/ZyInfoStudentHpMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/xml/ZyInfoStudentHpMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/IZyInfoStudentHpService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/impl/ZyInfoStudentHpServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java index 00823547..01c01051 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java @@ -71,12 +71,14 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme @Autowired private ZyInfoStudentMapper zyInfoStudentService; + @Autowired + private IZyInfoStudentService zyInfoNewStudentService; @Override public void getCcjg() { QueryWrapper zyCcjgQueryWrapper = new QueryWrapper<>(); - zyCcjgQueryWrapper.in("filestateid",0,1,2);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测) + zyCcjgQueryWrapper.in("filestateid",0,1);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测) List list = baseMapper.selectList(zyCcjgQueryWrapper); for(ZyCcjg par : list){ //查重类型（0外网 1内网 2aigc 3校内） @@ -118,7 +120,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme public void deleteByZystuid(String id, HttpServletResponse response) { ZyInfoStudent zyInfoStudent = zyInfoStudentService.selectById(id); //删除维普已经提交的文档 - zyInfoStudentService.delweipulunwen(zyInfoStudent, response); +// zyInfoNewStudentService.delweipulunwen(zyInfoStudent, response); baseMapper.deleteByZystuid(id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java index 82440677..143a661a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java @@ -141,7 +141,7 @@ public class ZyInfoController extends JeecgController { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); - queryWrapper.orderByAsc("a.sort"); + queryWrapper.orderByAsc("a.sort - 0"); IPage pageList = zyInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -282,7 +282,7 @@ public class ZyInfoController extends JeecgController { zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy()); zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq()); - zyInfoQueryWrapper.orderByAsc("sort"); + zyInfoQueryWrapper.orderByAsc("sort-0"); List list = zyInfoService.list(zyInfoQueryWrapper); for(int i=0;i { if(zyInfo1!=null && zyInfo1.size()>0){ ZyInfo zypar = zyInfo1.get(0); zypar.setSort(par.getSort()); + zypar.setScore(par.getScore()); zyInfoService.save(zypar); }else{ par.setXnxq(kcSysConfig.getFlag1()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java index aa81fcd5..4a2b8a44 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java @@ -135,6 +135,10 @@ public class ZyInfo implements Serializable { private java.lang.String xshprsq;//学生互评人数 private java.lang.String xshpkssj;//学生互评开始时间 private java.lang.String xshpjssj;//学生互评结束时间 + private java.lang.String sfzzcj;//是否最终成绩（1是 0否） + private java.lang.String xssfck;//学生是否查看（1是 0否） + private java.lang.String hpsfwcone;//第1次互评是否完成（1是 0否） + private java.lang.String hpsfwctwo;//第2次互评是否完成（1是 0否） diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index 492a55aa..19b5df37 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -124,6 +124,7 @@ public class ZyInfoStudentController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap()); Page page = new Page(pageNo, pageSize); @@ -327,8 +328,35 @@ public class ZyInfoStudentController extends JeecgController clazz, String title) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("a.id",selectionList); + } + // Step.2 获取导出数据 + List exportList = service.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, title); + mv.addObject(NormalExcelConstants.CLASS, clazz); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + exportParams.setImageBasePath(upLoadPath); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } /** * 通过excel导入数据 @@ -431,8 +459,8 @@ public class ZyInfoStudentController extends JeecgController> getHpxxList(ZyInfoStudent zyInfoStudent, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + +// //查询作业查重结果 +// zyCcjgService.getCcjg(); + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.isNotNull("a.file_path"); + queryWrapper.eq("b.xshpkg","1"); + queryWrapper.apply("xshpkssj <= now() and xshpjssj >= now() and hpsfwctwo = 0"); + + + queryWrapper.like(StringUtils.isNotEmpty(zyInfoStudent.getZytitle()),"b.title",zyInfoStudent.getZytitle()); + queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getRwbh()),"b.rwbh",zyInfoStudent.getRwbh()); +// queryWrapper.like("a.xshpkg",zyInfoStudent.getZytitle()); +// if(StringUtils.isNotEmpty(zyInfoStudent.getQueryType())){ +// if(StringUtils.equals("1",zyInfoStudent.getQueryType())){//未提交 +// queryWrapper.isNull("a.file_path"); +// }else if(StringUtils.equals("2",zyInfoStudent.getQueryType())){//已提交 +// queryWrapper.isNotNull("a.file_path"); +// }else if(StringUtils.equals("3",zyInfoStudent.getQueryType())){//未评阅 +// queryWrapper.isNull("a.score"); +// }else if(StringUtils.equals("4",zyInfoStudent.getQueryType())){//已评阅 +// queryWrapper.isNotNull("a.score"); +// } +// } + IPage pageList = zyInfoStudentService.getHpxxList(page, queryWrapper); + return Result.OK(pageList); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java index fda1fe3b..41bdc1d3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java @@ -58,7 +58,7 @@ public class ZyInfoStudent implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @Excel(name = "提交时间", width = 15) + @Excel(name = "提交时间", width = 15,format = "yyyy-MM-dd") private java.util.Date publishTime; @Excel(name = "评分", width = 15) @@ -177,5 +177,9 @@ public class ZyInfoStudent implements Serializable { private String zgccl;//最高相似律 @TableField(exist = false) private String alltgl;//通过率 + @TableField(exist = false) + private String sfpf;//是否评分 + @TableField(exist = false) + private String zytitle;//作业名称 } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java index 633552ce..ec91bff4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java @@ -36,4 +36,6 @@ public interface ZyInfoStudentMapper extends BaseMapper { Map getXfwWpFile(ZyInfoStudent zyInfoStudent); void delweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response); + + IPage getHpxxList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml index 5fe98743..7c4776ed 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml @@ -135,4 +135,10 @@ LEFT JOIN zy_ccjg b on a.id = b.zy_stu_id where a.main_id = #{mainId} and a.create_by = #{createBy} and b.cc_type = #{queryType} group by bdkbs + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java index a2f4a492..c441c14d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java @@ -38,4 +38,6 @@ public interface IZyInfoStudentService extends IService { List exportSysXls(QueryWrapper queryWrapper, ZyInfoStudentSys zyInfoStudentSys); boolean stuWpKsjc(ZyInfoStudent zyInfoStudent, HttpServletResponse response); + + IPage getHpxxList(Page page, QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java index d1c3d853..3df1b082 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java @@ -189,6 +189,11 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl getHpxxList(Page page, QueryWrapper queryWrapper) { + return baseMapper.getHpxxList(page,queryWrapper); + } + private void delweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response) { zyInfoStudent.setQueryType("0");//外网查重数据 String paperids = baseMapper.getWpFile(zyInfoStudent); @@ -218,6 +223,7 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl { + @Autowired + private IZyInfoStudentHpService zyInfoStudentHpService; + @Autowired + private IZyInfoService zyInfoService; + /** + * 分页列表查询 + * + * @param zyInfoStudentHp + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "学生成绩互评-分页列表查询") + @ApiOperation(value="学生成绩互评-分页列表查询", notes="学生成绩互评-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ZyInfoStudentHp zyInfoStudentHp, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyInfoStudentHp, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyInfoStudentHpService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyInfoStudentHp + * @return + */ + @AutoLog(value = "学生成绩互评-添加") + @ApiOperation(value="学生成绩互评-添加", notes="学生成绩互评-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyInfoStudentHp zyInfoStudentHp) { + zyInfoStudentHpService.save(zyInfoStudentHp); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyInfoStudentHp + * @return + */ + @AutoLog(value = "学生成绩互评-编辑") + @ApiOperation(value="学生成绩互评-编辑", notes="学生成绩互评-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZyInfoStudentHp zyInfoStudentHp) { + zyInfoStudentHpService.updateById(zyInfoStudentHp); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "学生成绩互评-通过id删除") + @ApiOperation(value="学生成绩互评-通过id删除", notes="学生成绩互评-通过id删除") + @RequiresPermissions("zyInfoStudentHp:zy_info_student_hp:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyInfoStudentHpService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "学生成绩互评-批量删除") + @ApiOperation(value="学生成绩互评-批量删除", notes="学生成绩互评-批量删除") + @RequiresPermissions("zyInfoStudentHp:zy_info_student_hp:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyInfoStudentHpService.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) { + ZyInfoStudentHp zyInfoStudentHp = zyInfoStudentHpService.getById(id); + if(zyInfoStudentHp==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyInfoStudentHp); + } + + /** + * 导出excel + * + * @param request + * @param zyInfoStudentHp + */ + @RequiresPermissions("zyInfoStudentHp:zy_info_student_hp:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyInfoStudentHp zyInfoStudentHp) { + return super.exportXls(request, zyInfoStudentHp, ZyInfoStudentHp.class, "学生成绩互评"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("zyInfoStudentHp:zy_info_student_hp:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyInfoStudentHp.class); + } + + + @AutoLog(value = "学生成绩第一次互评-添加") + @ApiOperation(value="学生成绩第一次互评-添加", notes="学生成绩第一次互评-添加") + @PostMapping(value = "/saveOne") + public Result saveOne(@RequestBody ZyInfoStudentHp zyInfoStudentHp) { + + String zyStuId = zyInfoStudentHp.getZyStuId(); + if(StringUtils.isNotEmpty(zyStuId)){ + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zyInfoStudentHpQueryWrapper = new QueryWrapper<>(); + zyInfoStudentHpQueryWrapper.eq("zy_stu_id",zyStuId); + zyInfoStudentHpQueryWrapper.eq("stu_id",sysUser.getUsername()); + zyInfoStudentHpQueryWrapper.eq("ver_type","1"); + List list = zyInfoStudentHpService.list(zyInfoStudentHpQueryWrapper); + if(list.size()>0){ + return Result.error("您已经互评过此作业，不可重复互评"); + }else{ + zyInfoStudentHp.setVerType("1"); + zyInfoStudentHp.setStuId(sysUser.getUsername()); + zyInfoStudentHp.setStuName(sysUser.getRealname()); + zyInfoStudentHpService.save(zyInfoStudentHp); + return Result.OK("互评成功！"); + } + }else{ + return Result.error("互评失败！"); + } + + } + + @AutoLog(value = "学生成绩第二次互评-添加") + @ApiOperation(value="学生成绩第二次互评-添加", notes="学生成绩第二次互评-添加") + @PostMapping(value = "/saveTwo") + public Result saveTwo(@RequestBody ZyInfoStudentHp zyInfoStudentHp) { + String zyStuId = zyInfoStudentHp.getZyStuId(); + if(StringUtils.isNotEmpty(zyStuId)){ + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zyInfoStudentHpQueryWrapper = new QueryWrapper<>(); + zyInfoStudentHpQueryWrapper.eq("zy_stu_id",zyStuId); + zyInfoStudentHpQueryWrapper.eq("stu_id",sysUser.getUsername()); + zyInfoStudentHpQueryWrapper.eq("ver_type","2"); + List list = zyInfoStudentHpService.list(zyInfoStudentHpQueryWrapper); + if(list.size()>0){ + return Result.error("您已经互评过此作业，不可重复互评"); + }else{ + zyInfoStudentHp.setVerType("2"); + zyInfoStudentHp.setStuId(sysUser.getUsername()); + zyInfoStudentHp.setStuName(sysUser.getRealname()); + zyInfoStudentHpService.save(zyInfoStudentHp); + return Result.OK("互评成功！"); + } + }else{ + return Result.error("互评失败！"); + } + } + + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/entity/ZyInfoStudentHp.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/entity/ZyInfoStudentHp.java new file mode 100644 index 00000000..7ba7859c --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/entity/ZyInfoStudentHp.java @@ -0,0 +1,83 @@ +package org.jeecg.modules.kc.zyInfoStudentHp.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-07-29 + * @Version: V1.0 + */ +@Data +@TableName("zy_info_student_hp") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_info_student_hp对象", description="学生成绩互评") +public class ZyInfoStudentHp 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; + /**作业id*/ + @Excel(name = "作业id", width = 15) + @ApiModelProperty(value = "作业id") + private java.lang.String zyStuId; + /**学生id*/ + @Excel(name = "学生id", width = 15) + @ApiModelProperty(value = "学生id") + private java.lang.String stuId; + /**评分*/ + @Excel(name = "评分", width = 15) + @ApiModelProperty(value = "评分") + private java.lang.String stuScore; + /**第几次*/ + @Excel(name = "第几次", width = 15) + @ApiModelProperty(value = "第几次") + private java.lang.String verType; + /**学生姓名*/ + @Excel(name = "学生姓名", width = 15) + @ApiModelProperty(value = "学生姓名") + private java.lang.String stuName; + /**是否采纳*/ + @Excel(name = "是否采纳", width = 15) + @ApiModelProperty(value = "是否采纳") + private java.lang.String sfcn; + /**作业主id*/ + @Excel(name = "作业主id", width = 15) + @ApiModelProperty(value = "作业主id") + private java.lang.String mainId; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/ZyInfoStudentHpMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/ZyInfoStudentHpMapper.java new file mode 100644 index 00000000..7db78939 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/ZyInfoStudentHpMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.zyInfoStudentHp.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.zyInfoStudentHp.entity.ZyInfoStudentHp; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学生成绩互评 + * @Author: jeecg-boot + * @Date: 2024-07-29 + * @Version: V1.0 + */ +public interface ZyInfoStudentHpMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/xml/ZyInfoStudentHpMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/xml/ZyInfoStudentHpMapper.xml new file mode 100644 index 00000000..8f857158 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/mapper/xml/ZyInfoStudentHpMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/IZyInfoStudentHpService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/IZyInfoStudentHpService.java new file mode 100644 index 00000000..c57c23d4 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/IZyInfoStudentHpService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.zyInfoStudentHp.service; + +import org.jeecg.modules.kc.zyInfoStudentHp.entity.ZyInfoStudentHp; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学生成绩互评 + * @Author: jeecg-boot + * @Date: 2024-07-29 + * @Version: V1.0 + */ +public interface IZyInfoStudentHpService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/impl/ZyInfoStudentHpServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/impl/ZyInfoStudentHpServiceImpl.java new file mode 100644 index 00000000..a714b26f --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudentHp/service/impl/ZyInfoStudentHpServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.zyInfoStudentHp.service.impl; + +import org.jeecg.modules.kc.zyInfoStudentHp.entity.ZyInfoStudentHp; +import org.jeecg.modules.kc.zyInfoStudentHp.mapper.ZyInfoStudentHpMapper; +import org.jeecg.modules.kc.zyInfoStudentHp.service.IZyInfoStudentHpService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学生成绩互评 + * @Author: jeecg-boot + * @Date: 2024-07-29 + * @Version: V1.0 + */ +@Service +public class ZyInfoStudentHpServiceImpl extends ServiceImpl implements IZyInfoStudentHpService { + +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index ef3413e8..8d42cf21 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -178,8 +178,8 @@ jeecg: # 签名拦截接口 signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys #local、minio、alioss -# uploadType: local - uploadType: sftp + uploadType: local +# uploadType: sftp # 前端访问地址 domainUrl: pc: http://localhost:3100 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 95b078dc..661330a2 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -175,8 +175,8 @@ jeecg: # 签名拦截接口 signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys #local\minio\alioss -# uploadType: local - uploadType: sftp + uploadType: local +# uploadType: sftp # 前端访问地址 domainUrl: pc: http://210.47.17.166 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties index 97be91de..2929a375 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties @@ -1,7 +1,7 @@ #code_generate_project_path project_path=E:\\workspace\\jeecg-boot #bussi_package[User defined] -bussi_package=org.jeecg.modules.business +bussi_package=org.jeecg.modules.kc #default code path