From 1895c8ba3ad5cba72fa7dc3643124073c1a7525c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 6 Jul 2024 15:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcDetectionMainController.java | 6 +- .../controller/KcKechengbiaoController.java | 5 +- .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 4 ++ .../kc/wjxDjxx/entity/WjxDjxxTmxx.java | 3 + .../service/impl/WjxDjxxServiceImpl.java | 14 +++- .../service/impl/WjxWjxxServiceImpl.java | 64 +++++++++++-------- .../modules/kc/wjxWjxx/utils/WjxUtil.java | 2 +- .../kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java | 1 + .../mapper/xml/WjxWjxxTmxxMapper.xml | 2 +- .../service/impl/WjxWjxxTmlbServiceImpl.java | 1 + .../kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java | 1 + .../zyCjwt/controller/ZyCjwtController.java | 2 +- .../modules/kc/zyCjwt/entity/ZyCjwt.java | 3 + .../zyInfo/controller/ZyInfoController.java | 10 +++ .../modules/kc/zyInfo/entity/ZyInfo.java | 16 ++--- .../controller/ZyInfoStudentController.java | 6 +- .../zyInfoStudent/entity/ZyInfoStudent.java | 4 +- .../impl/ZyInfoStudentServiceImpl.java | 27 ++++++-- .../zyJxdg/controller/ZyJxdgController.java | 23 +++++++ .../modules/kc/zyJxdg/entity/ZyJxdg.java | 2 + 20 files changed, 138 insertions(+), 58 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java index c8aebd83..ee901a12 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java @@ -90,9 +90,9 @@ public class KcDetectionMainController extends JeecgController '$.hh'", kcDetectionMain.getSearchHh()); } - if(StringUtils.isNotBlank(kcDetectionMain.getSearchHh())){ - queryWrapper.eq("ketangbiao_info -> '$.hh'", kcDetectionMain.getSearchHh()); - } +// if(StringUtils.isNotBlank(kcDetectionMain.getSearchHh())){ +// queryWrapper.eq("ketangbiao_info -> '$.hh'", kcDetectionMain.getSearchHh()); +// } if(StringUtils.isNotBlank(kcDetectionMain.getSkjs())){ queryWrapper.like("ketangbiao_info -> '$.skjs'", kcDetectionMain.getSkjs()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index 1be1b5cc..c414baab 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -271,12 +271,13 @@ public class KcKechengbiaoController extends JeecgController dbtxList = zyDbtxService.getDbtxList(zyDbtx); for(KcKechengbiao par:pageList.getRecords()){ + int i = 0; for(ZyDbtx txPar : dbtxList){ if(StringUtils.equals(par.getRwbh(),txPar.getRwbh())){ - par.setDbtxType(txPar.getType()); - break; + i++; } } + par.setDbtxType(i+""); } } 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 65432cd0..04ee9b7e 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 @@ -142,6 +142,8 @@ SELECT kcbh, kcmc, + xf, + jkzc, kkdw, kcxz, szkc, @@ -157,6 +159,8 @@ SELECT DISTINCT kcbh, kcmc, + xf, + jkzc, kkdw, kcxz, szkc, diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java index 8fe14391..039e2323 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java @@ -71,4 +71,7 @@ public class WjxDjxxTmxx implements Serializable { @TableField(exist = false) private List wjxWjxxTmxxList; + + @TableField(exist = false) + private String tktda; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index 6f8f0008..2587f4fc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -16,7 +16,9 @@ import org.jeecg.modules.kc.wjxDjxx.service.IWjxDjxxService; import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx; import org.jeecg.modules.kc.wjxWjxx.mapper.WjxWjxxMapper; import org.jeecg.modules.kc.wjxWjxx.utils.WjxUtil; +import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx; +import org.jeecg.modules.kc.wjxWjxxTmlb.mapper.WjxWjxxTmlbMapper; import org.jeecg.modules.kc.wjxWjxxTmlb.mapper.WjxWjxxTmxxMapper; import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx; import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService; @@ -42,6 +44,8 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl @Autowired private WjxWjxxTmxxMapper wjxWjxxTmxxMapper; @Autowired + private WjxWjxxTmlbMapper wjxWjxxTmlbMapper; + @Autowired private WjxWjxxMapper wjxWjxxMapper; @Autowired @@ -229,10 +233,11 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl String content = ""; if(StringUtils.equals("6",wjxWjxx.getAtype())){ type = "6"; - content = "您有一条新的测验待查阅"; + content = "["+wjxWjxx.getTitle()+"]"+user.getRealname()+"提交了一篇测验待查阅"; + }else{ type = "7"; - content = "您有一条新的问卷待查阅"; + content = "["+wjxWjxx.getTitle()+"]"+user.getRealname()+"提交了一篇问卷待查阅"; } //作业代办提醒 ZyDbtx zyDbtx = new ZyDbtx(); @@ -242,7 +247,7 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl zyDbtx.setRwbh(wjxWjxx.getRwbh()); zyDbtx.setContent(content); zyDbtx.setFlag("0"); - zyDbtx.setFbr(user.getUsername()); + zyDbtx.setFbr(wjxWjxx.getCreateBy()); zyDbtxService.save(zyDbtx); @@ -357,6 +362,9 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl for(WjxDjxxTmxx wjxDjxxTmxx:list){ List list2= wjxWjxxTmxxMapper.selectByMainId(wjxDjxxTmxx.getId()); wjxDjxxTmxx.setWjxWjxxTmxxList(list2); + //获取填空题答案 + WjxWjxxTmlb tmlb = wjxWjxxTmlbMapper.selectById(wjxDjxxTmxx.getId()); + wjxDjxxTmxx.setTktda(tmlb.getWjAnswer()); } djxx.setWjxDjxxTmxxList(list); 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 fac5d7d8..fea4b3d6 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 @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.text.StringUtils; import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx; import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx; @@ -15,6 +16,7 @@ import org.jeecg.modules.kc.wjxWjxx.entity.KccyglSys; import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx; import org.jeecg.modules.kc.wjxWjxx.mapper.WjxWjxxMapper; import org.jeecg.modules.kc.wjxWjxx.service.IWjxWjxxService; +import org.jeecg.modules.kc.wjxWjxx.utils.WjxConfig; import org.jeecg.modules.kc.wjxWjxx.utils.WjxUtil; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx; @@ -43,6 +45,9 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl @Autowired private WjxUtil wjxUtil; + @Autowired + private WjxConfig wjxConfig; + @Override public Page findPage(WjxWjxx wjxWjxx, Page page){ List list = baseMapper.findPage(page,wjxWjxx); @@ -232,6 +237,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper<>(); wjxWjxxTmlbQueryWrapper.eq("main_id", id); + wjxWjxxTmlbQueryWrapper.orderByAsc("wj_index"); List wjxWjxxTmlbList =wjxWjxxTmlbMapper.selectList(wjxWjxxTmlbQueryWrapper); List> questionsList = new ArrayList<>(); @@ -277,6 +283,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl Map map = new HashMap<>(); //-----------题目必穿参数------------- + map.put("creater","jwctest"); map.put("atype",wjxWjxx.getAtype()); map.put("title",wjxWjxx.getTitle()); map.put("desc",wjxWjxx.getContent()); @@ -316,38 +323,39 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl String vid = wjxWjxx.getVid(); Map map = new HashMap<>(); map.put("vid",Integer.valueOf(vid)); - map.put("suffix",2); +// map.put("suffix",2); //调用接口,提交 String result = wjxUtil.openapi(map,"1001004"); JSONObject jsonResult = JSONObject.parseObject(result); System.out.println("1----------->"+jsonResult.toString()); - if(StringUtils.equals("true",jsonResult.getString("result"))){ - for(int i=0;i<10;i++){ - try { - Thread.sleep(1000L); - }catch (Exception e){ - e.printStackTrace(); - } - JSONObject data = jsonResult.getJSONObject("data"); - String taskid = data.getString("taskid"); - Map map2 = new HashMap<>(); - map2.put("vid",Integer.valueOf(vid)); - map2.put("suffix",2); - map2.put("taskid",taskid); - String result2 = wjxUtil.openapi(map2,"1001004"); - System.out.println("result2----------->"+result2); - JSONObject jsonResult2 = JSONObject.parseObject(result2); - String result3 = jsonResult2.getString("data"); - System.out.println("result3----------->"+result3); - JSONObject jsonResult3 = JSONObject.parseObject(result3); - System.out.println("jsonResult3----------->"+jsonResult3); - if(StringUtils.isNotEmpty(jsonResult3.getString("download_url"))){ - jsonResult = jsonResult2; - break; - } - } - - } +// if(StringUtils.equals("true",jsonResult.getString("result"))){ +// JSONObject data = jsonResult.getJSONObject("data"); +// String taskid = data.getString("taskid"); +// for(int i=0;i<10;i++){ +// try { +// System.out.println("datatime--------->"+ DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss")); +// Thread.sleep(2000L); +// }catch (Exception e){ +// e.printStackTrace(); +// } +// Map map2 = new HashMap<>(); +// map2.put("vid",Integer.valueOf(vid)); +//// map2.put("suffix",2); +// map2.put("taskid",taskid); +// String result2 = wjxUtil.openapi(map2,"1001004"); +// System.out.println("result2----------->"+result2); +// JSONObject jsonResult2 = JSONObject.parseObject(result2); +// String result3 = jsonResult2.getString("data"); +// System.out.println("result3----------->"+result3); +// JSONObject jsonResult3 = JSONObject.parseObject(result3); +// System.out.println("jsonResult3----------->"+jsonResult3); +// if(StringUtils.isNotEmpty(jsonResult3.getString("download_url"))){ +// jsonResult = jsonResult2; +// break; +// } +// } +// +// } return jsonResult; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/utils/WjxUtil.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/utils/WjxUtil.java index 541ee330..d2f7503c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/utils/WjxUtil.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/utils/WjxUtil.java @@ -38,7 +38,7 @@ public class WjxUtil { } // System.out.println("sign: "+sign); data.put("sign",sign); -// System.out.println("map:"+data.toString()); + System.out.println("wjx_data--->:"+data.toString()); String url = "https://www.wjx.cn/openapi/default.aspx"; try { JSONObject json = new JSONObject(data); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java index bbe017da..c96ddd5b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java @@ -98,6 +98,7 @@ public class WjxWjxxTmlb implements Serializable { private java.lang.String wjLeixing;//问卷类型（0作业，1问卷） + private java.lang.String wjSfqh;//是否切换 0系统 1自定义 @TableField(exist = false) private String itemSelected; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmxxMapper.xml index 28a26561..870b2709 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/mapper/xml/WjxWjxxTmxxMapper.xml @@ -12,5 +12,5 @@ SELECT * FROM wjx_wjxx_tmxx WHERE - main_id = #{mainId} + main_id = #{mainId} order by wj_index asc diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java index d944c551..99358be6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java @@ -101,6 +101,7 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl wjxWjxxTmlbQueryWrapper = new QueryWrapper(); wjxWjxxTmlbQueryWrapper.eq("main_id",id); + wjxWjxxTmlbQueryWrapper.orderByAsc("wj_index"); List list = wjxWjxxTmlbMapper.selectList(wjxWjxxTmlbQueryWrapper); for(WjxWjxxTmlb WjxWjxxTmlb:list){ List list2= wjxWjxxTmxxMapper.selectByMainId(WjxWjxxTmlb.getId()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java index 6304164a..a0551ef0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java @@ -90,6 +90,7 @@ public class WjxWjxxTmlbPage { private String itemSelected; + private java.lang.String wjSfqh;//是否切换 0系统 1自定义 private java.lang.String wjSytype;//私有类型（0私有，1共有） private java.lang.String wjLeixing;//问卷类型（6作业，1问卷） diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java index a6c0634b..6a3b5985 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/controller/ZyCjwtController.java @@ -101,7 +101,7 @@ public class ZyCjwtController extends JeecgController { @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ZyCjwt zyCjwt) { zyCjwtService.updateById(zyCjwt); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java index cc9eb106..cc00dd02 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCjwt/entity/ZyCjwt.java @@ -66,6 +66,9 @@ public class ZyCjwt implements Serializable { @Excel(name = "答案", width = 15) @ApiModelProperty(value = "答案") private java.lang.String answer; + /**答案*/ + @ApiModelProperty(value = "是否发布") + private java.lang.String sffb; @TableField(exist = false) 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 50c2e0a8..a11b6879 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 @@ -372,4 +372,14 @@ public class ZyInfoController extends JeecgController { mv.addObject(NormalExcelConstants.DATA_LIST, exportList); return mv; } + + + + @ApiOperation(value="作业发布-通过id查询", notes="作业发布-通过id查询") + @GetMapping(value = "/queryZyinfoByStuId") + public Result queryZyinfoByStuId(@RequestParam(name="id",required=true) String id) { + ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(id); + ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); + return Result.OK(zyInfo); + } } 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 0dba1924..a6321e10 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 @@ -64,15 +64,15 @@ public class ZyInfo implements Serializable { @ApiModelProperty(value = "描述") private java.lang.String content; /**开始时间*/ - @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "开始时间") private java.util.Date startTime; /**结束时间*/ - @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "结束时间") private java.util.Date endTime; /**状态*/ @@ -120,6 +120,8 @@ public class ZyInfo implements Serializable { @Excel(name = "校内通过率", width = 15) @ApiModelProperty(value = "校内通过率") private java.lang.Double xntgl; + //作业分值 + private String score; private java.lang.String rwbh; private java.lang.String filePath; @@ -135,8 +137,6 @@ public class ZyInfo implements Serializable { @TableField(exist = false) private String stuPdfPath; @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/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index 6f35df89..54e646fd 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 @@ -381,10 +381,10 @@ public class ZyInfoStudentController extends JeecgController"); + } Map textMap = new HashMap(); //可以设置多个input的name，value String sign = getSign(); @@ -263,6 +267,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl"); + } Map textMap = new HashMap(); String titlePar =fileName.substring(fileName.lastIndexOf("/")+1,fileName.length()); String title = titlePar.split("_")[0]; @@ -317,6 +325,9 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl textMap = new HashMap(); String titlePar =fileName.substring(fileName.lastIndexOf("/")+1,fileName.length()); String title = titlePar.split("_")[0]; @@ -395,7 +406,11 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl"); + } // String fileName = getFileName(zyInfoStudent.getFilePath(),response); Map textMap = new HashMap(); //可以设置多个input的name，value @@ -465,7 +480,7 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl"); }else if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)){ System.out.println("22222222222222----------->"); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java index ef6de684..9eec379d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java @@ -677,4 +677,27 @@ public class ZyJxdgController extends JeecgController { } + @AutoLog(value = "删除教学大纲及日历附件") + @ApiOperation(value="删除教学大纲及日历附件", notes="删除教学大纲及日历附件") + @PostMapping(value = "/deleteJxdgJxrl") + public Result deleteJxdgJxrl(@RequestBody ZyJxdg zyJxdg) { + String id = zyJxdg.getId(); + String type = zyJxdg.getType(); + UpdateWrapper update = new UpdateWrapper(); + if(StringUtils.equals("1",type)){ + update.set("file_path",null); + update.set("pdf_path",null); + update.eq("id",id); + service.update(update); + }else if(StringUtils.equals("2",type)){ + update.set("jxrl_file_path",null); + update.set("jxrl_pdf_path",null); + update.eq("id",id); + service.update(update); + } + + return Result.OK("删除成功!"); + } + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java index 595754f3..35b954fa 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java @@ -89,4 +89,6 @@ public class ZyJxdg implements Serializable { private String teano; @TableField(exist = false) private String ywId; + @TableField(exist = false) + private String type; }