Merge branch 'long-0507'
This commit is contained in:
@@ -9,6 +9,7 @@ use app\adminapi\logic\tcm\DiagnosisLogic;
|
||||
use app\common\model\finance\AccountCost;
|
||||
use app\common\service\DataScope\DataScopeService;
|
||||
use app\common\service\qywx\MediaChannelService;
|
||||
use think\db\Query;
|
||||
use think\facade\Db;
|
||||
|
||||
class ConversionLogic
|
||||
@@ -68,8 +69,6 @@ class ConversionLogic
|
||||
|
||||
$entities = self::loadEntities($dimension, $params, $visibleAdminIds);
|
||||
$entityIds = array_keys($entities);
|
||||
$allocationEntities = self::loadEntities($dimension, $params, $visibleAdminIds);
|
||||
$allocationEntityIds = array_keys($allocationEntities);
|
||||
|
||||
if ($entityIds === []) {
|
||||
$result = [
|
||||
@@ -96,8 +95,9 @@ class ConversionLogic
|
||||
}
|
||||
|
||||
$adminToDeptIds = self::loadAdminDeptMap();
|
||||
self::hydrateFanStats($allocationEntities, $dimension, $allocationEntityIds, $adminToDeptIds, $startTimestamp, $endTimestamp, $mediaChannel, $visibleAdminIds);
|
||||
self::hydrateFanStats($entities, $dimension, $entityIds, $adminToDeptIds, $startTimestamp, $endTimestamp, $mediaChannel, $visibleAdminIds);
|
||||
$allocationEntities = $entities;
|
||||
$allocationEntityIds = $entityIds;
|
||||
self::hydrateAppointmentStats($entities, $dimension, $entityIds, $adminToDeptIds, $startTimestamp, $endTimestamp, $startDate, $endDate, $mediaChannel, $visibleAdminIds);
|
||||
self::hydrateOrderAndAmountStats($entities, $dimension, $entityIds, $adminToDeptIds, $startTimestamp, $endTimestamp, $mediaChannel, $visibleAdminIds);
|
||||
// 数据隔离：可见部门 = 可见 admin 所属部门并集；用于 account_cost 与下游 cost 分摊。
|
||||
@@ -257,11 +257,13 @@ class ConversionLogic
|
||||
?array $adminInfo = null
|
||||
): array
|
||||
{
|
||||
$allowedDeptIds = self::resolveFilterAllowedDeptIds($visibleAdminIds, $eligibleDeptIds);
|
||||
|
||||
return [
|
||||
'departments' => self::buildDepartmentOptions($visibleAdminIds, $eligibleDeptIds),
|
||||
'departments' => self::buildDepartmentOptions($visibleAdminIds, $eligibleDeptIds, $allowedDeptIds),
|
||||
'assistants' => DiagnosisLogic::getAssistants($adminId, $adminInfo),
|
||||
'doctors' => self::buildDoctorOptions($visibleAdminIds),
|
||||
'media_channels' => self::buildMediaChannelOptions($visibleAdminIds, $eligibleDeptIds),
|
||||
'media_channels' => self::buildMediaChannelOptions($visibleAdminIds, $eligibleDeptIds, $allowedDeptIds),
|
||||
];
|
||||
}
|
||||
|
||||
@@ -272,36 +274,19 @@ class ConversionLogic
|
||||
*
|
||||
* @return array<int, array<string, mixed>>
|
||||
*/
|
||||
private static function buildDepartmentOptions(?array $visibleAdminIds, array $eligibleDeptIds): array
|
||||
private static function buildDepartmentOptions(?array $visibleAdminIds, array $eligibleDeptIds, ?array $allowedDeptIds = null): array
|
||||
{
|
||||
$allTree = DeptLogic::getAllData();
|
||||
if ($visibleAdminIds === null) {
|
||||
return $allTree;
|
||||
}
|
||||
|
||||
$allowedDeptIds = [];
|
||||
if ($visibleAdminIds !== []) {
|
||||
$deptIds = Db::name('admin_dept')
|
||||
->whereIn('admin_id', $visibleAdminIds)
|
||||
->column('dept_id');
|
||||
foreach ($deptIds as $deptId) {
|
||||
$deptId = (int)$deptId;
|
||||
if ($deptId > 0) {
|
||||
$allowedDeptIds[$deptId] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($eligibleDeptIds as $deptId) {
|
||||
$deptId = (int)$deptId;
|
||||
if ($deptId > 0) {
|
||||
$allowedDeptIds[$deptId] = true;
|
||||
}
|
||||
}
|
||||
$allowedDeptIds ??= self::resolveFilterAllowedDeptIds($visibleAdminIds, $eligibleDeptIds);
|
||||
if ($allowedDeptIds === []) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return self::filterDeptTreeByIds($allTree, array_keys($allowedDeptIds));
|
||||
return self::filterDeptTreeByIds($allTree, $allowedDeptIds);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -340,7 +325,7 @@ class ConversionLogic
|
||||
*
|
||||
* @return array<int, array<string, mixed>>
|
||||
*/
|
||||
private static function buildMediaChannelOptions(?array $visibleAdminIds, array $eligibleDeptIds): array
|
||||
private static function buildMediaChannelOptions(?array $visibleAdminIds, array $eligibleDeptIds, ?array $allowedDeptIds = null): array
|
||||
{
|
||||
$allOptions = MediaChannelService::getOptions();
|
||||
if ($visibleAdminIds === null) {
|
||||
@@ -350,30 +335,13 @@ class ConversionLogic
|
||||
return $allOptions;
|
||||
}
|
||||
|
||||
$allowedDeptIds = [];
|
||||
if ($visibleAdminIds !== []) {
|
||||
$deptIds = Db::name('admin_dept')
|
||||
->whereIn('admin_id', $visibleAdminIds)
|
||||
->column('dept_id');
|
||||
foreach ($deptIds as $deptId) {
|
||||
$deptId = (int)$deptId;
|
||||
if ($deptId > 0) {
|
||||
$allowedDeptIds[$deptId] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($eligibleDeptIds as $deptId) {
|
||||
$deptId = (int)$deptId;
|
||||
if ($deptId > 0) {
|
||||
$allowedDeptIds[$deptId] = true;
|
||||
}
|
||||
}
|
||||
$allowedDeptIds ??= self::resolveFilterAllowedDeptIds($visibleAdminIds, $eligibleDeptIds);
|
||||
if ($allowedDeptIds === []) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$allowedCodes = Db::name('account_cost')
|
||||
->whereIn('dept_id', array_keys($allowedDeptIds))
|
||||
->whereIn('dept_id', $allowedDeptIds)
|
||||
->where('media_channel_code', '<>', '')
|
||||
->distinct(true)
|
||||
->column('media_channel_code');
|
||||
@@ -831,8 +799,14 @@ class ConversionLogic
|
||||
->leftJoin('admin a', 'a.work_wechat_userid = e.user_id AND a.delete_time IS NULL')
|
||||
->where('e.change_type', 'add_external_contact')
|
||||
->where('e.event_time', 'between', [$startTimestamp, $endTimestamp])
|
||||
->fieldRaw('e.user_id, a.id AS admin_id, COUNT(*) AS add_fans_count')
|
||||
->group('e.user_id, a.id');
|
||||
->fieldRaw('a.id AS admin_id, COUNT(*) AS add_fans_count')
|
||||
->group('a.id');
|
||||
|
||||
if ($visibleAdminIds !== null) {
|
||||
$query->whereIn('a.id', $visibleAdminIds);
|
||||
} elseif ($dimension !== 'dept' && $entityIds !== []) {
|
||||
$query->whereIn('a.id', $entityIds);
|
||||
}
|
||||
|
||||
if ($mediaChannel !== null) {
|
||||
$query->leftJoin('qywx_external_contact q', 'q.external_userid = e.external_userid');
|
||||
@@ -904,10 +878,16 @@ class ConversionLogic
|
||||
->leftJoin('tcm_diagnosis u', 'a.patient_id = u.id')
|
||||
->where('a.appointment_date', '>=', $startDate)
|
||||
->where('a.appointment_date', '<=', $endDate)
|
||||
->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)')
|
||||
->fieldRaw("{$sourceExpr} AS source_admin_id, a.patient_id AS diagnosis_id, COUNT(*) AS appointment_count, SUM(CASE WHEN a.status = 3 THEN 1 ELSE 0 END) AS interview_count")
|
||||
->group("{$sourceExpr}, a.patient_id");
|
||||
|
||||
$query->where(static function (Query $subQuery): void {
|
||||
$subQuery->whereNull('u.id')
|
||||
->whereOr(static function (Query $orQuery): void {
|
||||
$orQuery->whereNull('u.delete_time');
|
||||
});
|
||||
});
|
||||
|
||||
if ($mediaChannel !== null) {
|
||||
$legacyChannelValues = MediaChannelService::getLegacyAppointmentChannelValues($mediaChannel);
|
||||
if ($legacyChannelValues !== []) {
|
||||
@@ -976,7 +956,9 @@ class ConversionLogic
|
||||
->where('o.status', 2)
|
||||
->where('o.order_type', 1)
|
||||
->where('o.amount', 5)
|
||||
->whereRaw('(o.payment_time IS NOT NULL AND o.payment_time <> "" AND o.payment_time >= ? AND o.payment_time <= ?)', [$startDateTime, $endDateTime])
|
||||
->whereNotNull('o.payment_time')
|
||||
->where('o.payment_time', '<>', '')
|
||||
->whereBetweenTime('o.payment_time', $startDateTime, $endDateTime)
|
||||
->fieldRaw('o.creator_id AS source_admin_id, COUNT(*) AS paid_appointment_count')
|
||||
->group('o.creator_id');
|
||||
|
||||
@@ -1896,7 +1878,8 @@ class ConversionLogic
|
||||
// 单条 LIKE 没命中再退化全表（量大时会慢，因此仅在极少数员工场景下兜底）。
|
||||
$followRows = Db::name('qywx_external_contact')
|
||||
->whereNull('delete_time')
|
||||
->whereRaw('follow_users IS NOT NULL AND follow_users <> ""')
|
||||
->whereNotNull('follow_users')
|
||||
->where('follow_users', '<>', '')
|
||||
->limit(2000)
|
||||
->field('follow_users')
|
||||
->select()
|
||||
@@ -2385,4 +2368,38 @@ class ConversionLogic
|
||||
|
||||
return round($numerator / $denominator, 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[]|null $visibleAdminIds
|
||||
* @param int[] $eligibleDeptIds
|
||||
* @return int[]
|
||||
*/
|
||||
private static function resolveFilterAllowedDeptIds(?array $visibleAdminIds, array $eligibleDeptIds): array
|
||||
{
|
||||
if ($visibleAdminIds === null) {
|
||||
return array_values(array_unique(array_filter(array_map('intval', $eligibleDeptIds), static fn (int $deptId): bool => $deptId > 0)));
|
||||
}
|
||||
|
||||
$allowedDeptIds = [];
|
||||
if ($visibleAdminIds !== []) {
|
||||
$deptIds = Db::name('admin_dept')
|
||||
->whereIn('admin_id', $visibleAdminIds)
|
||||
->column('dept_id');
|
||||
foreach ($deptIds as $deptId) {
|
||||
$deptId = (int)$deptId;
|
||||
if ($deptId > 0) {
|
||||
$allowedDeptIds[$deptId] = $deptId;
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($eligibleDeptIds as $deptId) {
|
||||
$deptId = (int)$deptId;
|
||||
if ($deptId > 0) {
|
||||
$allowedDeptIds[$deptId] = $deptId;
|
||||
}
|
||||
}
|
||||
|
||||
return array_values($allowedDeptIds);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user