From f9606da954cbeb02be5a02de04031dbf679c1d75 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 29 Aug 2024 13:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java |  6 +++++-
 .../modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml  |  2 +-
 .../controller/ZyInfoStudentController.java        | 14 +++++++++++++-
 .../kc/zyInfoStudent/entity/ZyInfoStudent.java     |  4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)

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 bcf05f4c..7d6003d5 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
@@ -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;
 
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
index 0efb137e..a4c06e96 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
@@ -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}
 
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 e7ad55f8..8d7718a3 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
@@ -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("批阅完成!");
+	 }
+
+
 }
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 5163a8b9..fafd8988 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
@@ -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;