From 07b344e51076a0307c1ac1be52d59436abb32fbf Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 18 九月 2026 14:14:36 +0800
Subject: [PATCH] 添加了 从芯跃智联 api获取定位数据和电压
---
src/modules/report/controller/admin/dailysorter.ts | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/modules/report/controller/admin/dailysorter.ts b/src/modules/report/controller/admin/dailysorter.ts
index 7b28a35..bf25856 100644
--- a/src/modules/report/controller/admin/dailysorter.ts
+++ b/src/modules/report/controller/admin/dailysorter.ts
@@ -2,6 +2,7 @@
import { ReportDailySorterEntity } from '../../entity/dailysorter';
import { ReportDailySorterService } from '../../service/dailysorter';
import { BaseSysDepartmentEntity } from '../../../base/entity/sys/department';
+import { BasicdataSiteEntity } from '../../../basicdata/entity/site';
import { WithDeptFilterWhere } from '../../../base/middleware/with-dept-filter-where';
/**
@@ -14,7 +15,7 @@
pageQueryOp: {
keyWordLikeFields: ['a.businessName', 'a.businessId'],
fieldEq: ['a.date', 'a.businessId', 'a.attendanceStatus'],
- select: ['a.*', 'b.name AS departmentName'],
+ select: ['a.*', 'b.name AS departmentName', 'c.businessName AS workSiteName'],
join: [
{
entity: BaseSysDepartmentEntity,
@@ -22,6 +23,12 @@
condition: 'a.departmentId = b.id',
type: 'leftJoin',
},
+ {
+ entity: BasicdataSiteEntity,
+ alias: 'c',
+ condition: 'a.workSiteId = c.businessId',
+ type: 'leftJoin',
+ },
],
where: async ctx => {
const conditions: any[][] = [];
--
Gitblit v1.9.1