From 40644a42a6cb43ba995158f6043fb54bf66c5404 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 8 Oct 2024 08:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E5=8D=B7=E6=98=9F?= =?UTF-8?q?=E5=8F=8A=E6=89=B9=E9=98=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WjxDjxxServiceImpl.java | 7 ++++++- .../wjxWjxx/controller/WjxWjxxController.java | 1 + .../modules/kc/wjxWjxx/entity/WjxWjxx.java | 1 - .../service/impl/WjxWjxxServiceImpl.java | 17 ++++++++++++----- .../kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java | 2 ++ .../kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java | 1 + .../kc/zyInfo/controller/ZyInfoController.java | 12 ++++++------ 7 files changed, 28 insertions(+), 13 deletions(-) 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 0cbf119c..5f3c70a7 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 @@ -99,13 +99,18 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl itemSelected = "(跳过)"; } } + if(wjType == 8){ + itemSelected = "-3"; + } submitDataSb.append(WjIndex); submitDataSb.append("$"); submitDataSb.append(itemSelected); submitDataSb.append("}"); } String submitData = submitDataSb.toString(); - submitData = submitData.substring(0,submitData.length()-1); + if(StringUtils.isNotEmpty(submitData)){ + submitData = submitData.substring(0,submitData.length()-1); + } wds.setSubmitData(submitData); baseMapper.deleteDj(wds); this.save(wds); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 4d0ce3d3..66a898b4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -229,6 +229,7 @@ public class WjxWjxxController extends JeecgController zyInfo.setXkrs(kcKechengbiao.getXkrs()); zyInfo.setScore("0"); zyInfo.setAtype(zyInfo.getAtype()); + zyInfo.setKcmc(kcKechengbiao.getKcmc()); wjxWjxxService.save(zyInfo); return Result.OK("添加成功！"); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java index c31b5b8b..3c8903f9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java @@ -110,7 +110,6 @@ public class WjxWjxx implements Serializable { private String score;//占比 private String kcnr;//占比 - @ApiModelProperty(value = "答卷状态标识") @TableField(exist = false) private String flag;// -1 未答卷 0已答卷 1已答卷查询 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 79a11388..e87d778a 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 @@ -250,13 +250,17 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl map.put("q_index",wWjxWjxxTmlb.getWjIndex()); map.put("q_type",wWjxWjxxTmlb.getWjType()); map.put("q_title",wWjxWjxxTmlb.getWjTitle()); - map.put("is_requir",true); if(wjlx.equals("6")){ - if(wWjxWjxxTmlb.getWjScore()!=null){ - map.put("q_score",wWjxWjxxTmlb.getWjScore()); + if(wWjxWjxxTmlb.getWjType() != 8){ + if(wWjxWjxxTmlb.getWjScore()!=null){ + map.put("q_score",wWjxWjxxTmlb.getWjScore()); + } + map.put("is_requir",true); + map.put("q_ceshi",true); + map.put("is_toupiao",3); + }else{ + map.put("is_requir",false); } - map.put("q_ceshi",true); - map.put("is_toupiao",3); } if(wWjxWjxxTmlb.getWjType() == 3 || wWjxWjxxTmlb.getWjType() == 4){ //单选和多选 @@ -280,6 +284,9 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl } }else if(wWjxWjxxTmlb.getWjType() == 6){ //多项填空,预留，之后有需求再开发 + }else if(wWjxWjxxTmlb.getWjType() == 8){ + //文件题目 + map.put("q_subtype",8); } JSONObject json = new JSONObject(map); questionsList.add(json); 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 3dbbd345..e106dae0 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 @@ -95,6 +95,8 @@ public class WjxWjxxTmlb implements Serializable { private java.lang.String wjSfqh;//是否切换 0系统 1自定义 + private String picPath; + @TableField(exist = false) private String itemSelected; 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 a2fe27c9..46b14dc2 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 @@ -84,6 +84,7 @@ public class WjxWjxxTmlbPage { private java.lang.String prompt; private String itemSelected; + private String picPath; private java.lang.String wjSfqh;//是否切换 0系统 1自定义 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 cad2706a..8d74c5fd 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 @@ -391,12 +391,12 @@ public class ZyInfoController extends JeecgController { kcKechengbiaoQueryWrapper.last("limit 1"); KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); for(Xxhbbks xxhbbks:list){ -// ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); -// zyInfoStudent.setMainId(zyInfo.getId()); -// zyInfoStudent.setCreateBy(xxhbbks.getXh()); -// zyInfoStudent.setStudentName(xxhbbks.getXm()); -// zyInfoStudent.setZyLeixing(zyInfo.getZyLeixing()); -// zyInfoStudentService.save(zyInfoStudent); + ZyInfoStudent zyInfoStudent = new ZyInfoStudent(); + zyInfoStudent.setMainId(zyInfo.getId()); + zyInfoStudent.setCreateBy(xxhbbks.getXh()); + zyInfoStudent.setStudentName(xxhbbks.getXm()); + zyInfoStudent.setZyLeixing(zyInfo.getZyLeixing()); + zyInfoStudentService.save(zyInfoStudent); //作业代办提醒 ZyDbtx zyDbtx = new ZyDbtx();