添加新功能
This commit is contained in:
parent
5985767ba5
commit
6a8a22623b
|
@ -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
|
||||
</select>
|
||||
|
||||
|
|
|
@ -272,4 +272,13 @@ public class KcTeachingUnitContentOneController extends JeecgController<KcTeachi
|
|||
kcTeachingUnitContentOneService.updateById(kcTeachingUnitContentOne);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ApiOperation(value="教学单元内容-第三层-分页列表查询", notes="教学单元内容-第三层-分页列表查询")
|
||||
@GetMapping(value = "/getAllList")
|
||||
public Result<List<KcTeachingUnitContentOne>> getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne) {
|
||||
List<KcTeachingUnitContentOne> pageList = kcTeachingUnitContentOneService.getAllList(kcTeachingUnitContentOne);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -75,4 +75,6 @@ public class KcTeachingUnitContentOne implements Serializable {
|
|||
private List<KcTeachingUnitContentTwo> childrenList;
|
||||
@TableField(exist = false)
|
||||
private String teano;
|
||||
@TableField(exist = false)
|
||||
private String twoTitle;
|
||||
}
|
||||
|
|
|
@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||
*/
|
||||
public interface KcTeachingUnitContentOneMapper extends BaseMapper<KcTeachingUnitContentOne> {
|
||||
|
||||
List<KcTeachingUnitContentOne> getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne);
|
||||
}
|
||||
|
|
|
@ -2,4 +2,22 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.kc.teachingunitcontent.mapper.KcTeachingUnitContentOneMapper">
|
||||
|
||||
<select id="getAllList" resultType="org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentOne">
|
||||
select * from zy_zc_jc_view
|
||||
<where>
|
||||
<if test="createBy != null and createBy !=''">
|
||||
and create_by = #{createBy}
|
||||
</if>
|
||||
<if test="rwbh != null and rwbh !=''">
|
||||
and rwbh = #{rwbh}
|
||||
</if>
|
||||
<if test="xqxn != null and xqxn !=''">
|
||||
and xqxn = #{xqxn}
|
||||
</if>
|
||||
<if test="id != null and id !=''">
|
||||
and id in (${id})
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -17,4 +17,6 @@ public interface IKcTeachingUnitContentOneService extends IService<KcTeachingUni
|
|||
void saveAll(KcTeachingUnitContentSave teachingUnitContentSave);
|
||||
|
||||
void updateAllById(KcTeachingUnitContentSave teachingUnitContentSave);
|
||||
|
||||
List<KcTeachingUnitContentOne> getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne);
|
||||
}
|
||||
|
|
|
@ -96,4 +96,9 @@ public class KcTeachingUnitContentOneServiceImpl extends ServiceImpl<KcTeachingU
|
|||
|
||||
saveAll(teachingUnitContentSave);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KcTeachingUnitContentOne> getAllList(KcTeachingUnitContentOne kcTeachingUnitContentOne) {
|
||||
return baseMapper.getAllList(kcTeachingUnitContentOne);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -203,4 +203,12 @@ public class ZyCcjgController extends JeecgController<ZyCcjg, IZyCcjgService> {
|
|||
return super.importExcel(request, response, ZyCcjg.class);
|
||||
}
|
||||
|
||||
@ApiOperation(value="查重结果-分页列表查询", notes="查重结果-分页列表查询")
|
||||
@GetMapping(value = "/ccjglist")
|
||||
public Result<List<ZyCcjg>> ccjglist(ZyCcjg zyCcjg, HttpServletRequest req) {
|
||||
QueryWrapper<ZyCcjg> queryWrapper = QueryGenerator.initQueryWrapper(zyCcjg, req.getParameterMap());
|
||||
List<ZyCcjg> pageList = zyCcjgService.ccjglist(queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -158,6 +158,9 @@ public class ZyCcjg implements Serializable {
|
|||
private String stuNo;
|
||||
@TableField(exist = false)
|
||||
private String stuName;
|
||||
@TableField(exist = false)
|
||||
private String bdkname;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -21,4 +21,6 @@ public interface ZyCcjgMapper extends BaseMapper<ZyCcjg> {
|
|||
IPage<ZyCcjg> getQuaList(Page<ZyCcjg> page,@Param(Constants.WRAPPER) QueryWrapper<ZyCcjg> queryWrapper);
|
||||
|
||||
void deleteByZystuid(@Param("zyStuId") String zyStuId);
|
||||
|
||||
List<ZyCcjg> ccjglist(@Param(Constants.WRAPPER) QueryWrapper<ZyCcjg> queryWrapper);
|
||||
}
|
||||
|
|
|
@ -18,5 +18,24 @@
|
|||
zy_stu_id = #{zyStuId}
|
||||
</delete>
|
||||
|
||||
<select id="ccjglist" resultType="org.jeecg.modules.kc.zyCcjg.entity.ZyCcjg">
|
||||
select a.cc_type,if(cc_type = 2,a.ai_rate,a.percentage) as percentage,a.human_rate,b.student_name as stuName,a.create_by as stuNo,a.paperviewurl,
|
||||
CASE a.cc_type
|
||||
WHEN 0 THEN
|
||||
'维普作业库查重'
|
||||
WHEN 1 THEN
|
||||
'本次作业查重'
|
||||
WHEN 2 THEN
|
||||
'AIGC查重'
|
||||
WHEN 3 THEN
|
||||
'学校作业库查重'
|
||||
ELSE
|
||||
''
|
||||
END as bdkname
|
||||
from zy_ccjg a
|
||||
LEFT JOIN zy_info_student b on a.create_by = b.create_by and a.zy_stu_id = b.id
|
||||
LEFT JOIN zy_info c on b.main_id = c.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -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<ZyCcjg> {
|
|||
|
||||
IPage<ZyCcjg> getQuaList(Page<ZyCcjg> page, QueryWrapper<ZyCcjg> queryWrapper);
|
||||
|
||||
void deleteByZystuid(String id);
|
||||
void deleteByZystuid(String id, HttpServletResponse response);
|
||||
|
||||
List<ZyCcjg> ccjglist(QueryWrapper<ZyCcjg> queryWrapper);
|
||||
}
|
||||
|
|
|
@ -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<ZyCcjgMapper, ZyCcjg> implements IZyCcjgService {
|
||||
|
||||
|
||||
|
||||
private static String uploadpath;
|
||||
|
||||
@Value("${jeecg.path.upload}")
|
||||
|
@ -73,7 +76,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> impleme
|
|||
@Override
|
||||
public void getCcjg() {
|
||||
QueryWrapper<ZyCcjg> zyCcjgQueryWrapper = new QueryWrapper<>();
|
||||
zyCcjgQueryWrapper.in("filestateid",0,1,3);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测)
|
||||
zyCcjgQueryWrapper.in("filestateid",0,1,2);//检测状态(1:检测中,2:检测完成,3:检测失败,0:未检测)
|
||||
List<ZyCcjg> list = baseMapper.selectList(zyCcjgQueryWrapper);
|
||||
for(ZyCcjg par : list){
|
||||
//查重类型(0外网 1内网 2aigc 3校内)
|
||||
|
@ -112,10 +115,18 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> 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<ZyCcjg> ccjglist(QueryWrapper<ZyCcjg> queryWrapper) {
|
||||
return baseMapper.ccjglist(queryWrapper);
|
||||
}
|
||||
|
||||
|
||||
public Map<String,String> aigcCxjcjg(ZyCcjg zyCcjg) {
|
||||
String url = "https://vims.fanyu.com/tool/AIGCCheck/searchPaper";
|
||||
|
@ -172,8 +183,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl<ZyCcjgMapper, ZyCcjg> 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<ZyCcjgMapper, ZyCcjg> 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<ZyCcjgMapper, ZyCcjg> 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"))) {
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
<mapper namespace="org.jeecg.modules.kc.zyDbtx.mapper.ZyDbtxMapper">
|
||||
|
||||
<select id="getDbtxList" resultType="org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx">
|
||||
select rwbh,GROUP_CONCAT(type) as type,fbr from zy_dbtx where create_by = #{createBy} GROUP BY rwbh
|
||||
select rwbh,GROUP_CONCAT(type) as type,fbr from zy_dbtx where create_by = #{createBy} GROUP BY rwbh,fbr
|
||||
</select>
|
||||
</mapper>
|
|
@ -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<ZyInfo, IZyInfoService> {
|
|||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
|
||||
|
||||
QueryWrapper<ZyInfo> 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<ZyInfo> list2 = zyInfoService.list(queryWrapper2);
|
||||
for(ZyInfo par:list2){
|
||||
par.setZyStatus("1");
|
||||
zyInfoService.updateById(par);
|
||||
|
||||
if(par!=null) {
|
||||
ZyInfo zyInfo2 = zyInfoService.getKechengById(par.getId());
|
||||
QueryWrapper<Xxhbbks> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.apply("a.xh = b.xh");
|
||||
queryWrapper.eq("b.KCAPZBBH",zyInfo2.getRwbh());
|
||||
List<Xxhbbks> 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<ZyInfo> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap());
|
||||
Page<ZyInfo> page = new Page<ZyInfo>(pageNo, pageSize);
|
||||
queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano());
|
||||
queryWrapper.orderByAsc("a.sort");
|
||||
IPage<ZyInfo> pageList = zyInfoService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
@ -122,7 +168,40 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
zyInfoService.save(zyInfo);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param zyInfo
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "作业发布-添加")
|
||||
@ApiOperation(value="作业发布-添加", notes="作业发布-添加")
|
||||
@PostMapping(value = "/addOne")
|
||||
public Result<String> addOne(@RequestBody ZyInfo zyInfo) {
|
||||
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||
QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();
|
||||
kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1());
|
||||
kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
||||
kcKechengbiaoQueryWrapper.last("limit 1");
|
||||
KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
|
||||
|
||||
|
||||
QueryWrapper<ZyInfo> zyInfoQueryWrapper = new QueryWrapper<>();
|
||||
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
||||
zyInfoQueryWrapper.eq("create_by",zyInfo.getTeano());
|
||||
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
||||
List<ZyInfo> 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<ZyInfo, IZyInfoService> {
|
|||
@ApiOperation(value="作业发布-发布", notes="作业发布-发布")
|
||||
@RequestMapping(value = "/release", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> release(@RequestBody ZyInfo zyInfo) {
|
||||
zyInfo.setStartTime(new Date());
|
||||
zyInfoService.updateById(zyInfo);
|
||||
return Result.OK("发布成功!");
|
||||
}
|
||||
|
@ -196,7 +276,19 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
@ApiOperation(value="作业发布-通过id删除", notes="作业发布-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||
ZyInfo zyInfo = zyInfoService.getById(id);
|
||||
zyInfoService.removeById(id);
|
||||
QueryWrapper<ZyInfo> zyInfoQueryWrapper = new QueryWrapper<>();
|
||||
zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
|
||||
zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy());
|
||||
zyInfoQueryWrapper.eq("xnxq",zyInfo.getXnxq());
|
||||
zyInfoQueryWrapper.orderByAsc("sort");
|
||||
List<ZyInfo> list = zyInfoService.list(zyInfoQueryWrapper);
|
||||
for(int i=0;i<list.size();i++){
|
||||
ZyInfo zyInfoPar = list.get(i);
|
||||
zyInfoPar.setSort(i+1);
|
||||
zyInfoService.updateById(zyInfoPar);
|
||||
}
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
|
@ -395,6 +487,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
QueryWrapper<ZyInfo> query = new QueryWrapper<>();
|
||||
query.eq("rwbh", zyInfo.getRwbh());
|
||||
query.eq("create_by",zyInfo.getCreateBy());
|
||||
List<ZyInfo> oldList = zyInfoService.list(query);
|
||||
zyInfoService.remove(query);
|
||||
|
||||
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||
|
@ -405,11 +498,17 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
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<ZyInfo> 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("添加成功!");
|
||||
}
|
||||
|
|
|
@ -182,5 +182,4 @@ public class ZyInfo implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String xnsftg;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -138,7 +138,6 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
queryWrapper.isNotNull("a.score");
|
||||
}
|
||||
}
|
||||
|
||||
IPage<ZyInfoStudent> pageList = zyInfoStudentService.page(page, queryWrapper);
|
||||
for(ZyInfoStudent ZyInfoStudentPar:pageList.getRecords()){
|
||||
List<ZyInfoStudent> list = zyInfoStudentService.getCcjg(ZyInfoStudentPar);
|
||||
|
@ -416,7 +415,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
@AutoLog(value = "作业驳回")
|
||||
@ApiOperation(value="作业驳回", notes="作业驳回")
|
||||
@RequestMapping(value = "/editBohui", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> editBohui(@RequestBody ZyInfoStudent zyInfoStudent) {
|
||||
public Result<String> editBohui(@RequestBody ZyInfoStudent zyInfoStudent, HttpServletResponse response) {
|
||||
UpdateWrapper<ZyInfoStudent> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.set("file_path",null);
|
||||
updateWrapper.set("pdf_path",null);
|
||||
|
@ -432,7 +431,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
zyInfoStudentService.update(updateWrapper);
|
||||
|
||||
//查重前删除原来的查重数据
|
||||
zyCcjgService.deleteByZystuid(zyInfoStudent.getId());
|
||||
zyCcjgService.deleteByZystuid(zyInfoStudent.getId(),response);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
|
|
|
@ -173,4 +173,9 @@ public class ZyInfoStudent implements Serializable {
|
|||
private String xxmessage;//学校说明
|
||||
@TableField(exist = false)
|
||||
private String queryType;//作业状态查询
|
||||
@TableField(exist = false)
|
||||
private String zgccl;//最高相似律
|
||||
@TableField(exist = false)
|
||||
private String alltgl;//通过率
|
||||
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
|
|||
import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent;
|
||||
import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudentSys;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
@ -33,4 +34,6 @@ public interface ZyInfoStudentMapper extends BaseMapper<ZyInfoStudent> {
|
|||
String getWpFile(ZyInfoStudent zyInfoStudent);
|
||||
|
||||
Map<String, String> getXfwWpFile(ZyInfoStudent zyInfoStudent);
|
||||
|
||||
void delweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response);
|
||||
}
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
delete from zy_info_student where main_id = #{mainId}
|
||||
</delete>
|
||||
<select id="selectPage" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||
select a.*,b.wwcc,b.nwcc,b.aigccc,b.xncc,b.title as zyname from zy_info_student a
|
||||
select a.*,b.wwcc,b.nwcc,b.aigccc,b.xncc,b.title as zyname, GREATEST(ifnull(a.wwxsl,0),ifnull(a.nwxsl,0),ifnull(a.aigcxsl,0),ifnull(a.xnxsl,0)) as zgccl,b.wwtgl as alltgl
|
||||
from zy_info_student a
|
||||
left join zy_info b on a.main_id = b.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
@ -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
|
||||
</select>
|
||||
|
||||
<select id="getXfwWpFile" resultType="java.util.HashMap">
|
||||
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
|
||||
</select>
|
||||
</mapper>
|
|
@ -161,50 +161,23 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
|||
zyInfoStudent.setCatename(catename);
|
||||
|
||||
//删除维普已经提交的文档
|
||||
zyInfoStudent.setQueryType("0");//外网查重数据
|
||||
String paperids = baseMapper.getWpFile(zyInfoStudent);
|
||||
if(StringUtils.isNotEmpty(paperids)){
|
||||
String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx";
|
||||
delWpFile(url,paperids,response);
|
||||
}
|
||||
zyInfoStudent.setQueryType("1");//内网查重数据-作业内查重
|
||||
Map<String,String> 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<String,String> 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<ZyInfoStudentMapper, Z
|
|||
return true;
|
||||
}
|
||||
|
||||
private void delweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response) {
|
||||
zyInfoStudent.setQueryType("0");//外网查重数据
|
||||
String paperids = baseMapper.getWpFile(zyInfoStudent);
|
||||
if(StringUtils.isNotEmpty(paperids)){
|
||||
String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx";
|
||||
delWpFile(url,paperids, response);
|
||||
}
|
||||
zyInfoStudent.setQueryType("1");//内网查重数据-作业内查重
|
||||
Map<String,String> 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<String,String> 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";
|
||||
|
|
Loading…
Reference in New Issue