From b179a57d45e13fcd1d04617a6bea27b1a980ea4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 23 May 2024 22:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AE=80=E4=BB=8B=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/zyJxdg/controller/ZyJxdgController.java | 10 +++++++---
 .../org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java     |  8 ++++----
 .../kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java      |  6 ++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

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 9a81c50f..c9a363f9 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
@@ -68,8 +68,11 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		QueryWrapper<ZyJxdg> queryWrapper = QueryGenerator.initQueryWrapper(zyJxdg, req.getParameterMap());
+		QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
 		queryWrapper.eq("create_by",sysUser.getUsername());
+		queryWrapper.eq("rwbh",zyJxdg.getRwbh());
+		queryWrapper.ne("xqxn",zyJxdg.getXqxn());
+		queryWrapper.orderByDesc("create_time");
 		Page<ZyJxdg> page = new Page<ZyJxdg>(pageNo, pageSize);
 		IPage<ZyJxdg> pageList = zyJxdgService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -262,9 +265,10 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 
 	 @ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容")
 	 @GetMapping(value = "/getKcjsJxdg")
-	 public Result<ZyJxdg> getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh) {
+	 public Result<ZyJxdg> getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh,@RequestParam(name="xqxn",required=true) String xqxn) {
 		QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
 		 queryWrapper.eq("rwbh",rwbh);
+		 queryWrapper.eq("xqxn",xqxn);
 //		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 //		 queryWrapper.eq("create_by",sysUser.getUsername());
 		 queryWrapper.last("limit 1");
@@ -278,7 +282,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
 	 @RequestMapping(value = "/editJxdgyy", method = {RequestMethod.PUT,RequestMethod.POST})
 	 public Result<String> editJxdgyy(@RequestBody ZyJxdg zyJxdg) {
 		 zyJxdgService.editJxdgyy(zyJxdg);
-		 return Result.OK("编辑成功!");
+		 return Result.OK("引用成功!");
 	 }
 
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java
index b33e7792..f509405b 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java
@@ -40,16 +40,16 @@ public class ZyJxdg implements Serializable {
     @ApiModelProperty(value = "createBy")
     private java.lang.String createBy;
 	/**createTime*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "createTime")
     private java.util.Date createTime;
 	/**updateBy*/
     @ApiModelProperty(value = "updateBy")
     private java.lang.String updateBy;
 	/**updateTime*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "updateTime")
     private java.util.Date updateTime;
 	/**任务编号*/
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java
index 66dfc42b..cbe6a581 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java
@@ -25,12 +25,14 @@ public class ZyJxdgServiceImpl extends ServiceImpl<ZyJxdgMapper, ZyJxdg> impleme
 
         QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
         queryWrapper.eq("rwbh",zyJxdg.getRwbh());
+        queryWrapper.eq("xqxn",zyJxdg.getXqxn());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         queryWrapper.eq("create_by",sysUser.getUsername());
         queryWrapper.last("limit 1");
         ZyJxdg zyJxdgNew = baseMapper.selectOne(queryWrapper);
-        zyJxdgNew.setFilePath(zyJxdg.getFilePath());
-        zyJxdgNew.setSkjs(zyJxdg.getSkjs());
+//        zyJxdgNew.setFilePath(zyJxdg.getFilePath());
+//        zyJxdgNew.setSkjs(zyJxdg.getSkjs());
+        zyJxdgNew.setKcjs(zyJxdg.getKcjs());
         if(StringUtils.isEmpty(zyJxdgNew.getId())){
             baseMapper.insert(zyJxdgNew);
         }else{