添加新流程
This commit is contained in:
parent
a891f63bb9
commit
f9606da954
|
@ -145,7 +145,7 @@ public class ZyInfo implements Serializable {
|
|||
private java.lang.String xssfck;//学生是否查看(1是 0否)
|
||||
private java.lang.String hpsfwcone;//第1次互评是否完成(1是 0否)
|
||||
private java.lang.String hpsfwctwo;//第2次互评是否完成(1是 0否)
|
||||
|
||||
private String sfcc;//是否查重(0不查重 1查重)
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
|
@ -205,5 +205,9 @@ public class ZyInfo implements Serializable {
|
|||
private String zyzb;
|
||||
@TableField(exist = false)
|
||||
private String scoreFabu;
|
||||
@TableField(exist = false)
|
||||
private String pyContent;
|
||||
@TableField(exist = false)
|
||||
private String pyFilePath;
|
||||
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<select id="stuList" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfo">
|
||||
select a.*,b.id as stuId ,b.file_path as stuFilePath,b.score as stuscore,b.wwxsl,b.nwxsl,b.aigcxsl,b.xnxsl,b.pdf_path as stuPdfPath,b.zzdf,b.xshpfs,
|
||||
b.wwsftg,b.nwsftg,b.aigcsftg,b.xnsftg,round(ifnull(b.jxfs,'0') + ifnull(b.jxfs2,'0'),1) as jxfs, GREATEST(ifnull(b.wwxsl,0),ifnull(b.nwxsl,0),ifnull(b.aigcxsl,0),ifnull(b.xnxsl,0)) as zgccl,a.score as zyzb,b.score_fabu
|
||||
b.wwsftg,b.nwsftg,b.aigcsftg,b.xnsftg,round(ifnull(b.jxfs,'0') + ifnull(b.jxfs2,'0'),1) as jxfs, GREATEST(ifnull(b.wwxsl,0),ifnull(b.nwxsl,0),ifnull(b.aigcxsl,0),ifnull(b.xnxsl,0)) as zgccl,a.score as zyzb,b.score_fabu,b.py_content,b.py_file_path
|
||||
from zy_info a ,zy_info_student b
|
||||
${ew.customSqlSegment}
|
||||
|
||||
|
|
|
@ -483,7 +483,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
String nameLast = zyInfoStudent.getFilePath().substring(zyInfoStudent.getFilePath().lastIndexOf(".")+1);
|
||||
if(StringUtils.equals("pdf",nameLast)){
|
||||
zyInfoStudent.setPdfPath(zyInfoStudent.getFilePath());
|
||||
}else{
|
||||
}else if(StringUtils.equals("doc",nameLast) || StringUtils.equals("docx",nameLast)){
|
||||
if(StringUtils.equals("local",uploadType)){
|
||||
Global global = SpringContextHolder.getBean(Global.class);
|
||||
FileUtil.mkdir(global.getContractDickPath());
|
||||
|
@ -792,4 +792,16 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
IPage<ZyInfoStudent> pageList = zyInfoStudentService.getHpxxList(page, queryWrapper,user.getUsername());
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@AutoLog(value = "教师批阅作业")
|
||||
@ApiOperation(value="教师批阅作业", notes="教师批阅作业")
|
||||
@RequestMapping(value = "/editPiyue", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<ZyInfoStudent> editPiyue(@RequestBody ZyInfoStudent zyInfoStudent) {
|
||||
zyInfoStudentService.updateById(zyInfoStudent);
|
||||
return Result.OK("批阅完成!");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -123,6 +123,10 @@ public class ZyInfoStudent implements Serializable {
|
|||
private String hpcs;
|
||||
private String jxfs2;
|
||||
private String zyLeixing;//作业类型 0课程作业 1期末作业
|
||||
private String pyContent;//批阅内容
|
||||
private String pyFilePath;//批阅附件
|
||||
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String jxzf;
|
||||
|
|
Loading…
Reference in New Issue