From 7b9a22fc7d8304178718ab51d12465009f639b45 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 15 Jan 2025 17:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E4=BD=9C=E5=BC=8A=E3=80=81=E4=BA=92?=
 =?UTF-8?q?=E8=AF=84=E8=B0=83=E6=95=B4=EF=BC=9A=20=E4=BD=9C=E5=BC=8A?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E6=94=BE=E5=88=B0=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=87=8C=20=E8=AF=BE=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=9D=E5=AD=98=E6=97=B6=20=E4=BA=92=E8=AF=84=20?=
 =?UTF-8?q?=E5=92=8C=E6=9F=A5=E9=87=8D=20=E5=90=A6=E6=97=B6=E6=B8=85?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E4=BD=9C=E7=AD=94=E6=97=B6=E9=99=90?=
 =?UTF-8?q?=E5=90=8E=E5=8A=A0=E6=8F=90=E7=A4=BA=20=E9=99=90=E6=97=B6?=
 =?UTF-8?q?=E5=A4=9A=E5=B0=91=E5=88=86=E9=92=9F=E5=86=85=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=B6=85=E8=BF=87=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=99=E7=AE=97=E4=B8=80=E6=AC=A1=E4=BD=9C=E5=BC=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml    |  4 ++--
 .../controller/WjxDjxxFzbtjController.java             |  1 +
 .../modules/kc/wjxDjxxFzbtj/entity/WjxDjxxFzbtj.java   |  2 +-
 .../modules/kc/zyInfo/controller/ZyInfoController.java |  4 ++--
 .../org/jeecg/modules/kc/zyInfo/entity/ZyInfo.java     |  1 +
 .../jeecg/modules/kc/zyInfo/mapper/ZyInfoMapper.java   |  4 ++++
 .../modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml      |  8 ++++++++
 .../modules/kc/zyInfo/service/IZyInfoService.java      |  4 ++++
 .../kc/zyInfo/service/impl/ZyInfoServiceImpl.java      | 10 ++++++++++
 9 files changed, 33 insertions(+), 5 deletions(-)

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 f14005a0..a869249c 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
@@ -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
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/controller/WjxDjxxFzbtjController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/controller/WjxDjxxFzbtjController.java
index 1d9a5a17..def25a67 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/controller/WjxDjxxFzbtjController.java
+++ b/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);
     }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/entity/WjxDjxxFzbtj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/entity/WjxDjxxFzbtj.java
index 2bce2f6e..4bb17ec6 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxxFzbtj/entity/WjxDjxxFzbtj.java
+++ b/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操作；
      */
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 17bbde7b..e76b5aea 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
@@ -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<>();
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 10cde73d..0df94329 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
@@ -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")
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 d22f3b0d..fa114ccd 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
@@ -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);
 }
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 7aca7fd7..b2d0d69f 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
@@ -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,
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 6bd1e19b..214ef765 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
@@ -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);
 }
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 e34e0773..a37e241e 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
@@ -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";//东师