From 52361b06061a00d67d24cbc0764eb3c956e85a0f Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 21 May 2024 17:53:44 +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

---
 .../mapper/xml/KcEvaluationsStatMapper.xml                  | 4 ++--
 .../modules/kc/ktgl/controller/KcKetangbiaoController.java  | 2 +-
 .../jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java    | 1 +
 .../jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 2 +-
 .../jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java | 1 +
 .../kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java       | 1 +
 .../zyInfoStudent/controller/ZyInfoStudentController.java   | 2 +-
 .../modules/kc/zyInfoStudent/entity/ZyInfoStudent.java      | 6 ++++++
 .../kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml     | 5 +++++
 .../modules/kc/zyJxdg/controller/ZyJxdgController.java      | 4 ++--
 .../jeecg/modules/system/controller/CommonController.java   | 2 +-
 11 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
index ad78029b..966686c0 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
@@ -9,7 +9,7 @@
         WHERE ev.id = evs.evaluationid
         AND ev.evaluationver = '3'
           and ev.source != '2'
-        and ev.up_date > '2024-02-01'
+<!--        and ev.up_date > '2024-02-01'-->
     </select>
 
     <select id="getYbtkbTwoSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
@@ -18,7 +18,7 @@
         WHERE ev.id = evs.evaluationid
         AND ev.evaluationver = '3'
         and ev.source = '2'
-        and ev.up_date > '2024-02-01'
+<!--        and ev.up_date > '2024-02-01'-->
     </select>
 
     <select id="getXstkbSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
index d0e83347..d723112d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
@@ -170,6 +170,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 		}
 		queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
 		queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
+		queryWrapper.orderByDesc("skrq");
 		Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
 
 		Set<String> idSet = Sets.newHashSet();
@@ -231,7 +232,6 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	}
 
 
-	
 	/**
 	 *   添加
 	 *
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java
index 5fc15843..598f5f57 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java
@@ -71,4 +71,5 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
     IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
 
     List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum kcKetangbiao);
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
index 6cd19f6f..706ed39a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
@@ -582,7 +582,7 @@
             fen.avgscore as jspjPjf
         from
             kc_ketangbiao a
-            left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.kechengbiaoid
+            inner join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.kechengbiaoid
         ${ew.customSqlSegment}
     </select>
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java
index 16628d5b..321afe07 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java
@@ -73,4 +73,5 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
     IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao);
 
     List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object);
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
index 4a5b7b3d..6c97550d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
@@ -185,4 +185,5 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
     public List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object) {
         return baseMapper.getKccountExportList(object);
     }
+
 }
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 2cc8b8a5..9b244494 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
@@ -79,7 +79,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper(zyInfoStudent, req.getParameterMap());
+		QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap());
 		Page<ZyInfoStudent> page = new Page<ZyInfoStudent>(pageNo, pageSize);
 		IPage<ZyInfoStudent> pageList = zyInfoStudentService.page(page, queryWrapper);
 		return Result.OK(pageList);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
index 0a2f1ae6..0272a25c 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
@@ -91,5 +91,11 @@ public class ZyInfoStudent implements Serializable {
     @TableField(exist = false)
     private String cateid;
 
+    @TableField(exist = false)
+    private String wwcc;
+    @TableField(exist = false)
+    private String nwcc;
+    @TableField(exist = false)
+    private String aigccc;
 
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml
index e93a1224..f69f16a0 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml
@@ -5,4 +5,9 @@
     <delete id="deleteMainId">
         delete from zy_info_student where main_id = #{mainId}
     </delete>
+    <select id="selectPage" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
+        select a.*,b.wwcc,b.nwcc,b.aigccc from zy_info_student a
+        left join zy_info b on a.main_id = b.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
\ No newline at end of file
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 d68a07b3..9a81c50f 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
@@ -123,7 +123,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 
 		}
 		zyJxdgService.save(zyJxdg);
-		return Result.OK("添加成功！");
+		return Result.OK("提交成功！");
 	}
 	
 	/**
@@ -185,7 +185,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 		}
 		update.eq("id",zyJxdg.getId());
 		zyJxdgService.update(update);
-		return Result.OK("编辑成功!");
+		return Result.OK("提交成功!");
 	}
 
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
index 613de9bc..e603b0b9 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
@@ -114,7 +114,7 @@ public class CommonController {
                 savePath = this.uploadLocal(file,bizPath);
             }
             */
-        }if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)) {
+        }else if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)) {
             FileTypeFilter.fileTypeFilter(file);
             savePath = this.uploadSftp(file,bizPath);
         }else{