diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index 00bea3e1..fa35fc9a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -208,9 +208,9 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0) or (zt= '离职' and ytkcs-0 >0))"); + queryWrapper.apply("(zt = '在职' )"); // queryWrapper.eq("zt","在职"); -// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))"); +// queryWrapper.apply("(zt = '在职' or ( ytkcs-0 >0))"); // queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)"); Page page = new Page<>(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); @@ -277,7 +277,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); - queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0) or (zt= '离职' and ytkcs-0 >0))"); + queryWrapper.apply("(zt = '在职' )"); Page page = new Page<>(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.list3(page, queryWrapper); return Result.OK(pageList); @@ -429,7 +429,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0) or (zt= '离职' and ytkcs-0 >0))"); + queryWrapper.apply("(zt = '在职')"); queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)"); // Step.2 获取导出数据 List exportList = service.list(queryWrapper); @@ -487,7 +487,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0) or (zt= '离职' and ytkcs-0 >0))"); + queryWrapper.apply("(zt = '在职' )"); // 过滤选中数据 String selections = request.getParameter("selections"); if (oConvertUtils.isNotEmpty(selections)) { @@ -495,7 +495,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController0))"); +// queryWrapper.apply("(zt = '在职' or ( ytkcs-0 >0))"); // queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)"); // Step.2 获取导出数据 queryWrapper.groupBy("gh,xm"); @@ -519,10 +519,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController kcEvaluationQueryWrapper = new QueryWrapper<>(); kcEvaluationQueryWrapper.eq("xqxn",object.getXqxn()); kcEvaluationQueryWrapper.eq(StringUtils.isNotBlank(object.getDwmc()),"dwmc",object.getDwmc()); - kcEvaluationQueryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))"); + kcEvaluationQueryWrapper.apply("(zt = '在职' )"); kcEvaluationQueryWrapper.groupBy("a.gh,a.tklx"); -// where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0)) +// where xqxn = #{xqxn} and (zt = '在职' or ( ytkcs-0 >0)) // // and tklx in (${code}) // diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml index bc223fe0..1c6feb46 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml @@ -58,7 +58,7 @@ - select count(*) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' or zt= '退休') + select count(*) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' ) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java index 4dbae23b..47cf8fb0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java @@ -745,7 +745,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl String url = prefixUrl + "/oauth/token?grant_type=password&scope=read&username=" + userName + "&password=" + password; ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, Object.class); - ; + LinkedHashMap map = (LinkedHashMap) response.getBody(); 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 b00ae78a..31585bbe 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 @@ -23,4 +23,6 @@ public interface ZyCcjgMapper extends BaseMapper { void deleteByZystuid(@Param("zyStuId") String zyStuId); List ccjglist(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + void deleteByZystuidByZero(@Param("zyStuId") String id); } 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 f919e139..7349c615 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 @@ -17,6 +17,12 @@ WHERE zy_stu_id = #{zyStuId} + + DELETE + FROM zy_ccjg + WHERE + zy_stu_id = #{zyStuId} and cc_type = 0 + - select a.* from zy_info_student a , + select a.*,a.id as stuId from zy_info_student a , (select distinct zy_stu_id from zy_ccjg where message = '大学生版，检测次数不足') b where a.id = b.zy_stu_id and a.file_path is not null - select a.*,a.id as stu_id from (select * from zy_info_student where main_id in (select id from zy_info where wwtgl is not null and create_time >='2025-01-01')) a + select a.*,a.id as stu_id from (select * from zy_info_student where main_id in (select id from zy_info where wwcc = 'true' and create_time >='2025-01-01')) a LEFT JOIN zy_ccjg b on a.id = b.zy_stu_id where a.file_path is not null and a.wwxsl is null and b.id is null diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudent2Service.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudent2Service.java index 92d8c457..baf470c1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudent2Service.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudent2Service.java @@ -70,4 +70,6 @@ public interface IZyInfoStudent2Service extends IService { List getZyStuIdById(ZyXzryInfo zyXzryInfo); void sckhclxb(); + + void stuWpwwjc(ZyInfoStudent zyInfoStudent,HttpServletResponse response); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentService2Impl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentService2Impl.java index f44d0cb9..43126ca8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentService2Impl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentService2Impl.java @@ -500,23 +500,23 @@ public class ZyInfoStudentService2Impl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("a.main_id", zyInfoStudent.getId()); + queryWrapper.eq("a.create_by", zyInfoStudent.getCreateBy()); + List list1 = baseMapper.selectList(queryWrapper); + zyInfoStudent = list1.get(0); + } else { + zyInfoStudent = baseMapper.selectById(zyInfoStudent.getStuId()); + } + + System.out.println("----------------2---------------------" + zyInfoStudent); + ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); + System.out.println("----------------3---------------------" + zyInfo); + + + String cateid = zyInfo.getId() + "" + zyInfo.getTitle(); + String catename = zyInfo.getTitle(); + zyInfoStudent.setCateid(cateid); + zyInfoStudent.setCatename(catename); + + System.out.println("----------------4---------------------"); + //删除维普已经提交的文档 + zyCcjgMapper.deleteByZystuidByZero(zyInfoStudent.getId()); + + System.out.println("----------------5---------------------"); + + //外网查重及提交检测 + if (StringUtils.equals(zyInfo.getWwcc(), "true")) { + wwccSave(zyInfoStudent, response); + } + System.out.println("----------------6---------------------"); + } + public JSONObject getSycs(String url, String type) { Map textMap = new HashMap(); //可以设置多个input的name，value @@ -648,28 +688,28 @@ public class ZyInfoStudentService2Impl 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("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 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)) { @@ -944,6 +984,11 @@ public class ZyInfoStudentService2Impl extends ServiceImpl" + message); + ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent(); + zyInfoStudentUp.setId(zyInfoStudent.getId()); + zyInfoStudentUp.setWwsftg("检测中"); + baseMapper.updateById(zyInfoStudentUp); return message; } else { log.info("3-------->"); @@ -1026,6 +1075,10 @@ public class ZyInfoStudentService2Impl extends ServiceImpl" + message); @@ -796,6 +802,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl" + message); @@ -876,6 +890,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl" + message); + ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent(); + zyInfoStudentUp.setId(zyInfoStudent.getId()); + zyInfoStudentUp.setXnsftg("检测中"); + baseMapper.updateById(zyInfoStudentUp); } } else { @@ -942,6 +964,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl" + message); + ZyInfoStudent zyInfoStudentUp = new ZyInfoStudent(); + zyInfoStudentUp.setId(zyInfoStudent.getId()); + zyInfoStudentUp.setWwsftg("检测中"); + baseMapper.updateById(zyInfoStudentUp); return message; } else { log.info("3-------->"); @@ -1091,6 +1121,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl