diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java index 4b02318..6345c58 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java @@ -95,6 +95,7 @@ public class KcKetangbiaoController extends JeecgController zjSqxxQueryWrapper = new QueryWrapper<>(); zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); zjSqxxQueryWrapper.eq("sqfw","1"); + zjSqxxQueryWrapper.eq("sqzt","0"); ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); String sfjx = "0"; if(zjSqxx!=null){ diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java index c17b03c..f2c21c6 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.xxhbjwxtjxrw.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,8 +10,12 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw; import org.jeecg.modules.demo.xxhbjwxtjxrw.service.IXxhbjwxtjxrwService; @@ -20,6 +25,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -50,7 +57,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class XxhbjwxtjxrwController extends JeecgController { @Autowired private IXxhbjwxtjxrwService xxhbjwxtjxrwService; - + + @Autowired + private IZjSqxxService zjSqxxService; /** * 分页列表查询 * @@ -68,6 +77,40 @@ public class XxhbjwxtjxrwController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtjxrw, req.getParameterMap()); + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","0"); + zjSqxxQueryWrapper.eq("sqzt","0"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } +// if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ +// queryWrapper.in("xn",zjSqxx.getXnxq().split(",")); +// } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + queryWrapper.in("kkyxmc",zjSqxx.getKkdw().split(",")); + } + if(StringUtils.isNotBlank(zjSqxx.getKcmc())){ + queryWrapper.in("kcmc",zjSqxx.getKcmc().split(",")); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + queryWrapper.in("kclb",zjSqxx.getKclb().split(",")); + } + } + if(StringUtils.equals("1",sfjx)){ + return Result.error("您未在授权期限内,不能进行查询!"); + } + + Page page = new Page(pageNo, pageSize); IPage pageList = xxhbjwxtjxrwService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyHuizongController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyHuizongController.java index f04df80..c556702 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyHuizongController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/controller/ZyHuizongController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.demo.zyHuizong.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,9 +10,15 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; import org.jeecg.modules.demo.zyHuizong.entity.ZyHuizong; import org.jeecg.modules.demo.zyHuizong.service.IZyHuizongService; @@ -50,7 +57,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class ZyHuizongController extends JeecgController { @Autowired private IZyHuizongService zyHuizongService; - + + @Autowired + private IZjSqxxService zjSqxxService; /** * 分页列表查询 * @@ -68,6 +77,37 @@ public class ZyHuizongController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyHuizong, req.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","0"); + zjSqxxQueryWrapper.eq("sqzt","0"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + queryWrapper.in("xnxq",zjSqxx.getXnxq().split(",")); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + queryWrapper.in("xymc",zjSqxx.getKkdw().split(",")); + } + if(StringUtils.isNotBlank(zjSqxx.getKcmc())){ + queryWrapper.in("kcmc",zjSqxx.getKcmc().split(",")); + } +// if(StringUtils.isNotBlank(zjSqxx.getKclb())){ +// queryWrapper.in("kclb",zjSqxx.getKclb().split(",")); +// } + } + if(StringUtils.equals("1",sfjx)){ + return Result.error("您未在授权期限内,不能进行查询!"); + } Page page = new Page(pageNo, pageSize); IPage pageList = zyHuizongService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue b/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue index 68211ff..da40e56 100644 --- a/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue +++ b/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue @@ -17,8 +17,8 @@ import { ref } from 'vue'; import ZyHuizongList from '/@/views/bl/zyHuizong/ZyHuizongList.vue'; import ZyHuizongXiangxiList from '/@/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue'; -import XxhbjwxtjxrwList from '/@/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue'; -import XxhbjwxtxsmdList from '/@/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue'; +import XxhbjwxtjxrwList from '/@/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue'; +import XxhbjwxtxsmdList from '/@/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue'; const activeKey = ref('1'); diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue new file mode 100644 index 0000000..4fdf790 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue new file mode 100644 index 0000000..69c2c95 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList2.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue index d24874e..45da966 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue @@ -51,11 +51,11 @@ - + @@ -151,11 +151,11 @@ - + @@ -198,11 +198,11 @@ - + @@ -259,6 +259,7 @@ kcmc: '', kkdw: '', sqzt: '', + kclb: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue index 39d0cdc..1009d15 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue @@ -47,7 +47,7 @@ - + @@ -103,6 +103,7 @@ + @@ -147,7 +148,7 @@ - + @@ -172,7 +173,8 @@ - + +