From a381d61b0d5747797ef68828b47c5b6bd8b7112d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 18 Feb 2025 09:18:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=88=E6=9D=83=E8=8C=83?= =?UTF-8?q?=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lwKhcl/controller/LwKhclController.java | 5 +++++ .../modules/demo/lwKhcl/entity/LwKhcl.java | 3 +++ .../demo/lwKhcl/mapper/xml/LwKhclMapper.xml | 6 ++++++ .../zjSqxx/controller/ZjSqxxController.java | 19 ++++++++++++++++++- jeecgboot-vue3/.env | 2 +- .../src/views/bl/blJbzdjs/BlJbzdjsZjList.vue | 2 +- .../bl/zjSqxx/components/ZjSqxxEditForm.vue | 5 +++++ .../views/bl/zjSqxx/components/ZjSqxxForm.vue | 8 ++++---- 8 files changed, 43 insertions(+), 7 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java index b09af61..8de8393 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java @@ -554,6 +554,7 @@ public class LwKhclController extends JeecgController { String sfjx = "0"; String inBynf = ""; String inSsyxmc = ""; + String inZydl = ""; if(zjSqxx!=null){ Date date = new Date(); if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ @@ -570,6 +571,10 @@ public class LwKhclController extends JeecgController { inSsyxmc = zjSqxx.getKkdw(); lwKhcl.setInSsyxmc(inSsyxmc); } + if(StringUtils.isNotBlank(zjSqxx.getZydl())){ + inZydl = zjSqxx.getZydl(); + lwKhcl.setInZydl(inZydl); + } } if(StringUtils.equals("1",sfjx)){ return Result.error("您未在授权期限内，不能进行查询！"); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java index 095e24b..fcb9bc6 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java @@ -128,5 +128,8 @@ public class LwKhcl implements Serializable { private String inSsyxmc; @TableField(exist = false) private String bylwCjPar; + @TableField(exist = false) + private String inZydl; + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml index 18dd028..f41bcf3 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml @@ -167,6 +167,12 @@ #{item} + + and a.ssxnzymc in + + #{item} + + and a.lwzg is not null diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java index 19211ee..4f64a60 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java @@ -186,7 +186,24 @@ public class ZjSqxxController extends JeecgController { */ @PostMapping(value = "/addNew") public Result addNew(@RequestBody ZjSqxx zjSqxx) { - zjSqxxService.addNew(zjSqxx); + + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_id",zjSqxx.getUserId()); + + List sqDataList = zjSqxx.getSqDataList(); + String sqfw = ""; + if(sqDataList.size()>0){ + sqfw = sqDataList.get(0).getSqfw(); + }else{ + return Result.error("请选择授权范围！"); + } + queryWrapper.eq("sqfw",sqfw); + if(zjSqxxService.getOne(queryWrapper)!=null){ + return Result.error("该用户已存在此授权信息，请查询后修改！"); + } else { + zjSqxxService.save(zjSqxx); + } return Result.OK("添加成功！"); } diff --git a/jeecgboot-vue3/.env b/jeecgboot-vue3/.env index 67c8f25..1856990 100644 --- a/jeecgboot-vue3/.env +++ b/jeecgboot-vue3/.env @@ -11,7 +11,7 @@ VITE_GLOB_APP_SHORT_NAME = 智慧教学服务中心 VITE_GLOB_APP_CAS_BASE_URL=https://authserver.nenu.edu.cn/authserver # 是否开启单点登录 -VITE_GLOB_APP_OPEN_SSO = false +VITE_GLOB_APP_OPEN_SSO = true # 开启微前端模式 VITE_GLOB_APP_OPEN_QIANKUN=true diff --git a/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsZjList.vue b/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsZjList.vue index 22273da..f88fcc8 100644 --- a/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsZjList.vue +++ b/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsZjList.vue @@ -126,7 +126,7 @@ width: 260, }, beforeFetch: async (params) => { - params.column = 'status,createTime',params.order = 'desc'; + params.column = 'zxsj,status',params.order = 'desc'; return Object.assign(params, queryParam); }, }, diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue index af99ae7..8072b53 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue @@ -151,6 +151,11 @@ + + + + + +