diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml
index adf358d2..58e38aac 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml
@@ -119,6 +119,12 @@
from wjx_wjxx a
inner join wjx_djxx b on a.vid = b.vid
where a.id = #{params.id}
+
+ and b.user_id like concat('%',#{params.userId},'%')
+
+
+ and b.user_name like concat('%',#{params.userName},'%')
+
order by b.user_id
@@ -132,6 +138,12 @@
) y
on y.KCAPZBBH = x.rwbh
WHERE x.id = #{params.id}
+
+ and y.xh like concat('%',#{params.userId},'%')
+
+
+ and y.xm like concat('%',#{params.userName},'%')
+
and y.xh not in(
select user_id from wjx_djxx c where c.vid = x.vid
)
@@ -149,6 +161,12 @@
on y.KCAPZBBH = a.rwbh
left join wjx_djxx b on a.vid = b.vid and y.xh = b.user_id
where a.id = #{params.id}
+
+ and y.xh like concat('%',#{params.userId},'%')
+
+
+ and y.xm like concat('%',#{params.userName},'%')
+
order by b.total_score desc
\ No newline at end of file
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 773166ec..c02998d4 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
@@ -112,6 +112,24 @@ public class ZyInfoStudentController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap());
Page page = new Page(pageNo, pageSize);
IPage pageList = zyInfoStudentService.page(page, queryWrapper);
+ for(ZyInfoStudent ZyInfoStudentPar:pageList.getRecords()){
+ List list = zyInfoStudentService.getCcjg(ZyInfoStudentPar);
+ for(ZyInfoStudent par:list){
+ if(StringUtils.equals(par.getCcType(),"0")){//外网
+ ZyInfoStudentPar.setWwpaperdownurl(par.getPaperdownurl());
+ ZyInfoStudentPar.setWwpaperviewurl(par.getPaperviewurl());
+ }else if(StringUtils.equals(par.getCcType(),"1")){//作业
+ ZyInfoStudentPar.setZypaperdownurl(par.getPaperdownurl());
+ ZyInfoStudentPar.setZypaperviewurl(par.getPaperviewurl());
+ }else if(StringUtils.equals(par.getCcType(),"2")){//aigc
+ ZyInfoStudentPar.setAigcpaperdownurl(par.getPaperdownurl());
+ ZyInfoStudentPar.setAigcpaperviewurl(par.getPaperviewurl());
+ }else if(StringUtils.equals(par.getCcType(),"3")){//学校
+ ZyInfoStudentPar.setXxpaperdownurl(par.getPaperdownurl());
+ ZyInfoStudentPar.setXxpaperviewurl(par.getPaperviewurl());
+ }
+ }
+ }
return Result.OK(pageList);
}
@@ -235,7 +253,6 @@ public class ZyInfoStudentController extends JeecgController {
void deleteMainId(@Param("mainId") String id);
IPage cdxxlist(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
+ List getCcjg(ZyInfoStudent zyInfoStudent);
}
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 a68077e5..7eca13a6 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
@@ -10,10 +10,28 @@
left join zy_info b on a.main_id = b.id
${ew.customSqlSegment}
+
+
+
+
\ 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 b3b1a25f..a6329543 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
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* @Description: 学生提交作业
* @Author: jeecg-boot
@@ -23,4 +25,6 @@ public interface IZyInfoStudentService extends IService {
void editFabu(ZyInfoStudent zyInfoStudent);
IPage cdxxlist(Page page, QueryWrapper queryWrapper);
+
+ List getCcjg(ZyInfoStudent zyInfoStudent);
}
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 5619e848..2cda6cb6 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
@@ -33,10 +33,7 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
/**
* @Description: 学生提交作业
@@ -131,6 +128,11 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl getCcjg(ZyInfoStudent zyInfoStudent) {
+ return baseMapper.getCcjg(zyInfoStudent);
+ }
+
//aigc提交
private void aigcSave(ZyInfoStudent zyInfoStudent) {
String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit";