From 861e9b1eb145094dff6d1caf3dba30d7ce0e11d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 02 Mar 2024 17:40:38 +0800
Subject: [PATCH] 房屋查询过滤
---
src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/impl/TaskPlaceSelfCheckServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/impl/TaskPlaceSelfCheckServiceImpl.java b/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/impl/TaskPlaceSelfCheckServiceImpl.java
index be205af..c4b66f6 100644
--- a/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/impl/TaskPlaceSelfCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/impl/TaskPlaceSelfCheckServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
+import org.springblade.common.utils.AuthUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
@@ -72,21 +73,21 @@
@Override
public IPage<TaskPlaceSelfCheckVO> selectTaskPlaceSelfCheckPage(IPage<TaskPlaceSelfCheckVO> page, TaskPlaceSelfCheckVO taskPlaceSelfCheck) {
List<String> strings = new ArrayList<>();
- if (null!=taskPlaceSelfCheck.getNineType()){
+ if (null != taskPlaceSelfCheck.getNineType()) {
QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("dict_key",taskPlaceSelfCheck.getNineType()).eq("code","nineType");
+ queryWrapper.eq("is_deleted", 0).eq("dict_key", taskPlaceSelfCheck.getNineType()).eq("code", "nineType");
// 先查询当前
DictBiz one = dictBizService.getOne(queryWrapper);
// 查询本身和子集的key
List<DictBiz> list = dictBizService.getList("nineType", one.getId());
- if (list.size()==0){
+ if (list.size() == 0) {
strings.add(taskPlaceSelfCheck.getNineType().toString());
- }else {
+ } else {
strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
}
}
// 公共参数设置
- CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskPlaceSelfCheckVO.class,taskPlaceSelfCheck);
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskPlaceSelfCheckVO.class, taskPlaceSelfCheck);
List<TaskPlaceSelfCheckVO> placeCheckVOS = baseMapper.selectTaskPlaceSelfCheckPage(page,
taskPlaceSelfCheck,
commonParamSet.getIsAdministrator(),
@@ -164,12 +165,11 @@
item.setCreateUser(AuthUtil.getUserId());
});
List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
- boolean b = bean.saveBatch(collect);
- updateById(taskPlaceSelfCheck);
- if (b) {
- return b;
+ if (collect.size() > 0) {
+ bean.saveBatch(collect);
}
- throw new Exception("保存失败！");
+ updateById(taskPlaceSelfCheck);
+ return save;
}
return false;
}
@@ -204,27 +204,28 @@
/**
* 导出消防自查信息
+ *
* @param taskPlaceSelfCheck
* @return
*/
@Override
public List<TaskPlaceSelfCheckExcel> exportTaskPlaceSelfCheck(TaskPlaceSelfCheckVO taskPlaceSelfCheck) {
List<String> strings = new ArrayList<>();
- if (null!=taskPlaceSelfCheck.getNineType()){
+ if (null != taskPlaceSelfCheck.getNineType()) {
QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("dict_key",taskPlaceSelfCheck.getNineType()).eq("code","nineType");
+ queryWrapper.eq("is_deleted", 0).eq("dict_key", taskPlaceSelfCheck.getNineType()).eq("code", "nineType");
// 先查询当前
DictBiz one = dictBizService.getOne(queryWrapper);
// 查询本身和子集的key
List<DictBiz> list = dictBizService.getList("nineType", one.getId());
- if (list.size()==0){
+ if (list.size() == 0) {
strings.add(taskPlaceSelfCheck.getNineType().toString());
- }else {
+ } else {
strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
}
}
// 公共参数设置
- CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskPlaceSelfCheckVO.class,taskPlaceSelfCheck);
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskPlaceSelfCheckVO.class, taskPlaceSelfCheck);
List<TaskPlaceSelfCheckExcel> taskPlaceSelfCheckExcels = baseMapper.exportTaskPlaceSelfCheck(
strings,
taskPlaceSelfCheck,
@@ -248,4 +249,14 @@
}
return taskPlaceSelfCheckExcels;
}
+
+ @Override
+ public Integer getCount(String neiCode, int i) {
+ // 获取请求头中的角色别名
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (AuthUtils.isMj(roleName)) {
+ return baseMapper.getCount(neiCode, i, AuthUtil.getUserId());
+ }
+ return 0;
+ }
}
--
Gitblit v1.9.3