From 6a8a22623b1f51c758f7b873bbb65fb0a6b877bb Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 27 Jul 2024 16:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 19 +-- .../KcTeachingUnitContentOneController.java | 9 ++ .../entity/KcTeachingUnitContentOne.java | 2 + .../KcTeachingUnitContentOneMapper.java | 1 + .../xml/KcTeachingUnitContentOneMapper.xml | 18 +++ .../IKcTeachingUnitContentOneService.java | 2 + .../KcTeachingUnitContentOneServiceImpl.java | 5 + .../zyCcjg/controller/ZyCcjgController.java | 8 ++ .../modules/kc/zyCcjg/entity/ZyCcjg.java | 3 + .../kc/zyCcjg/mapper/ZyCcjgMapper.java | 2 + .../kc/zyCcjg/mapper/xml/ZyCcjgMapper.xml | 19 +++ .../kc/zyCcjg/service/IZyCcjgService.java | 7 +- .../service/impl/ZyCcjgServiceImpl.java | 27 +++-- .../kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml | 2 +- .../zyInfo/controller/ZyInfoController.java | 113 ++++++++++++++++-- .../modules/kc/zyInfo/entity/ZyInfo.java | 1 - .../controller/ZyInfoStudentController.java | 5 +- .../zyInfoStudent/entity/ZyInfoStudent.java | 5 + .../mapper/ZyInfoStudentMapper.java | 3 + .../mapper/xml/ZyInfoStudentMapper.xml | 7 +- .../impl/ZyInfoStudentServiceImpl.java | 68 ++++++----- 21 files changed, 262 insertions(+), 64 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index 04ee9b7e..ac6917d0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -143,7 +143,6 @@ kcbh, kcmc, xf, - jkzc, kkdw, kcxz, szkc, @@ -178,13 +177,17 @@ ${ew.customSqlSegment} ) t GROUP BY - kcbh, - kcmc, - kkdw, - kcxz, - szkc, - xqxn, - rwbh + kcbh, + kcmc, + xf, + kkdw, + kcxz, + szkc, + xqxn, + rwbh, + skdd, + xkrs, + jgh ORDER BY xqxn desc diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java index be08abb0..3e9ddfe2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java @@ -272,4 +272,13 @@ public class KcTeachingUnitContentOneController extends JeecgController> getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne) { + List pageList = kcTeachingUnitContentOneService.getAllList(kcTeachingUnitContentOne); + return Result.OK(pageList); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java index dfb5a861..a86d4f4c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/entity/KcTeachingUnitContentOne.java @@ -75,4 +75,6 @@ public class KcTeachingUnitContentOne implements Serializable { private List childrenList; @TableField(exist = false) private String teano; + @TableField(exist = false) + private String twoTitle; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/KcTeachingUnitContentOneMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/KcTeachingUnitContentOneMapper.java index 206f6fdd..c97e1a68 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/KcTeachingUnitContentOneMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/KcTeachingUnitContentOneMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface KcTeachingUnitContentOneMapper extends BaseMapper { + List getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/xml/KcTeachingUnitContentOneMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/xml/KcTeachingUnitContentOneMapper.xml index c44da787..2d557808 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/xml/KcTeachingUnitContentOneMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/mapper/xml/KcTeachingUnitContentOneMapper.xml @@ -2,4 +2,22 @@ + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/IKcTeachingUnitContentOneService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/IKcTeachingUnitContentOneService.java index cf16abb6..8ce547bb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/IKcTeachingUnitContentOneService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/IKcTeachingUnitContentOneService.java @@ -17,4 +17,6 @@ public interface IKcTeachingUnitContentOneService extends IService getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/impl/KcTeachingUnitContentOneServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/impl/KcTeachingUnitContentOneServiceImpl.java index cf98de8d..96d92933 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/impl/KcTeachingUnitContentOneServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/service/impl/KcTeachingUnitContentOneServiceImpl.java @@ -96,4 +96,9 @@ public class KcTeachingUnitContentOneServiceImpl extends ServiceImpl getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne) { + return baseMapper.getAllList(kcTeachingUnitContentOne); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java index 97feb147..72bb08e1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java @@ -203,4 +203,12 @@ public class ZyCcjgController extends JeecgController { return super.importExcel(request, response, ZyCcjg.class); } + @ApiOperation(value="查重结果-分页列表查询", notes="查重结果-分页列表查询") + @GetMapping(value = "/ccjglist") + public Result> ccjglist(ZyCcjg zyCcjg, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyCcjg, req.getParameterMap()); + List pageList = zyCcjgService.ccjglist(queryWrapper); + return Result.OK(pageList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/entity/ZyCcjg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/entity/ZyCcjg.java index 92a3966a..ef062a9e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/entity/ZyCcjg.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/entity/ZyCcjg.java @@ -158,6 +158,9 @@ public class ZyCcjg implements Serializable { private String stuNo; @TableField(exist = false) private String stuName; + @TableField(exist = false) + private String bdkname; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/ZyCcjgMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/ZyCcjgMapper.java index 88efdc6d..b00ae78a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/ZyCcjgMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/ZyCcjgMapper.java @@ -21,4 +21,6 @@ public interface ZyCcjgMapper extends BaseMapper { IPage getQuaList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); void deleteByZystuid(@Param("zyStuId") String zyStuId); + + List ccjglist(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/xml/ZyCcjgMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/xml/ZyCcjgMapper.xml index b138a5b4..f919e139 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/xml/ZyCcjgMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/mapper/xml/ZyCcjgMapper.xml @@ -18,5 +18,24 @@ zy_stu_id = #{zyStuId} + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/IZyCcjgService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/IZyCcjgService.java index 3f28e42e..5a3aefe9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/IZyCcjgService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/IZyCcjgService.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.zyCcjg.entity.ZyCcjg; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * @Description: 查重结果 * @Author: jeecg-boot @@ -18,5 +21,7 @@ public interface IZyCcjgService extends IService { IPage getQuaList(Page page, QueryWrapper queryWrapper); - void deleteByZystuid(String id); + void deleteByZystuid(String id, HttpServletResponse response); + + List ccjglist(QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java index 8a961d82..00823547 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.activation.MimetypesFileTypeMap; +import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; @@ -38,6 +39,8 @@ import java.util.*; @Service public class ZyCcjgServiceImpl extends ServiceImpl implements IZyCcjgService { + + private static String uploadpath; @Value("${jeecg.path.upload}") @@ -73,7 +76,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme @Override public void getCcjg() { QueryWrapper zyCcjgQueryWrapper = new QueryWrapper<>(); - zyCcjgQueryWrapper.in("filestateid",0,1,3);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测) + zyCcjgQueryWrapper.in("filestateid",0,1,2);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测) List list = baseMapper.selectList(zyCcjgQueryWrapper); for(ZyCcjg par : list){ //查重类型（0外网 1内网 2aigc 3校内） @@ -112,10 +115,18 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme } @Override - public void deleteByZystuid(String id) { + public void deleteByZystuid(String id, HttpServletResponse response) { + ZyInfoStudent zyInfoStudent = zyInfoStudentService.selectById(id); + //删除维普已经提交的文档 + zyInfoStudentService.delweipulunwen(zyInfoStudent, response); baseMapper.deleteByZystuid(id); } + @Override + public List ccjglist(QueryWrapper queryWrapper) { + return baseMapper.ccjglist(queryWrapper); + } + public Map aigcCxjcjg(ZyCcjg zyCcjg) { String url = "https://vims.fanyu.com/tool/AIGCCheck/searchPaper"; @@ -172,8 +183,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme if(StringUtils.equals("2",object2.getString("filestateid"))){ ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); Double tgl = 0.0; - if(zyInfo.getAigctgl()>0){ - tgl = zyInfo.getAigctgl(); + if(zyInfo.getWwtgl()>0){ + tgl = zyInfo.getWwtgl(); } Double cctgl = 0.0; if(StringUtils.isNotEmpty(object2.getString("aiRate"))){ @@ -370,8 +381,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme if(StringUtils.equals("2",object2.getString("filestateid"))) { ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); Double tgl = 0.0; - if (zyInfo.getNwtgl() > 0) { - tgl = zyInfo.getNwtgl(); + if (zyInfo.getWwtgl() > 0) { + tgl = zyInfo.getWwtgl(); } Double cctgl = 0.0; if (StringUtils.isNotEmpty(object2.getString("percentage"))) { @@ -469,8 +480,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme if(StringUtils.equals("2",object2.getString("filestateid"))) { ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); Double tgl = 0.0; - if (zyInfo.getNwtgl() > 0) { - tgl = zyInfo.getNwtgl(); + if (zyInfo.getWwtgl() > 0) { + tgl = zyInfo.getWwtgl(); } Double cctgl = 0.0; if (StringUtils.isNotEmpty(object2.getString("percentage"))) { diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml index 452b6a6c..dc16160f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/mapper/xml/ZyDbtxMapper.xml @@ -3,6 +3,6 @@ \ No newline at end of file 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 c0d93764..82440677 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 @@ -41,9 +41,11 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.stream.Collectors; - /** +/** * @Description: 作业发布 * @Author: jeecg-boot * @Date: 2024-05-06 @@ -93,9 +95,53 @@ public class ZyInfoController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + + + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("create_by",zyInfo.getTeano()); + queryWrapper2.eq("rwbh",zyInfo.getRwbh()); + queryWrapper2.eq("xnxq",zyInfo.getXnxq()); + queryWrapper2.eq("zy_status","0"); + queryWrapper2.le("start_time",new Date()); + List list2 = zyInfoService.list(queryWrapper2); + for(ZyInfo par:list2){ + par.setZyStatus("1"); + zyInfoService.updateById(par); + + if(par!=null) { + ZyInfo zyInfo2 = zyInfoService.getKechengById(par.getId()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.apply("a.xh = b.xh"); + queryWrapper.eq("b.KCAPZBBH",zyInfo2.getRwbh()); + List list = xxhbbksService.getXsxkbAllList(queryWrapper); + zyInfoStudentService.deleteMainId(zyInfo2.getId()); + for(Xxhbbks xxhbbks:list){ + ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); + zyInfoStudent.setMainId(zyInfo2.getId()); + zyInfoStudent.setCreateBy(xxhbbks.getXh()); + zyInfoStudent.setStudentName(xxhbbks.getXm()); + zyInfoStudentService.save(zyInfoStudent); + + //作业代办提醒 + ZyDbtx zyDbtx = new ZyDbtx(); + zyDbtx.setCreateBy(xxhbbks.getXh()); + zyDbtx.setType("0");//0发布作业 1评分 2测验 3问卷 4讨论 + zyDbtx.setMainId(zyInfo2.getId()); + zyDbtx.setRwbh(zyInfo2.getRwbh()); + zyDbtx.setContent(" ["+zyInfo2.getKcmc()+"] "+zyInfo2.getSkjs()+" 发布了一篇作业，请及时完成！"); + zyDbtx.setFlag("0"); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + zyDbtx.setFbr(user.getUsername()); + zyDbtxService.save(zyDbtx); + + } + } + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano()); + queryWrapper.orderByAsc("a.sort"); IPage pageList = zyInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -122,7 +168,40 @@ public class ZyInfoController extends JeecgController { zyInfoService.save(zyInfo); return Result.OK("添加成功！"); } - + + /** + * 添加 + * + * @param zyInfo + * @return + */ + @AutoLog(value = "作业发布-添加") + @ApiOperation(value="作业发布-添加", notes="作业发布-添加") + @PostMapping(value = "/addOne") + public Result addOne(@RequestBody ZyInfo zyInfo) { + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + kcKechengbiaoQueryWrapper.last("limit 1"); + KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); + + + QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); + zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq()); + zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano()); + zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + List list = zyInfoService.list(zyInfoQueryWrapper); + + zyInfo.setSort(list.size()+1); + zyInfo.setXnxq(kcSysConfig.getFlag1()); + zyInfo.setZyStatus("0"); + zyInfo.setXkxs(kcKechengbiao.getXkrs()); + zyInfo.setScore("0"); + zyInfoService.save(zyInfo); + return Result.OK("添加成功！"); + } + /** * 编辑 * @@ -147,6 +226,7 @@ public class ZyInfoController extends JeecgController { @ApiOperation(value="作业发布-发布", notes="作业发布-发布") @RequestMapping(value = "/release", method = {RequestMethod.PUT,RequestMethod.POST}) public Result release(@RequestBody ZyInfo zyInfo) { + zyInfo.setStartTime(new Date()); zyInfoService.updateById(zyInfo); return Result.OK("发布成功!"); } @@ -196,7 +276,19 @@ public class ZyInfoController extends JeecgController { @ApiOperation(value="作业发布-通过id删除", notes="作业发布-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { + ZyInfo zyInfo = zyInfoService.getById(id); zyInfoService.removeById(id); + QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); + zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy()); + zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq()); + zyInfoQueryWrapper.orderByAsc("sort"); + List list = zyInfoService.list(zyInfoQueryWrapper); + for(int i=0;i { QueryWrapper query = new QueryWrapper<>(); query.eq("rwbh", zyInfo.getRwbh()); query.eq("create_by",zyInfo.getCreateBy()); + List oldList = zyInfoService.list(query); zyInfoService.remove(query); KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); @@ -405,11 +498,17 @@ public class ZyInfoController extends JeecgController { KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); for(int i = 0; i < list.size(); i++) { ZyInfo par = list.get(i); - par.setXnxq(kcSysConfig.getFlag1()); - par.setZyStatus("0"); - par.setXkxs(kcKechengbiao.getXkrs()); - zyInfoService.save(par); - + List zyInfo1 = oldList.stream().filter(zyInfo2 -> zyInfo2.getId().equals(par.getId())).collect(Collectors.toList()); + if(zyInfo1!=null && zyInfo1.size()>0){ + ZyInfo zypar = zyInfo1.get(0); + zypar.setSort(par.getSort()); + zyInfoService.save(zypar); + }else{ + par.setXnxq(kcSysConfig.getFlag1()); + par.setZyStatus("0"); + par.setXkxs(kcKechengbiao.getXkrs()); + zyInfoService.save(par); + } } return Result.OK("添加成功！"); } 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 386cdee5..aa81fcd5 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 @@ -182,5 +182,4 @@ public class ZyInfo implements Serializable { @TableField(exist = false) private String xnsftg; - } 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 95f663b8..492a55aa 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 @@ -138,7 +138,6 @@ public class ZyInfoStudentController extends JeecgController pageList = zyInfoStudentService.page(page, queryWrapper); for(ZyInfoStudent ZyInfoStudentPar:pageList.getRecords()){ List list = zyInfoStudentService.getCcjg(ZyInfoStudentPar); @@ -416,7 +415,7 @@ public class ZyInfoStudentController extends JeecgController editBohui(@RequestBody ZyInfoStudent zyInfoStudent) { + public Result editBohui(@RequestBody ZyInfoStudent zyInfoStudent, HttpServletResponse response) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("file_path",null); updateWrapper.set("pdf_path",null); @@ -432,7 +431,7 @@ public class ZyInfoStudentController extends JeecgController { String getWpFile(ZyInfoStudent zyInfoStudent); Map getXfwWpFile(ZyInfoStudent zyInfoStudent); + + void delweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response); } 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 1fad23d8..5fe98743 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 @@ -6,7 +6,8 @@ delete from zy_info_student where main_id = #{mainId} @@ -125,13 +126,13 @@ select GROUP_CONCAT(paperid) as paperid,bdkbs FROM zy_info_student a 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} + where a.main_id = #{mainId} and a.create_by = #{createBy} and b.cc_type = #{queryType} group by bdkbs \ No newline at end of file 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 2609ee28..d1c3d853 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 @@ -161,50 +161,23 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl paperids1 = baseMapper.getXfwWpFile(zyInfoStudent); - if(paperids1 != null){ - String dataids = paperids1.get("paperid"); - String bdkbs = paperids1.get("bdkbs"); - String url = "https://vims.fanyu.com/toole/smallcheck/delData"; - delXfwWpFile(url,bdkbs,dataids,response); - } - zyInfoStudent.setQueryType("3");//内网查重数据-全校内比对 - Map paperids3 = baseMapper.getXfwWpFile(zyInfoStudent); - if(paperids3 != null){ - String dataids = paperids3.get("paperid"); - String bdkbs = paperids3.get("bdkbs"); - String url = "https://vims.fanyu.com/toole/smallcheck/delData"; - delXfwWpFile(url,bdkbs,dataids,response); - } - zyInfoStudent.setQueryType("2");//aigc查重数据 - String paperids2 = baseMapper.getWpFile(zyInfoStudent); - if(StringUtils.isNotEmpty(paperids2)){ - String url = "https://vims.fanyu.com/tool/AIGCCheck/paperDel"; - delWpFile(url,paperids2,response); - } + delweipulunwen(zyInfoStudent, response); //外网查重及提交检测 - if(StringUtils.equals(zyInfo.getWwcc(),"1")){ + if(StringUtils.equals(zyInfo.getWwcc(),"true")){ wwccSave(zyInfoStudent,response); } //内网查重及提交检测 - if(StringUtils.equals(zyInfo.getNwcc(),"1")){ + if(StringUtils.equals(zyInfo.getNwcc(),"true")){ nwccSave(zyInfoStudent,response); } //aigc查重及提交检测 - if(StringUtils.equals(zyInfo.getAigccc(),"1")){ + if(StringUtils.equals(zyInfo.getAigccc(),"true")){ aigcSave(zyInfoStudent,response); } //校内查重及提交检测 - if(StringUtils.equals(zyInfo.getXncc(),"1")){ + if(StringUtils.equals(zyInfo.getXncc(),"true")){ zyInfoStudent.setCateid("DBSDQXZYBDK001"); zyInfoStudent.setCatename("东北师大全校作业比对库"); xnccSave(zyInfoStudent,"1",response);//提交比对 @@ -216,6 +189,37 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl paperids1 = baseMapper.getXfwWpFile(zyInfoStudent); + if(paperids1 != null){ + String dataids = paperids1.get("paperid"); + String bdkbs = paperids1.get("bdkbs"); + String url = "https://vims.fanyu.com/toole/smallcheck/delData"; + delXfwWpFile(url,bdkbs,dataids, response); + } + zyInfoStudent.setQueryType("3");//内网查重数据-全校内比对 + Map paperids3 = baseMapper.getXfwWpFile(zyInfoStudent); + if(paperids3 != null){ + String dataids = paperids3.get("paperid"); + String bdkbs = paperids3.get("bdkbs"); + String url = "https://vims.fanyu.com/toole/smallcheck/delData"; + delXfwWpFile(url,bdkbs,dataids, response); + } + zyInfoStudent.setQueryType("2");//aigc查重数据 + String paperids2 = baseMapper.getWpFile(zyInfoStudent); + if(StringUtils.isNotEmpty(paperids2)){ + String url = "https://vims.fanyu.com/tool/AIGCCheck/paperDel"; + delWpFile(url,paperids2, response); + } + } + //aigc提交 private void aigcSave(ZyInfoStudent zyInfoStudent,HttpServletResponse response) { String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit";