From 9dfba88030f4f1a8e620e03e0d432439aaf0a99b Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 29 十一月 2023 16:48:52 +0800
Subject: [PATCH] ABC标识中心数据筛查
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java | 5 +++++
lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16(lnl)/2023_11_24.sql | 8 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IStreamService.java | 2 ++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml | 15 +++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java | 8 +++++++-
8 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
index bd29589..f97ca3c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.jeecg.dingtalk.api.user.vo.User;
import com.jeecg.dingtalk.api.user.vo.UserRole;
import org.jeecg.common.api.dto.message.MessageDTO;
@@ -112,9 +113,14 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = userService.getById(user.getId());
+ if(StringUtils.isNotBlank(sysUser.getAreaId())){
+ stream.setAreaId(sysUser.getAreaId());
+ }
QueryWrapper<Stream> queryWrapper = QueryGenerator.initQueryWrapper(stream, req.getParameterMap());
Page<Stream> page = new Page<Stream>(pageNo, pageSize);
- IPage<Stream> pageList = streamService.page(page, queryWrapper);
+ IPage<Stream> pageList = streamService.myPage(page, stream);
return Result.OK(pageList);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java
index b45c584..352cdba 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java
@@ -63,4 +63,6 @@
private java.lang.String type;
@TableField(exist = false)
private List<ABCAssessment> assessmentList;
+ @TableField(exist = false)
+ private String areaId;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java
index 3c59447..7e6ba2e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.Stream;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
/**
* @Description: 璁惧ABC璇勪环
@@ -10,5 +14,6 @@
* @Version: V1.0
*/
public interface StreamMapper extends BaseMapper<Stream> {
+ List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
index 9745c84..5a63a2b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.StreamMapper">
+ <select id="myPage" resultType="org.jeecg.modules.eam.entity.Stream">
+ select t1.*
+ from mom_eam_stream t1
+ left join sys_user t2 on t2.id = t1.create_by
+ where 1=1
+ <choose>
+ <when test="areaId != null and areaId != ''">
+ and t2.area_id = #{areaId}
+ </when>
+ <otherwise>
+ and t2.area_id = '-1'
+ </otherwise>
+ </choose>
+
+ </select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IStreamService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IStreamService.java
index a3c6816..af0b614 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IStreamService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IStreamService.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.Stream;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -27,6 +28,7 @@
* @param idList
*/
public void delBatchMain (Collection<? extends Serializable> idList);
+ public Page<Stream> myPage(Page<Stream> page,Stream stream);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java
index 282de52..60227ee 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.Stream;
import org.jeecg.modules.eam.mapper.StreamOperationMapper;
import org.jeecg.modules.eam.mapper.ABCAssessmentMapper;
@@ -46,4 +47,10 @@
}
}
+ @Override
+ public Page<Stream> myPage(Page<Stream> page, Stream stream) {
+ return page.setRecords(baseMapper.myPage(page,stream.getAreaId()));
+ }
+
+
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index d5ac493..65101da 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -197,6 +197,8 @@
private String homePath;
@Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
private String teamId;
+ @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+ private String areaId;
}
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16\050lnl\051/2023_11_24.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16\050lnl\051/2023_11_24.sql"
index afe9f47..612d22f 100644
--- "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16\050lnl\051/2023_11_24.sql"
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16\050lnl\051/2023_11_24.sql"
@@ -19,3 +19,11 @@
'SCHEMA', N'dbo',
'TABLE', N'mom_eam_equipment_report_repair',
'COLUMN', N'err_uda5'
+ALTER TABLE [dbo].[sys_user] ADD [area_id] nvarchar(32) NULL
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'涓績ID',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'sys_user',
+ 'COLUMN', N'area_id'
--
Gitblit v1.9.3