From 862dbb5198a37e740cec5cea5595d1a4990ed51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 24 May 2024 16:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AE=80=E4=BB=8B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=8E=B7=E5=8F=96=E8=AF=BE=E7=A8=8B=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=BC=95=E7=94=A8=E4=BD=BF=E7=94=A8=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/ktgl/mapper/KcKechengbiaoMapper.java | 2 ++ .../kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml | 8 ++++++++ .../kc/ktgl/service/IKcKechengbiaoService.java | 2 ++ .../service/impl/KcKechengbiaoServiceImpl.java | 5 +++++ .../kc/zyJxdg/controller/ZyJxdgController.java | 18 +++++++++++++++++- .../jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java | 4 ++++ 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java index ca954334..f33e0654 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java @@ -43,4 +43,6 @@ public interface KcKechengbiaoMapper extends BaseMapper { IPage getKechengbiaolist(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage getStudentKclist(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + KcKechengbiao getKcbhByRwbh(KcKechengbiao kcKechengbiao); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index b21eec4b..1773672b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -186,4 +186,12 @@ from kc_kechengbiao kc,xxhbxsxkb xkb ${ew.customSqlSegment} + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java index f14f70aa..bd821d6a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java @@ -41,4 +41,6 @@ public interface IKcKechengbiaoService extends IService { IPage getKechengbiaolist(Page page, QueryWrapper queryWrapper); IPage getStudentKclist(Page page, QueryWrapper queryWrapper); + + public KcKechengbiao getKcbhByRwbh(KcKechengbiao kcKechengbiao); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java index 66fd3d9d..2b4170a6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java @@ -85,4 +85,9 @@ public class KcKechengbiaoServiceImpl extends ServiceImpl { @Autowired private IZyJxdgService zyJxdgService; + @Autowired + private IKcKechengbiaoService kcKechengbiaoService; + @Value("${jeecg.path.upload}") private String upLoadPath; @@ -70,7 +75,8 @@ public class ZyJxdgController extends JeecgController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("create_by",sysUser.getUsername()); - queryWrapper.eq("rwbh",zyJxdg.getRwbh()); + queryWrapper.eq("kcbh",zyJxdg.getKcbh()); + queryWrapper.ne("rwbh",zyJxdg.getRwbh()); queryWrapper.ne("xqxn",zyJxdg.getXqxn()); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); @@ -125,6 +131,16 @@ public class ZyJxdgController extends JeecgController { } } + KcKechengbiao kcKechengbiao = new KcKechengbiao(); + kcKechengbiao.setRwbh(zyJxdg.getRwbh()); + kcKechengbiao.setXqxn(zyJxdg.getXqxn()); + kcKechengbiao = kcKechengbiaoService.getKcbhByRwbh(kcKechengbiao); + if(kcKechengbiao != null){ + zyJxdg.setKcbh(kcKechengbiao.getKcbh()); + zyJxdg.setSkjs(kcKechengbiao.getSkjs()); + }else{ + zyJxdg.setKcbh("-1"); + } zyJxdgService.save(zyJxdg); 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 f509405b..3ed7dac6 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 @@ -52,6 +52,10 @@ public class ZyJxdg implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "updateTime") private java.util.Date updateTime; + /**任务编号*/ + @Excel(name = "课程编号", width = 15) + @ApiModelProperty(value = "课程编号") + private java.lang.String kcbh; /**任务编号*/ @Excel(name = "任务编号", width = 15) @ApiModelProperty(value = "任务编号")