From a962579b636b055bb70ae2233787d42483eb4b3b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 14 四月 2026 15:20:22 +0800
Subject: [PATCH] feat(config): 添加部门ID字段到Mybatis处理器
---
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | 6 +++---
src/main/java/com/ruoyi/common/config/MybatisHandler.java | 3 +++
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 7 -------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/config/MybatisHandler.java b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
index 891410f..7f4b57f 100644
--- a/src/main/java/com/ruoyi/common/config/MybatisHandler.java
+++ b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
@@ -15,10 +15,12 @@
Integer userId = null;
Long tenantId = null;
String userName = null;
+ Long deptId = null;
try {
userId = SecurityUtils.getUserId().intValue();
tenantId = SecurityUtils.getLoginUser().getTenantId();
userName = SecurityUtils.getUsername();
+ deptId = SecurityUtils.getDeptId()[0];
} catch (Exception ignored) {
}
this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
@@ -29,6 +31,7 @@
this.strictInsertFill(metaObject, "updateUser", Long.class, userId == null ? 0 : userId.longValue());
this.strictInsertFill(metaObject, "createUserName", String.class, userName);
this.strictInsertFill(metaObject, "updateUserName", String.class, userName);
+ this.strictInsertFill(metaObject, "deptId", Long.class, deptId);
this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
index 5d13ffa..5a0e6ab 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -66,12 +66,12 @@
);
TimingTask timingTask = tasks.isEmpty() ? null : tasks.get(0);
if (timingTask == null) {
- throw new JobExecutionException("閹靛彞绗夐崚鏉跨暰閺冩湹鎹㈤崝? " + taskId);
+ throw new RuntimeException("瀹氭椂浠诲姟涓嶅瓨鍦細 " + taskId);
}
List<Long> deviceIds = resolveTaskIds(timingTask);
if (deviceIds.isEmpty()) {
- throw new JobExecutionException("鐎规碍妞傛禒璇插閺堫亪鍘ょ純顔款啎婢�? " + taskId);
+ throw new RuntimeException("璁惧涓嶅瓨鍦細 " + taskId);
}
for (Long deviceId : deviceIds) {
@@ -130,7 +130,7 @@
inspectionTask.setAreaId(deviceLedger.getAreaId());
inspectionTask.setInspectorId(timingTask.getInspectorIds());
inspectionTask.setInspectionLocation(timingTask.getInspectionLocation());
- inspectionTask.setRemarks("閼奉亜濮╅悽鐔稿灇閼奉亜鐣鹃弮鏈垫崲閸旑搹D: " + timingTask.getId());
+ inspectionTask.setRemarks("瀹氭椂鐢熸垚璁惧宸℃浠诲姟 ID: " + timingTask.getId());
inspectionTask.setRegistrantId(timingTask.getRegistrantId());
inspectionTask.setRegistrant(timingTask.getRegistrant());
inspectionTask.setFrequencyType(timingTask.getFrequencyType());
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index aaedff4..a85eea9 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -99,13 +99,6 @@
if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
item.setFutureTicketsAmount(BigDecimal.ZERO);
}
-// ProcurementPageDto procurementDto = new ProcurementPageDto();
-// procurementDto.setSalesLedgerProductId(item.getId());
-// procurementDto.setProductCategory(item.getProductCategory());
-// IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
-// BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");
-
-// ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
if (item.getApproveStatus() != 2) {
if (item.getHasSufficientStock() == 0) {
item.setApproveStatus(0);
--
Gitblit v1.9.3