From 66d86432e40b188be9b1c178f0af3391dd398b39 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 02:57:10 +0800
Subject: [PATCH] 运维公司数据权限
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 3 +++
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 7 +++++--
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 2 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ContractQuery.java | 2 ++
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 2 ++
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 10 ++++++----
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 1 +
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 16 ++++++++--------
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 3 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 5 +++++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java | 2 ++
11 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
index 90fc639..c96a6a5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
@@ -21,5 +21,7 @@
private String unitName;
+ private Integer unitId;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ContractQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ContractQuery.java
index 09eea5f..85af2e9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ContractQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ContractQuery.java
@@ -21,4 +21,6 @@
@ApiModelProperty("鐘舵��")
private String status;
+ private Integer unitId;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index a6c123a..1712e99 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -47,5 +47,10 @@
* 鐘舵��
*/
private String status;
+
+ /**
+ * 鍗曚綅id
+ */
+ private Integer unitId;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index eab4a39..10c8a12 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -22,6 +22,7 @@
import com.ycl.platform.service.ICalculateRuleService;
import com.ycl.system.Result;
import com.ycl.system.page.PageUtil;
+import com.ycl.utils.SecurityUtils;
import enumeration.general.CalculateReportStatusEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@@ -124,6 +125,7 @@
@Override
public Result page(CalculateReportQuery query) {
IPage<CalculateReportVO> page = PageUtil.getPage(query, CalculateReportVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.page(query, page);
page.getRecords().stream().forEach(item -> {
if (Objects.isNull(item)) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
index 17c9481..3a38040 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -9,6 +9,7 @@
import com.ycl.platform.mapper.ContractResultRecordMapper;
import com.ycl.platform.service.IContractResultService;
import com.ycl.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
@@ -23,11 +24,11 @@
* @date 2024-04-01
*/
@Service
+@RequiredArgsConstructor
public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService {
- @Autowired
- private ContractResultMapper checkResultMapper;
- @Autowired
- private ContractResultRecordMapper contractResultRecordMapper;
+
+ private final ContractResultMapper checkResultMapper;
+ private final ContractResultRecordMapper contractResultRecordMapper;
/**
@@ -49,6 +50,7 @@
*/
@Override
public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
+ contractResult.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
return checkResultMapper.selectCheckResultList(contractResult);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
index 9972655..4010d38 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
@@ -11,6 +11,7 @@
import com.ycl.system.entity.SysUser;
import com.ycl.utils.SecurityUtils;
import enumeration.general.AuditingStatus;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,15 +28,13 @@
* @date 2024-04-01
*/
@Service
+@RequiredArgsConstructor
public class ContractScoreServiceImpl extends ServiceImpl<ContractScoreMapper, ContractScore> implements IContractScoreService {
- @Autowired
- private ContractScoreMapper contractScoreMapper;
- @Autowired
- private YwUnitMapper ywunitMapper;
- @Autowired
- private TContractMapper contractMapper;
- @Autowired
- private CalculateRuleMapper calculateRuleMapper;
+
+ private final ContractScoreMapper contractScoreMapper;
+ private final YwUnitMapper ywunitMapper;
+ private final TContractMapper contractMapper;
+ private final CalculateRuleMapper calculateRuleMapper;
/**
* 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
@@ -45,6 +44,7 @@
*/
@Override
public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
+ contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
return contractScoreMapper.selectDefaultScoreList(contractScore);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
index 7f6b6f0..bc872f6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -22,6 +22,7 @@
import com.ycl.system.Result;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
+import com.ycl.utils.SecurityUtils;
import com.ycl.utils.StringUtils;
import enumeration.ContractStatus;
import enumeration.general.RuleDeductCategoryEnum;
@@ -164,6 +165,7 @@
@Override
public Result selectAll(ContractQuery query) {
IPage<ContractVO> page = PageUtil.getPage(query, ContractVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.getPage(page, query);
page.getRecords().stream().forEach(contract -> {
Date now = new Date();
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 8b4cfe0..14ddb2e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -464,6 +464,7 @@
@Override
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.page(page, query);
if (! CollectionUtils.isEmpty(page.getRecords())) {
page.getRecords().stream().forEach(item -> {
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index 85e8d77..2f3ec80 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -40,6 +40,9 @@
<if test="query.unitName != null and query.unitName != '' ">
AND tyu.unit_name like concat('%', #{query.unitName}, '%')
</if>
+ <if test="query.unitId != null">
+ AND tyu.id = #{query.unitId}
+ </if>
</where>
</select>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
index 215d217..1620c03 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -17,6 +17,9 @@
from t_contract a
left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
where a.deleted = 0
+ <if test="query.unitId != null">
+ and a.unit_id = #{query.unitId}
+ </if>
<if test="query.name != null and query.name != ''">
and a.name like concat('%', #{query.name}, '%')
</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index caddc95..fd1eae9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -42,13 +42,16 @@
t_work_order wo
INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
WHERE
wo.deleted = 0
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
@@ -87,7 +90,7 @@
INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+ INNER JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0
LEFT JOIN sys_user su ON su.user_id = odr.user_id
--
Gitblit v1.8.0