From cd35d65daa2fb81ebb04823f045e6baf68eaddde Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期六, 10 十月 2026 10:10:15 +0800
Subject: [PATCH] 大部分页面增加按部门单位检索的功能
---
src/modules/basicdata/controller/admin/iot.ts | 2 +-
src/modules/push/controller/admin/siteweight.ts | 2 +-
src/modules/report/controller/admin/dailysite.ts | 2 +-
src/modules/report/controller/admin/dailyvehicle.ts | 2 +-
src/modules/report/controller/admin/dailysorter.ts | 2 +-
src/modules/push/controller/admin/vehiclegps.ts | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/basicdata/controller/admin/iot.ts b/src/modules/basicdata/controller/admin/iot.ts
index 343ee70..cdf3ba5 100644
--- a/src/modules/basicdata/controller/admin/iot.ts
+++ b/src/modules/basicdata/controller/admin/iot.ts
@@ -14,7 +14,7 @@
service: BasicdataIotService,
pageQueryOp: {
keyWordLikeFields: ['a.iotName', 'a.iotCode'],
- fieldEq: ['a.iotTypeCode', 'a.status', 'a.departmentName'],
+ fieldEq: ['a.iotTypeCode', 'a.status', 'a.departmentId'],
select: ['a.*', 'b.name AS departmentName'],
join: [
{
diff --git a/src/modules/push/controller/admin/siteweight.ts b/src/modules/push/controller/admin/siteweight.ts
index 9e16013..cb26cfd 100644
--- a/src/modules/push/controller/admin/siteweight.ts
+++ b/src/modules/push/controller/admin/siteweight.ts
@@ -21,7 +21,7 @@
'd.businessName AS businessName', 'd.siteType AS siteType', // 鍨冨溇鍚嶇О
],
- fieldEq: ['d.siteType'],
+ fieldEq: ['d.siteType', 'a.departmentId'],
fieldLike: ['a.deviceNo'],
join: [
{
diff --git a/src/modules/push/controller/admin/vehiclegps.ts b/src/modules/push/controller/admin/vehiclegps.ts
index 7f3c7de..a810a9d 100644
--- a/src/modules/push/controller/admin/vehiclegps.ts
+++ b/src/modules/push/controller/admin/vehiclegps.ts
@@ -14,7 +14,7 @@
service: PushVehicleGpsService,
pageQueryOp: {
keyWordLikeFields: ['a.sn', 'a.vehicleNo'],
- fieldEq: ['a.status'],
+ fieldEq: ['a.status', 'a.departmentId'],
select: ['a.*', 'b.name AS departmentName'],
join: [
{
diff --git a/src/modules/report/controller/admin/dailysite.ts b/src/modules/report/controller/admin/dailysite.ts
index 19881c0..3f30a61 100644
--- a/src/modules/report/controller/admin/dailysite.ts
+++ b/src/modules/report/controller/admin/dailysite.ts
@@ -13,7 +13,7 @@
service: ReportDailysiteService,
pageQueryOp: {
keyWordLikeFields: ['a.siteName'],
- fieldEq: ['a.date', 'a.siteId'],
+ fieldEq: ['a.date', 'a.siteId', 'a.departmentId'],
select: ['a.*', 'b.name AS departmentName'],
join: [
{
diff --git a/src/modules/report/controller/admin/dailysorter.ts b/src/modules/report/controller/admin/dailysorter.ts
index eee9564..cba267d 100644
--- a/src/modules/report/controller/admin/dailysorter.ts
+++ b/src/modules/report/controller/admin/dailysorter.ts
@@ -14,7 +14,7 @@
service: ReportDailySorterService,
pageQueryOp: {
keyWordLikeFields: ['a.businessName', 'a.businessId'],
- fieldEq: ['a.date', 'a.businessId', 'a.attendanceStatus'],
+ fieldEq: ['a.date', 'a.businessId', 'a.attendanceStatus', 'a.departmentId'],
select: ['a.*'],
where: async ctx => {
const conditions: any[][] = [];
diff --git a/src/modules/report/controller/admin/dailyvehicle.ts b/src/modules/report/controller/admin/dailyvehicle.ts
index 824989c..5f6dc6c 100644
--- a/src/modules/report/controller/admin/dailyvehicle.ts
+++ b/src/modules/report/controller/admin/dailyvehicle.ts
@@ -13,7 +13,7 @@
service: ReportDailyVehicleService,
pageQueryOp: {
keyWordLikeFields: ['a.vehicleNo'],
- fieldEq: ['a.date', 'a.vehicleNo'],
+ fieldEq: ['a.date', 'a.vehicleNo', 'a.departmentId'],
select: ['a.*', 'b.name AS departmentName'],
join: [
{
--
Gitblit v1.9.1