Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java

作弊统计 放到测验结果里
课程作业保存时 互评 和查重 否时清数据
作答时限后加提示 限时多少分钟内进行提交，超过时间则算一次作弊

jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml

@@ -160,7 +160,7 @@
     </select>
 
     <select id="findDjjgsPage" parameterType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx" resultType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx">
-        select a.atype,b.id,a.xqxn,a.kcmc,a.start_time,a.end_time,a.title,a.content,b.vid,b.jid,b.user_id,b.user_name,b.open_time,b.commit_time,b.score,b.total_score,b.answer_seconds,a.title
+        select a.atype,b.id,a.xqxn,a.kcmc,a.start_time,a.end_time,a.title,a.content,b.vid,b.jid,b.user_id,b.user_name,b.open_time,b.commit_time,b.score,b.total_score,b.answer_seconds,a.title,b.zbcs
         from wjx_wjxx a
         inner join wjx_djxx b on a.vid = b.vid
         where a.id = #{params.id}
@@ -196,7 +196,7 @@
     </select>
 
     <select id="findAllDjjgsPage" parameterType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx" resultType="org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx">
-        select a.atype,b.id,a.xqxn,a.kcmc,a.start_time,a.end_time,a.title,a.content,b.vid,b.jid,y.xh as user_id,y.xm as user_name,b.open_time,b.commit_time,b.score,b.total_score,ifnull(b.answer_seconds,-1) as answer_seconds,a.title,b.sfxysdpy
+        select a.atype,b.id,a.xqxn,a.kcmc,a.start_time,a.end_time,a.title,a.content,b.vid,b.jid,y.xh as user_id,y.xm as user_name,b.open_time,b.commit_time,b.score,b.total_score,ifnull(b.answer_seconds,-1) as answer_seconds,a.title,b.sfxysdpy,b.zbcs
         from wjx_wjxx a
         inner join (
         select a.xh,a.xm,b.KCAPZBBH

jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/controller/WjxDjxxFzbtjController.java

@@ -53,6 +53,7 @@ public class WjxDjxxFzbtjController extends JeecgController<WjxDjxxFzbtj, IWjxDj
                                                      HttpServletRequest req) {
         QueryWrapper<WjxDjxxFzbtj> queryWrapper = QueryGenerator.initQueryWrapper(wjxDjxxFzbtj, req.getParameterMap());
         Page<WjxDjxxFzbtj> page = new Page<WjxDjxxFzbtj>(pageNo, pageSize);
+        queryWrapper.orderByAsc("create_time");
         IPage<WjxDjxxFzbtj> pageList = wjxDjxxFzbtjService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/entity/WjxDjxxFzbtj.java

@@ -87,7 +87,7 @@ public class WjxDjxxFzbtj implements Serializable {
      */
     @Excel(name = "作弊类型1、退出全屏2、切屏3、考试超时4、开始答题", width = 15)
     @ApiModelProperty(value = "作弊类型1、退出全屏2、切屏3、考试超时4、开始答题")
-    private int type;
+    private Integer type;
     /**
      * 作弊内容：XX时间，XX操作；
      */

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java

@@ -287,8 +287,8 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody ZyInfo zyInfo) {
         zyInfoService.updateById(zyInfo);
-
+        if("0".equals(zyInfo.getXshpkg()))zyInfoService.removeHPData(zyInfo.getId());
-
+        if("0".equals(zyInfo.getSfcc()))zyInfoService.removeCCData(zyInfo.getId());
         ZyInfo zyInfo2 = zyInfoService.getById(zyInfo.getId());
         if (StringUtils.equals(zyInfo2.getZyStatus(), "1")) {
             QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java

@@ -92,6 +92,7 @@ public class ZyInfo implements Serializable {
 	/**外网通过率*/
 	@Excel(name = "外网通过率", width = 15)
     @ApiModelProperty(value = "外网通过率")
+    @TableField(updateStrategy = FieldStrategy.DEFAULT)
     private java.lang.Double wwtgl;
 	/**内网查重*/
 	@Excel(name = "内网查重", width = 15, dicCode = "yn")

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java

@@ -71,4 +71,8 @@ public interface ZyInfoMapper extends BaseMapper<ZyInfo> {
     int deleteXzxx(@Param("zyinfoId") String zyinfoId);
 
     int deleteXzryxx(@Param("zyinfoId") String zyinfoId);
+
+    int removeHPData(@Param("id") String id);
+
+    int removeCCData(@Param("id") String id);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml

@@ -21,6 +21,14 @@
         </collection>
     </resultMap>
 
+    <update id="removeHPData">
+        update zy_info set sfzzcj = null,xssfck = null,xshpjssj = null where id = #{id}
+    </update>
+
+    <update id="removeCCData">
+        update zy_info set wwtgl = null,wwcc = null,xncc = null,nwcc = null,aigccc = null where id = #{id}
+    </update>
+
     <select id="stuList" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfo">
         select distinct a.*,
                         b.id                                                                                       as stuId,

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/IZyInfoService.java

@@ -51,4 +51,8 @@ public interface IZyInfoService extends IService<ZyInfo> {
     List<ZyXzInfo> getxzxx(ZyInfo zyInfo);
 
     int saveData(String zyinfoId, Integer rs, List<ZyXzInfo> list);
+
+    int removeHPData(String id);
+
+    int removeCCData(String id);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/service/impl/ZyInfoServiceImpl.java

@@ -349,6 +349,16 @@ public class ZyInfoServiceImpl extends ServiceImpl<ZyInfoMapper, ZyInfo> impleme
         return list.size();
     }
 
+    @Override
+    public int removeHPData(String id) {
+        return baseMapper.removeHPData(id);
+    }
+
+    @Override
+    public int removeCCData(String id) {
+        return baseMapper.removeCCData(id);
+    }
+
     // appId
     private static final String appId = "wx031697a8ca09a5ce";//东师