diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java index d6ca01f9..0d3904ba 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java @@ -80,6 +80,8 @@ public class WjxDjxx { @ApiModelProperty(value = "答卷用时") private String answerSfm; + private String sfxysdpy;//是否需要手动批阅 + @ApiModelProperty(value = "学期学年") @TableField(exist = false) private String xqxn; @@ -99,6 +101,7 @@ public class WjxDjxx { @TableField(exist = false) private List wjxDjxxTmxxList; + @ApiModelProperty(value = "任务编号") @TableField(exist = false) private String rwbh; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmlbPage.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmlbPage.java index c851b7b3..3f8779da 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmlbPage.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmlbPage.java @@ -49,4 +49,9 @@ public class WjxDjxxTmlbPage { private String mainId; + private String title; + private Double wjScore; + private String sfxysdpy; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java index c9f47ff1..5c9b78f9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java @@ -49,4 +49,6 @@ public interface WjxDjxxMapper extends BaseMapper { String getDjnum(@Param("vid")String vid, @Param("wjIndex")Integer wjIndex, @Param("itemIndex")Integer itemIndex); String getDjnumType(@Param("vid")String vid, @Param("wjIndex")Integer wjIndex, @Param("itemIndex")Integer itemIndex, @Param("type")String type); + + void updateTotalScore(WjxDjxx wjxDjxx); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml index a8c4c392..26644be9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml @@ -50,6 +50,20 @@ and jid = #{jid} + + + update wjx_djxx + set + + sfxysdpy = #{sfxysdpy}, + + + total_score = ${totalScore}, + + where vid = #{vid} + and jid = #{jid} + + delete from wjx_djxx_tmxx where vid = #{vid} 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 5f3c70a7..9ea2fbda 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 @@ -129,12 +129,13 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl map.put("sojumpparm",user.getUsername());//自定义链接参数,用来透传用户ID //调用接口,提交 String result = wjxUtil.openapi(map,"1001001"); + String jidRes = ""; if(!result.equals("")){ JSONObject jsonResult = JSONObject.parseObject(result); if(jsonResult.getBoolean("result")){ JSONObject dataJson = jsonResult.getJSONObject("data"); String vidRes = dataJson.getString("vid"); - String jidRes = dataJson.getString("jid"); + jidRes = dataJson.getString("jid"); String sojumpparmRes = dataJson.getString("sojumpparm"); baseMapper.updateJid(sojumpparmRes,vidRes,jidRes); //调用接口,答卷查询 @@ -226,6 +227,48 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl } } + + + + String sfxgdjscore = "0";//是否修改答卷分数 + if(StringUtils.isNotBlank(jidRes)){ + for(WjxDjxxTmlbPage wjxDjxxTmlbPage:list){ + Integer WjIndex = wjxDjxxTmlbPage.getWjIndex(); + Integer wjType = wjxDjxxTmlbPage.getWjType(); + if(wjType == 8){ + sfxgdjscore = "1"; + String id = new DefaultIdentifierGenerator().nextId(new WjxDjxxTmxx()).toString(); + WjxDjxxTmxx wjxDjxxTmxx = new WjxDjxxTmxx(); + wjxDjxxTmxx.setVid(vid); + wjxDjxxTmxx.setJid(jidRes); + wjxDjxxTmxx.setUserId(user.getUsername()); + wjxDjxxTmxx.setCreateBy(user.getUsername()); + wjxDjxxTmxx.setCreateTime(new Date()); + wjxDjxxTmxx.setId(id); + wjxDjxxTmxx.setWjTitle(wjxDjxxTmlbPage.getTitle()); + wjxDjxxTmxx.setWjIndex(WjIndex); + wjxDjxxTmxx.setAnswerText(wjxDjxxTmlbPage.getWjAnswer()); + wjxDjxxTmxx.setItemScore(wjxDjxxTmlbPage.getWjScore()); + baseMapper.addDjTmxx(wjxDjxxTmxx); + } + } + } + + //修改答卷信息的总分 + if(StringUtils.equals(sfxgdjscore,"1")){ + try { + WjxDjxx wjxDjxx = new WjxDjxx(); + wjxDjxx.setVid(vid); + wjxDjxx.setJid(jidRes); + wjxDjxx.setTotalScore(20); + wjxDjxx.setSfxysdpy("1"); + baseMapper.updateTotalScore(wjxDjxx); + } catch (Exception e) { + e.printStackTrace(); + } + } + + //修改问卷状态 QueryWrapper wjxWjxxQueryWrapper = new QueryWrapper<>();