diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java index 214f26b4..a45565d8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbksMapper.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import java.util.List; + /** * @Description: 同步数据表（bks） * @Author: jeecg-boot @@ -19,4 +21,6 @@ public interface XxhbbksMapper extends BaseMapper { Xxhbbks getSumnum(); IPage getXsxkbList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List getXsxkbAllList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml index 6ab4d4a0..ccb1fef7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbksMapper.xml @@ -14,4 +14,8 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java index a8bef604..28d33474 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbksService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import java.util.Collection; +import java.util.List; /** * @Description: 同步数据表（bks） @@ -34,4 +35,6 @@ public interface IXxhbbksService extends IService { Xxhbbks getSumnum(); IPage getXsxkbList(Page page, QueryWrapper queryWrapper); + + List getXsxkbAllList(QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java index b59a4dcf..25212f71 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbksServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; +import java.util.List; /** * @Description: 同步数据表（bks） @@ -46,4 +47,9 @@ public class XxhbbksServiceImpl extends ServiceImpl impl public IPage getXsxkbList(Page page, QueryWrapper queryWrapper) { return baseMapper.getXsxkbList(page, queryWrapper); } + + @Override + public List getXsxkbAllList(QueryWrapper queryWrapper) { + return baseMapper.getXsxkbAllList(queryWrapper); + } } 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 01f5771d..ca47b106 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 @@ -12,10 +12,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; +import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; @@ -30,6 +34,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent; +import org.jeecg.modules.kc.zyInfoStudent.service.IZyInfoStudentService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -60,11 +66,14 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class ZyInfoController extends JeecgController { @Autowired private IZyInfoService zyInfoService; - @Autowired private IKcSysConfigService kcSysConfigService; @Autowired private IKcKechengbiaoService kcKechengbiaoService; + @Autowired + private IXxhbbksService xxhbbksService; + @Autowired + private IZyInfoStudentService zyInfoStudentService; /** * 分页列表查询 * @@ -81,15 +90,7 @@ public class ZyInfoController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyInfo, req.getParameterMap()); - if(StringUtils.isNotEmpty(zyInfo.getSflssj())){ - String date = DateUtils.formatDate(new Date(),"yyyy-MM-dd"); - if(StringUtils.equals("0",zyInfo.getSflssj())){//不是历史 - queryWrapper.ge("end_time",date); - }else{//历史作业 - queryWrapper.lt("end_time",date); - } - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = zyInfoService.page(page, queryWrapper); return Result.OK(pageList); @@ -131,7 +132,29 @@ public class ZyInfoController extends JeecgController { zyInfoService.updateById(zyInfo); return Result.OK("编辑成功!"); } - + + @ApiOperation(value="作业发布-通过id查询", notes="作业发布-通过id查询") + @GetMapping(value = "/editStudent") + public Result editStudent(@RequestParam(name="id",required=true) String id) { + ZyInfo zyInfo = zyInfoService.getById(id); + if(zyInfo!=null) { + zyInfo = zyInfoService.getById(zyInfo.getId()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.apply("a.xh = b.xh"); + queryWrapper.eq("b.KCAPZBBH",zyInfo.getRwbh()); + List list = xxhbbksService.getXsxkbAllList(queryWrapper); + zyInfoStudentService.deleteMainId(zyInfo.getId()); + for(Xxhbbks xxhbbks:list){ + ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); + zyInfoStudent.setMainId(zyInfo.getId()); + zyInfoStudent.setCreateBy(xxhbbks.getXh()); + zyInfoStudent.setStudentName(xxhbbks.getXm()); + zyInfoStudentService.save(zyInfoStudent); + } + } + return Result.OK(zyInfo); + } + /** * 通过id删除 * @@ -203,4 +226,20 @@ public class ZyInfoController extends JeecgController { return super.importExcel(request, response, ZyInfo.class); } + + @ApiOperation(value="作业发布-分页列表查询", notes="作业发布-分页列表查询") + @GetMapping(value = "/stuList") + public Result> stuList(ZyInfo zyInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.apply("a.id = b.main_id "); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.eq("b.create_by",sysUser.getUsername()); + IPage pageList = zyInfoService.stuList(page, queryWrapper); + return Result.OK(pageList); + } + } 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 f0eda264..080fd39b 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 @@ -119,4 +119,15 @@ public class ZyInfo implements Serializable { @TableField(exist = false) private String sflssj;//是否历史数据 + @TableField(exist = false) + private String stuId; + @TableField(exist = false) + private String stuFilePath; + @TableField(exist = false) + private String score; + @TableField(exist = false) + private String wtjnum; + @TableField(exist = false) + private String ytjnum; + } 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 951e1ebd..2ee598cb 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 @@ -2,6 +2,10 @@ package org.jeecg.modules.kc.zyInfo.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyInfoMapper extends BaseMapper { + IPage stuList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 96dff835..e1c2bba1 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 @@ -2,4 +2,23 @@ + + \ 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 32871008..c3cb6ee9 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 @@ -1,5 +1,8 @@ package org.jeecg.modules.kc.zyInfo.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyInfoService extends IService { + IPage stuList(Page page, QueryWrapper queryWrapper); } 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 66421609..5b68b51d 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 @@ -1,5 +1,8 @@ package org.jeecg.modules.kc.zyInfo.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import org.jeecg.modules.kc.zyInfo.mapper.ZyInfoMapper; import org.jeecg.modules.kc.zyInfo.service.IZyInfoService; @@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyInfoServiceImpl extends ServiceImpl implements IZyInfoService { + @Override + public IPage stuList(Page page, QueryWrapper queryWrapper) { + return baseMapper.stuList(page, queryWrapper); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java index ca4608b0..0fab6ffe 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java @@ -83,6 +83,7 @@ public class ZyInfoStudent implements Serializable { @ApiModelProperty(value = "aigc是否通过") private java.lang.String aigcsftg; private java.lang.String studentName; + private java.lang.String score; @TableField(exist = false) private String catename; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java index 9145a55f..f98970db 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/ZyInfoStudentMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZyInfoStudentMapper extends BaseMapper { + void deleteMainId(@Param("mainId") String id); } 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 ec0ca56a..e93a1224 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 @@ -2,4 +2,7 @@ + + delete from zy_info_student where main_id = #{mainId} + \ 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 27aa2f1a..6954dc97 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 @@ -12,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IZyInfoStudentService extends IService { public boolean save(ZyInfoStudent zyInfoStudent); + + void deleteMainId(String id); } 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 3f66edcf..0c333623 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 @@ -82,34 +82,38 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl kcKechengbiaoQueryWrapper = new QueryWrapper<>(); - kcKechengbiaoQueryWrapper.eq("xqxn",zyInfo.getXnxq()); - kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); - kcKechengbiaoQueryWrapper.last("limit 1"); - KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); - String cateid = kcKechengbiao.getKcbh()+""+kcKechengbiao.getKcmc(); - String catename = kcKechengbiao.getKcmc(); - zyInfoStudent.setCateid(cateid); - zyInfoStudent.setCatename(catename); - //外网查重及提交检测 - if(StringUtils.equals(zyInfo.getWwcc(),"1")){ - wwccSave(zyInfoStudent); - } - //内网查重及提交检测 - if(StringUtils.equals(zyInfo.getNwcc(),"1")){ - nwccSave(zyInfoStudent); - } - //aigc查重及提交检测 - if(StringUtils.equals(zyInfo.getAigccc(),"1")){ - aigcSave(zyInfoStudent); - } +// ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); +// +// String rwbh = zyInfo.getRwbh(); +// QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); +// kcKechengbiaoQueryWrapper.eq("xqxn",zyInfo.getXnxq()); +// kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); +// kcKechengbiaoQueryWrapper.last("limit 1"); +// KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); +// String cateid = kcKechengbiao.getKcbh()+""+kcKechengbiao.getKcmc(); +// String catename = kcKechengbiao.getKcmc(); +// zyInfoStudent.setCateid(cateid); +// zyInfoStudent.setCatename(catename); +// //外网查重及提交检测 +// if(StringUtils.equals(zyInfo.getWwcc(),"1")){ +// wwccSave(zyInfoStudent); +// } +// //内网查重及提交检测 +// if(StringUtils.equals(zyInfo.getNwcc(),"1")){ +// nwccSave(zyInfoStudent); +// } +// //aigc查重及提交检测 +// if(StringUtils.equals(zyInfo.getAigccc(),"1")){ +// aigcSave(zyInfoStudent); +// } return true; } + @Override + public void deleteMainId(String id) { + baseMapper.deleteMainId(id); + } + //aigc提交 private void aigcSave(ZyInfoStudent zyInfoStudent) { String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit";