添加新功能
This commit is contained in:
parent
6a8a22623b
commit
8d41672e4f
|
@ -71,12 +71,14 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
@Autowired
|
||||
private ZyInfoStudentMapper zyInfoStudentService;
|
||||
|
||||
@Autowired
|
||||
private IZyInfoStudentService zyInfoNewStudentService;
|
||||
|
||||
|
||||
@Override
|
||||
public void getCcjg() {
|
||||
QueryWrapper<ZyCcjg> zyCcjgQueryWrapper = new QueryWrapper<>();
|
||||
zyCcjgQueryWrapper.in("filestateid",0,1,2);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测)
|
||||
zyCcjgQueryWrapper.in("filestateid",0,1);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测)
|
||||
List<ZyCcjg> list = baseMapper.selectList(zyCcjgQueryWrapper);
|
||||
for(ZyCcjg par : list){
|
||||
//查重类型(0外网 1内网 2aigc 3校内)
|
||||
|
@ -118,7 +120,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
public void deleteByZystuid(String id, HttpServletResponse response) {
|
||||
ZyInfoStudent zyInfoStudent = zyInfoStudentService.selectById(id);
|
||||
//删除维普已经提交的文档
|
||||
zyInfoStudentService.delweipulunwen(zyInfoStudent, response);
|
||||
// zyInfoNewStudentService.delweipulunwen(zyInfoStudent, response);
|
||||
baseMapper.deleteByZystuid(id);
|
||||
}
|
||||
|
||||
|
|
|
@ -141,7 +141,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
QueryWrapper<ZyInfo> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap());
|
||||
Page<ZyInfo> page = new Page<ZyInfo>(pageNo, pageSize);
|
||||
queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano());
|
||||
queryWrapper.orderByAsc("a.sort");
|
||||
queryWrapper.orderByAsc("a.sort - 0");
|
||||
IPage<ZyInfo> pageList = zyInfoService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
@ -282,7 +282,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
||||
zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy());
|
||||
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
||||
zyInfoQueryWrapper.orderByAsc("sort");
|
||||
zyInfoQueryWrapper.orderByAsc("sort-0");
|
||||
List<ZyInfo> list = zyInfoService.list(zyInfoQueryWrapper);
|
||||
for(int i=0;i<list.size();i++){
|
||||
ZyInfo zyInfoPar = list.get(i);
|
||||
|
@ -502,6 +502,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
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());
|
||||
|
|
|
@ -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否)
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -124,6 +124,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
// //查询作业查重结果
|
||||
// zyCcjgService.getCcjg();
|
||||
|
||||
|
||||
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap());
|
||||
Page<ZyInfoStudent> page = new Page<ZyInfoStudent>(pageNo, pageSize);
|
||||
|
||||
|
@ -327,8 +328,35 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, ZyInfoStudent zyInfoStudent) {
|
||||
return super.exportXls(request, zyInfoStudent, ZyInfoStudent.class, "学生提交作业");
|
||||
return exportXls(request, zyInfoStudent, ZyInfoStudent.class, "学生提交作业");
|
||||
}
|
||||
protected ModelAndView exportXls(HttpServletRequest request, ZyInfoStudent object, Class<ZyInfoStudent> clazz, String title) {
|
||||
// Step.1 组装查询条件
|
||||
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
// 过滤选中数据
|
||||
String selections = request.getParameter("selections");
|
||||
if (oConvertUtils.isNotEmpty(selections)) {
|
||||
List<String> selectionList = Arrays.asList(selections.split(","));
|
||||
queryWrapper.in("a.id",selectionList);
|
||||
}
|
||||
// Step.2 获取导出数据
|
||||
List<ZyInfoStudent> 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<ZyInfoStudent, IZyI
|
|||
zyInfoStudentService.update(updateWrapper);
|
||||
|
||||
//查重前删除原来的查重数据
|
||||
zyCcjgService.deleteByZystuid(zyInfoStudent.getId(),response);
|
||||
return Result.OK("编辑成功!");
|
||||
// zyCcjgService.deleteByZystuid(zyInfoStudent.getId(),response);
|
||||
return Result.OK("作业驳回成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "设置作业存档类型")
|
||||
|
@ -567,4 +595,40 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
|
||||
return mv;
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value="获取互评作业信息", notes="获取互评作业信息")
|
||||
@GetMapping(value = "/getHpxxList")
|
||||
public Result<IPage<ZyInfoStudent>> getHpxxList(ZyInfoStudent zyInfoStudent,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
|
||||
// //查询作业查重结果
|
||||
// zyCcjgService.getCcjg();
|
||||
|
||||
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap());
|
||||
Page<ZyInfoStudent> page = new Page<ZyInfoStudent>(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<ZyInfoStudent> pageList = zyInfoStudentService.getHpxxList(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;//作业名称
|
||||
|
||||
}
|
||||
|
|
|
@ -36,4 +36,6 @@ public interface ZyInfoStudentMapper extends BaseMapper<ZyInfoStudent> {
|
|||
Map<String, String> getXfwWpFile(ZyInfoStudent zyInfoStudent);
|
||||
|
||||
void delweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response);
|
||||
|
||||
IPage<ZyInfoStudent> getHpxxList(Page<ZyInfoStudent> page, @Param(Constants.WRAPPER) QueryWrapper<ZyInfoStudent> queryWrapper);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
</select>
|
||||
<select id="getHpxxList" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||
select a.*,if(c.id is null ,'0','1') as sfpf,b.title as zytitle from zy_info_student a
|
||||
inner join zy_info b on a.main_id = b.id
|
||||
LEFT JOIN zy_info_student_hp c on a.id = c.zy_stu_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
|
@ -38,4 +38,6 @@ public interface IZyInfoStudentService extends IService<ZyInfoStudent> {
|
|||
List<ZyInfoStudentSys> exportSysXls(QueryWrapper<ZyInfoStudentSys> queryWrapper, ZyInfoStudentSys zyInfoStudentSys);
|
||||
|
||||
boolean stuWpKsjc(ZyInfoStudent zyInfoStudent, HttpServletResponse response);
|
||||
|
||||
IPage<ZyInfoStudent> getHpxxList(Page<ZyInfoStudent> page, QueryWrapper<ZyInfoStudent> queryWrapper);
|
||||
}
|
||||
|
|
|
@ -189,6 +189,11 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<ZyInfoStudent> getHpxxList(Page<ZyInfoStudent> page, QueryWrapper<ZyInfoStudent> 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<ZyInfoStudentMapper, Z
|
|||
String url = "https://vims.fanyu.com/tool/AIGCCheck/paperDel";
|
||||
delWpFile(url,paperids2, response);
|
||||
}
|
||||
zyCcjgMapper.deleteByZystuid(zyInfoStudent.getId());
|
||||
}
|
||||
|
||||
//aigc提交
|
||||
|
|
|
@ -0,0 +1,239 @@
|
|||
package org.jeecg.modules.kc.zyInfoStudentHp.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 com.baomidou.mybatisplus.core.toolkit.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.kc.zyInfo.entity.ZyInfo;
|
||||
import org.jeecg.modules.kc.zyInfo.service.IZyInfoService;
|
||||
import org.jeecg.modules.kc.zyInfoStudentHp.entity.ZyInfoStudentHp;
|
||||
import org.jeecg.modules.kc.zyInfoStudentHp.service.IZyInfoStudentHpService;
|
||||
|
||||
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-07-29
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="学生成绩互评")
|
||||
@RestController
|
||||
@RequestMapping("/zyInfoStudentHp/zyInfoStudentHp")
|
||||
@Slf4j
|
||||
public class ZyInfoStudentHpController extends JeecgController<ZyInfoStudentHp, IZyInfoStudentHpService> {
|
||||
@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<IPage<ZyInfoStudentHp>> queryPageList(ZyInfoStudentHp zyInfoStudentHp,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<ZyInfoStudentHp> queryWrapper = QueryGenerator.initQueryWrapper(zyInfoStudentHp, req.getParameterMap());
|
||||
Page<ZyInfoStudentHp> page = new Page<ZyInfoStudentHp>(pageNo, pageSize);
|
||||
IPage<ZyInfoStudentHp> pageList = zyInfoStudentHpService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param zyInfoStudentHp
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "学生成绩互评-添加")
|
||||
@ApiOperation(value="学生成绩互评-添加", notes="学生成绩互评-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> 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<String> 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<String> 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<String> 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<ZyInfoStudentHp> 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<String> saveOne(@RequestBody ZyInfoStudentHp zyInfoStudentHp) {
|
||||
|
||||
String zyStuId = zyInfoStudentHp.getZyStuId();
|
||||
if(StringUtils.isNotEmpty(zyStuId)){
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
QueryWrapper<ZyInfoStudentHp> zyInfoStudentHpQueryWrapper = new QueryWrapper<>();
|
||||
zyInfoStudentHpQueryWrapper.eq("zy_stu_id",zyStuId);
|
||||
zyInfoStudentHpQueryWrapper.eq("stu_id",sysUser.getUsername());
|
||||
zyInfoStudentHpQueryWrapper.eq("ver_type","1");
|
||||
List<ZyInfoStudentHp> 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<String> saveTwo(@RequestBody ZyInfoStudentHp zyInfoStudentHp) {
|
||||
String zyStuId = zyInfoStudentHp.getZyStuId();
|
||||
if(StringUtils.isNotEmpty(zyStuId)){
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
QueryWrapper<ZyInfoStudentHp> zyInfoStudentHpQueryWrapper = new QueryWrapper<>();
|
||||
zyInfoStudentHpQueryWrapper.eq("zy_stu_id",zyStuId);
|
||||
zyInfoStudentHpQueryWrapper.eq("stu_id",sysUser.getUsername());
|
||||
zyInfoStudentHpQueryWrapper.eq("ver_type","2");
|
||||
List<ZyInfoStudentHp> 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("互评失败!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -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;
|
||||
}
|
|
@ -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<ZyInfoStudentHp> {
|
||||
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.kc.zyInfoStudentHp.mapper.ZyInfoStudentHpMapper">
|
||||
|
||||
</mapper>
|
|
@ -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<ZyInfoStudentHp> {
|
||||
|
||||
}
|
|
@ -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<ZyInfoStudentHpMapper, ZyInfoStudentHp> implements IZyInfoStudentHpService {
|
||||
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue