diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
index 90e9b97d..456cf0f1 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
@@ -98,7 +98,7 @@
             </if>
 
         </where>
-        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs
+        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh
 
     </select>
 
@@ -120,7 +120,7 @@
             </if>
 
         </where>
-        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs
+        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh
 
     </select>
 
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 911cff58..0837eb4a 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
@@ -746,8 +746,8 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
 
 	@ApiOperation(value="作业发布-通过id查询", notes="作业发布-通过id查询")
 	@GetMapping(value = "/zyzb")
-	public Result<ZyInfo> zyzb(@RequestParam(name="rwbh") String rwbh,@RequestParam(name="xqxn") String xqxn,@RequestParam(name="teano") String teano,@RequestParam(name="zyLeixing") String zyLeixing) {
-		ZyInfo zyInfo = zyInfoService.zyzb(rwbh,xqxn,teano,zyLeixing);
+	public Result<List<ZyInfo>> zyzb(@RequestParam(name="rwbh") String rwbh,@RequestParam(name="xqxn") String xqxn,@RequestParam(name="teano") String teano,@RequestParam(name="zyLeixing") String zyLeixing) {
+		List<ZyInfo> zyInfo = zyInfoService.zyzb(rwbh,xqxn,teano,zyLeixing);
 		return Result.OK(zyInfo);
 	}
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java
index 16a43416..772c5da7 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java
@@ -27,5 +27,5 @@ public interface ZyInfoMapper extends BaseMapper<ZyInfo> {
 
     ZyInfo getKechengById(@Param("id") String id);
 
-    ZyInfo zyzb(@Param("rwbh")String rwbh, @Param("xqxn")String xqxn, @Param("teano")String teano, @Param("zyLeixing")String zyLeixing);
+    List<ZyInfo> zyzb(@Param("rwbh")String rwbh, @Param("xqxn")String xqxn, @Param("teano")String teano, @Param("zyLeixing")String zyLeixing);
 }
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 35df65c3..0efb137e 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
@@ -36,7 +36,7 @@
             kc_kechengbiao
             ${ew.customSqlSegment}
         ) t on t.jgh = b.create_by and t.rwbh = b.rwbh and t.xqxn = b.xnxq
-        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs
+        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh
 
     </select>
 
@@ -52,7 +52,7 @@
         kc_kechengbiao
         ${ew.customSqlSegment}
         ) t on t.jgh = b.create_by and t.rwbh = b.rwbh and t.xqxn = b.xnxq
-        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs
+        GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh
 
     </select>
 
@@ -63,6 +63,29 @@
     </select>
 
     <select id="zyzb" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfo">
-        select sum(score) as score from zy_info where xnxq = #{xqxn} and rwbh = #{rwbh} and zy_leixing = #{zyLeixing}
+        SELECT
+        sum( ifnull( score, '0' ) ) AS score,
+        zy_leixing
+        FROM
+        zy_info
+        WHERE
+        xnxq = #{xqxn}
+        AND rwbh = #{rwbh}
+        GROUP BY
+        zy_leixing UNION ALL
+        SELECT
+        sum( ifnull( score, '0' ) ) AS score,
+        CASE
+        atype
+        WHEN '1' THEN
+        '2' ELSE '3'
+        END zy_leixing
+        FROM
+        wjx_wjxx
+        WHERE
+        xqxn = #{xqxn}
+        AND rwbh = #{rwbh}
+        GROUP BY
+        atype
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java
index d72fd889..577149ca 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java
@@ -25,5 +25,5 @@ public interface IZyInfoService extends IService<ZyInfo> {
 
     ZyInfo getKechengById(String id);
 
-    ZyInfo zyzb(String rwbh, String xqxn, String teano, String zyLeixing);
+    List<ZyInfo> zyzb(String rwbh, String xqxn, String teano, String zyLeixing);
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java
index 7283fd89..70de599f 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java
@@ -43,7 +43,7 @@ public class ZyInfoServiceImpl extends ServiceImpl<ZyInfoMapper, ZyInfo> impleme
     }
 
     @Override
-    public ZyInfo zyzb(String rwbh, String xqxn, String teano, String zyLeixing) {
+    public List<ZyInfo> zyzb(String rwbh, String xqxn, String teano, String zyLeixing) {
         return baseMapper.zyzb(rwbh,xqxn,teano,zyLeixing);
     }
 }
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 7afcce13..a6993de8 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
@@ -33,7 +33,7 @@
 
 
     <select id="sysList" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudentSys">
-        select distinct a.id,b.xnxq,t.kcmc,t.skjs,b.title,a.create_by as stuNo,c.xm as stuName,if(score is not null,'已评分',if(a.file_path is not null ,'已提交','未提交')) as status  ,a.publish_time,a.score,
+        select distinct a.id,b.xnxq,t.kcmc,t.skjs,b.title,a.create_by as stuNo,c.xm as stuName,if(a.score is not null,'已评分',if(a.file_path is not null ,'已提交','未提交')) as status  ,a.publish_time,a.score,
         wwxsl,nwxsl,aigcxsl,wwsftg,nwsftg,aigcsftg,xnxsl,xnsftg,a.file_path,a.pdf_path,b.wwcc,b.nwcc,b.aigccc,b.xncc
         from zy_info_student a
         inner join zy_info b on a.main_id = b.id
@@ -79,7 +79,7 @@
     </select>
 
     <select id="exportSysXls" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudentSys">
-        select distinct a.id,b.xnxq,t.kcmc,t.skjs,b.title,a.create_by as stuNo,c.xm as stuName,if(score is not null,'已评分',if(a.file_path is not null ,'已提交','未提交')) as status,a.publish_time,a.score,
+        select distinct a.id,b.xnxq,t.kcmc,t.skjs,b.title,a.create_by as stuNo,c.xm as stuName,if(a.score is not null,'已评分',if(a.file_path is not null ,'已提交','未提交')) as status,a.publish_time,a.score,
         wwxsl,nwxsl,aigcxsl,wwsftg,nwsftg,aigcsftg,xnxsl,xnsftg,b.wwcc,b.nwcc,b.aigccc,b.xncc
         from zy_info_student a
         inner join zy_info b on a.main_id = b.id