fix: 简化OA流程付款状态并修复增量同步
This commit is contained in:
parent
8aff2a4dce
commit
67acd9be20
@ -137,11 +137,9 @@ class ProcessDetails extends Controller
|
||||
$status = trim((string) $request->query('status', ''));
|
||||
$paidDateValid = preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $paidDate, $dateParts) === 1
|
||||
&& checkdate((int) $dateParts[2], (int) $dateParts[3], (int) $dateParts[1]);
|
||||
$paymentState = trim((string) $request->query('payment_state', ''));
|
||||
if (! in_array($paymentState, DingProcessDetailMirrorRepository::PAYMENT_STATES, true)
|
||||
&& $paymentState !== DingProcessDetailMirrorRepository::LEGACY_PAYMENT_STATE) {
|
||||
$paymentState = '';
|
||||
}
|
||||
$paymentState = DingProcessDetailMirrorRepository::normalizePaymentStateFilter(
|
||||
$request->query('payment_state'),
|
||||
);
|
||||
|
||||
return [
|
||||
'paid_date' => $paidDateValid ? $paidDate : '',
|
||||
|
||||
@ -16,17 +16,24 @@ class DingProcessDetailMirrorRepository
|
||||
public const DATASET_PREFIX = 'ding.process_details.';
|
||||
|
||||
public const PAYMENT_STATES = [
|
||||
'出纳状态待同步',
|
||||
'出纳未开始',
|
||||
'出纳待打款',
|
||||
'出纳退回',
|
||||
'出纳已打款',
|
||||
'流程终止',
|
||||
'待付款',
|
||||
'已付款',
|
||||
'付款待核实',
|
||||
'不涉及付款',
|
||||
];
|
||||
|
||||
public const LEGACY_PAYMENT_STATE = '未确认';
|
||||
|
||||
public const LEGACY_PAYMENT_STATE_MAP = [
|
||||
'未确认' => '付款待核实',
|
||||
'出纳状态待同步' => '付款待核实',
|
||||
'出纳未开始' => '待付款',
|
||||
'出纳待打款' => '待付款',
|
||||
'出纳退回' => '待付款',
|
||||
'出纳已打款' => '已付款',
|
||||
'流程终止' => '不涉及付款',
|
||||
];
|
||||
|
||||
private readonly ConnectionInterface $connection;
|
||||
|
||||
private ?bool $paymentSourceStateColumn = null;
|
||||
@ -50,6 +57,14 @@ class DingProcessDetailMirrorRepository
|
||||
return $scope !== '' ? $scope : self::DEFAULT_SCOPE;
|
||||
}
|
||||
|
||||
public static function normalizePaymentStateFilter(mixed $value): string
|
||||
{
|
||||
$paymentState = trim((string) $value);
|
||||
$paymentState = self::LEGACY_PAYMENT_STATE_MAP[$paymentState] ?? $paymentState;
|
||||
|
||||
return in_array($paymentState, self::PAYMENT_STATES, true) ? $paymentState : '';
|
||||
}
|
||||
|
||||
public function datasetKey(): string
|
||||
{
|
||||
return self::DATASET_PREFIX . $this->scope();
|
||||
@ -176,9 +191,7 @@ class DingProcessDetailMirrorRepository
|
||||
->pluck('status')
|
||||
->map(static fn (mixed $value): string => (string) $value)
|
||||
->all(),
|
||||
'payment_states' => $this->structuredPaymentsEnabled()
|
||||
? self::PAYMENT_STATES
|
||||
: [self::LEGACY_PAYMENT_STATE],
|
||||
'payment_states' => self::PAYMENT_STATES,
|
||||
];
|
||||
}
|
||||
|
||||
@ -251,7 +264,7 @@ class DingProcessDetailMirrorRepository
|
||||
$query
|
||||
->selectRaw(
|
||||
'NULL as payment_fact_amount, NULL as payment_difference, ? as payment_state',
|
||||
[self::LEGACY_PAYMENT_STATE],
|
||||
['付款待核实'],
|
||||
);
|
||||
}
|
||||
|
||||
@ -289,19 +302,12 @@ class DingProcessDetailMirrorRepository
|
||||
}
|
||||
}
|
||||
|
||||
$paymentState = trim((string) ($filters['payment_state'] ?? ''));
|
||||
$paymentState = self::normalizePaymentStateFilter($filters['payment_state'] ?? '');
|
||||
if ($paymentState !== '') {
|
||||
$allowed = $this->structuredPaymentsEnabled()
|
||||
? self::PAYMENT_STATES
|
||||
: [self::LEGACY_PAYMENT_STATE];
|
||||
if (in_array($paymentState, $allowed, true)) {
|
||||
if ($paymentState !== self::LEGACY_PAYMENT_STATE) {
|
||||
$query->whereRaw(
|
||||
'(' . $this->paymentStateExpression() . ') = ?',
|
||||
[$paymentState],
|
||||
);
|
||||
}
|
||||
}
|
||||
$query->whereRaw(
|
||||
'(' . $this->paymentStateExpression() . ') = ?',
|
||||
[$paymentState],
|
||||
);
|
||||
}
|
||||
|
||||
return $query;
|
||||
@ -315,15 +321,20 @@ class DingProcessDetailMirrorRepository
|
||||
$cashierState = $this->cashierStatusColumnAvailable()
|
||||
? 'ding_process_detail_mirror.cashier_status'
|
||||
: "'pending_sync'";
|
||||
$workflowStatus = 'ding_process_detail_mirror.status';
|
||||
|
||||
return "CASE
|
||||
WHEN {$sourceState} = 'not_applicable' THEN '不涉及付款'
|
||||
WHEN {$cashierState} = 'completed' THEN '出纳已打款'
|
||||
WHEN {$cashierState} = 'pending' THEN '出纳待打款'
|
||||
WHEN {$cashierState} = 'returned' THEN '出纳退回'
|
||||
WHEN {$cashierState} = 'not_started' THEN '出纳未开始'
|
||||
WHEN {$cashierState} = 'terminated' THEN '流程终止'
|
||||
ELSE '出纳状态待同步'
|
||||
WHEN {$sourceState} = 'not_applicable'
|
||||
OR {$cashierState} = 'terminated'
|
||||
OR (({$cashierState} IS NULL OR {$cashierState} = '') AND {$workflowStatus} = '已终止')
|
||||
THEN '不涉及付款'
|
||||
WHEN {$cashierState} = 'completed'
|
||||
OR (({$cashierState} IS NULL OR {$cashierState} = '')
|
||||
AND {$workflowStatus} = '已完成'
|
||||
AND {$sourceState} <> 'not_applicable')
|
||||
THEN '已付款'
|
||||
WHEN {$cashierState} IN ('pending', 'returned', 'not_started') THEN '待付款'
|
||||
ELSE '付款待核实'
|
||||
END";
|
||||
}
|
||||
|
||||
|
||||
@ -674,6 +674,9 @@ class DingProcessDetailMirrorSynchronizer
|
||||
];
|
||||
}
|
||||
|
||||
$orderBy = $cursorExpression === 'w.processInstanceId'
|
||||
? 'w.processInstanceId'
|
||||
: "{$cursorExpression}, w.processInstanceId";
|
||||
$workflows = $query->select(
|
||||
'SELECT w.processInstanceId, w.processCode, w.businessId, w.title, w.status, w.result, '
|
||||
. 'w.originatorUserId, w.originatorDeptName, w.joinAt, w.updateAt, w.finishTime, '
|
||||
@ -681,7 +684,7 @@ class DingProcessDetailMirrorSynchronizer
|
||||
. 'FROM rpt.ding_Workflow w '
|
||||
. "WHERE w.processCode IN ({$processPlaceholders}) AND {$where}"
|
||||
. $cursorSql
|
||||
. " ORDER BY {$cursorExpression}, w.processInstanceId"
|
||||
. " ORDER BY {$orderBy}"
|
||||
. ' OFFSET 0 ROWS FETCH NEXT ' . $batchSize . ' ROWS ONLY',
|
||||
[...$processCodes, ...$bindings, ...$cursorBindings],
|
||||
);
|
||||
|
||||
@ -92,11 +92,9 @@ class ProcessDetailsPageData
|
||||
$status = trim((string) $request->query('status', ''));
|
||||
$paidDateValid = preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $paidDate, $dateParts) === 1
|
||||
&& checkdate((int) $dateParts[2], (int) $dateParts[3], (int) $dateParts[1]);
|
||||
$paymentState = trim((string) $request->query('payment_state', ''));
|
||||
if (! in_array($paymentState, DingProcessDetailMirrorRepository::PAYMENT_STATES, true)
|
||||
&& $paymentState !== DingProcessDetailMirrorRepository::LEGACY_PAYMENT_STATE) {
|
||||
$paymentState = '';
|
||||
}
|
||||
$paymentState = DingProcessDetailMirrorRepository::normalizePaymentStateFilter(
|
||||
$request->query('payment_state'),
|
||||
);
|
||||
|
||||
return [
|
||||
'paid_date' => $paidDateValid ? $paidDate : '',
|
||||
|
||||
@ -24,10 +24,9 @@
|
||||
default => 'is-neutral',
|
||||
};
|
||||
$paymentStateClass = static fn (string $state): string => match ($state) {
|
||||
'出纳已打款' => 'is-success',
|
||||
'出纳待打款', '出纳退回' => 'is-warning',
|
||||
'出纳状态待同步', '未确认' => 'is-warning',
|
||||
'出纳未开始', '流程终止', '不涉及付款' => 'is-neutral',
|
||||
'已付款' => 'is-success',
|
||||
'待付款', '付款待核实', '未确认' => 'is-warning',
|
||||
'不涉及付款' => 'is-neutral',
|
||||
default => 'is-neutral',
|
||||
};
|
||||
$pageUrl ??= route('business.pages.show', [
|
||||
@ -122,6 +121,15 @@
|
||||
font-size: .8125rem;
|
||||
}
|
||||
|
||||
.process-details-field input[type="date"] {
|
||||
color-scheme: light;
|
||||
}
|
||||
|
||||
.process-details-field input[type="date"]::-webkit-calendar-picker-indicator {
|
||||
cursor: pointer;
|
||||
opacity: .72;
|
||||
}
|
||||
|
||||
.process-details-field input:focus,
|
||||
.process-details-field select:focus {
|
||||
border-color: var(--vip-content-accent-dark, #856632);
|
||||
@ -616,7 +624,14 @@
|
||||
<input type="hidden" name="per_page" value="{{ $processRows->perPage() }}">
|
||||
<div class="process-details-field">
|
||||
<label for="process-details-paid-date">打款日期</label>
|
||||
<input id="process-details-paid-date" type="date" name="paid_date" value="{{ $filters['paid_date'] ?? '' }}">
|
||||
<input
|
||||
id="process-details-paid-date"
|
||||
type="date"
|
||||
name="paid_date"
|
||||
value="{{ $filters['paid_date'] ?? '' }}"
|
||||
lang="zh-CN"
|
||||
title="选择打款日期"
|
||||
>
|
||||
</div>
|
||||
<div class="process-details-field">
|
||||
<label for="process-details-type">单据类型</label>
|
||||
@ -680,7 +695,7 @@
|
||||
<p class="process-details-note">
|
||||
金额合计按审批费用明细汇总,付款合计按结构化付款明细汇总,同一笔付款不会因关联多条费用而重复计算。
|
||||
付款状态按钉钉“出纳打款”节点判断;付款差额按“费用合计 − 已付款合计”单独计算,不参与付款状态判断。
|
||||
“出纳状态待同步”表示尚未取得出纳节点任务,不能据此推断已付款或未付款。
|
||||
“付款待核实”表示尚未取得可靠的出纳节点任务,不能据此推断已付款或待付款。
|
||||
当前展示的是当前账号权限范围内可读取的钉钉OA审批流程;审批中的金额和行项目仍可能随流程变化。
|
||||
企业级全量数据待领导开通 OA 权限后切换。
|
||||
</p>
|
||||
|
||||
@ -24,7 +24,7 @@ class ProcessDetailsPageTest extends FeatureTestCase
|
||||
'line_no' => 1,
|
||||
'originator_name' => '张三',
|
||||
'status' => '已完成',
|
||||
'payment_state' => '出纳已打款',
|
||||
'payment_state' => '已付款',
|
||||
'payment_fact_amount' => 0,
|
||||
'payment_difference' => 0.20,
|
||||
'document_type' => '公摊日常报销',
|
||||
@ -56,12 +56,9 @@ class ProcessDetailsPageTest extends FeatureTestCase
|
||||
'document_types' => ['公摊日常报销'],
|
||||
'statuses' => ['已完成'],
|
||||
'payment_states' => [
|
||||
'出纳状态待同步',
|
||||
'出纳未开始',
|
||||
'出纳待打款',
|
||||
'出纳退回',
|
||||
'出纳已打款',
|
||||
'流程终止',
|
||||
'待付款',
|
||||
'已付款',
|
||||
'付款待核实',
|
||||
'不涉及付款',
|
||||
],
|
||||
]);
|
||||
@ -86,11 +83,13 @@ class ProcessDetailsPageTest extends FeatureTestCase
|
||||
->assertSee('单据类型')
|
||||
->assertSee('打款日期')
|
||||
->assertSee('name="paid_date"', false)
|
||||
->assertSee('lang="zh-CN"', false)
|
||||
->assertSee('title="选择打款日期"', false)
|
||||
->assertSee('name="payment_state"', false)
|
||||
->assertSee('审批状态')
|
||||
->assertSee('付款状态')
|
||||
->assertSee('出纳已打款')
|
||||
->assertSee('出纳状态待同步')
|
||||
->assertSee('已付款')
|
||||
->assertSee('付款待核实')
|
||||
->assertSee('付款金额')
|
||||
->assertSee('付款差额')
|
||||
->assertSee('0.20')
|
||||
@ -162,7 +161,7 @@ class ProcessDetailsPageTest extends FeatureTestCase
|
||||
'business_id' => '202601011200000000001',
|
||||
'originator_name' => '张三',
|
||||
'status' => '已完成',
|
||||
'payment_state' => '出纳已打款',
|
||||
'payment_state' => '已付款',
|
||||
'payment_difference' => 0.20,
|
||||
'document_type' => '公摊日常报销',
|
||||
'purpose' => '办公用品采购',
|
||||
@ -181,7 +180,7 @@ class ProcessDetailsPageTest extends FeatureTestCase
|
||||
|
||||
$response = $this->loginAs()->get(route('business.process-details.export', [
|
||||
'status' => '已完成',
|
||||
'payment_state' => '出纳已打款',
|
||||
'payment_state' => '已付款',
|
||||
]));
|
||||
|
||||
$response->assertOk();
|
||||
@ -191,7 +190,7 @@ class ProcessDetailsPageTest extends FeatureTestCase
|
||||
$this->assertStringContainsString('张三', $content);
|
||||
$this->assertStringContainsString('管理费用_办公费', $content);
|
||||
$this->assertStringContainsString('付款状态', $content);
|
||||
$this->assertStringContainsString('出纳已打款', $content);
|
||||
$this->assertStringContainsString('已付款', $content);
|
||||
$this->assertStringContainsString('付款差额', $content);
|
||||
$this->assertStringContainsString('0.20', $content);
|
||||
}
|
||||
|
||||
@ -45,8 +45,8 @@ class DingProcessDetailMirrorRepositoryTest extends TestCase
|
||||
$this->assertEqualsWithDelta(350.5, $result['summary']['bank_amount_total'], 0.001);
|
||||
$this->assertSame('personal_permission', $result['scope']);
|
||||
$paymentStates = collect($result['data'])->pluck('payment_state')->unique()->all();
|
||||
$this->assertContains('出纳已打款', $paymentStates);
|
||||
$this->assertContains('出纳待打款', $paymentStates);
|
||||
$this->assertContains('已付款', $paymentStates);
|
||||
$this->assertContains('待付款', $paymentStates);
|
||||
|
||||
$options = $this->repository->filterOptions();
|
||||
$this->assertArrayNotHasKey('months', $options);
|
||||
@ -55,12 +55,9 @@ class DingProcessDetailMirrorRepositoryTest extends TestCase
|
||||
$this->assertContains('已完成', $options['statuses']);
|
||||
$this->assertContains('审批中', $options['statuses']);
|
||||
$this->assertSame([
|
||||
'出纳状态待同步',
|
||||
'出纳未开始',
|
||||
'出纳待打款',
|
||||
'出纳退回',
|
||||
'出纳已打款',
|
||||
'流程终止',
|
||||
'待付款',
|
||||
'已付款',
|
||||
'付款待核实',
|
||||
'不涉及付款',
|
||||
], $options['payment_states']);
|
||||
}
|
||||
@ -100,11 +97,11 @@ class DingProcessDetailMirrorRepositoryTest extends TestCase
|
||||
);
|
||||
$this->assertSame(
|
||||
2,
|
||||
$this->repository->paginate(['payment_state' => '出纳已打款'], 1, 50)['total'],
|
||||
$this->repository->paginate(['payment_state' => '已付款'], 1, 50)['total'],
|
||||
);
|
||||
$this->assertSame(
|
||||
2,
|
||||
$this->repository->paginate(['payment_state' => '出纳待打款'], 1, 50)['total'],
|
||||
$this->repository->paginate(['payment_state' => '待付款'], 1, 50)['total'],
|
||||
);
|
||||
}
|
||||
|
||||
@ -116,14 +113,14 @@ class DingProcessDetailMirrorRepositoryTest extends TestCase
|
||||
->update(['cashier_status' => 'pending_sync', 'cashier_checked_at' => null]);
|
||||
|
||||
$result = $this->repository->paginate(
|
||||
['payment_state' => '出纳状态待同步'],
|
||||
['payment_state' => '付款待核实'],
|
||||
1,
|
||||
50,
|
||||
);
|
||||
|
||||
$this->assertSame(2, $result['total']);
|
||||
$this->assertSame(
|
||||
['出纳状态待同步'],
|
||||
['付款待核实'],
|
||||
collect($result['data'])->pluck('payment_state')->unique()->values()->all(),
|
||||
);
|
||||
}
|
||||
@ -143,7 +140,7 @@ class DingProcessDetailMirrorRepositoryTest extends TestCase
|
||||
|
||||
$this->assertSame(2, $result['total']);
|
||||
$this->assertEqualsWithDelta(500.0, (float) $result['data'][0]->payment_difference, 0.001);
|
||||
$this->assertSame('出纳待打款', $result['data'][0]->payment_state);
|
||||
$this->assertSame('待付款', $result['data'][0]->payment_state);
|
||||
}
|
||||
|
||||
public function test_process_without_payment_fields_is_not_applicable(): void
|
||||
@ -180,12 +177,31 @@ class DingProcessDetailMirrorRepositoryTest extends TestCase
|
||||
->where('business_id', '202602031200000000002')
|
||||
->update(['payment_source_state' => 'api', 'cashier_status' => 'completed']);
|
||||
|
||||
$result = $this->repository->paginate(['payment_state' => '出纳已打款'], 1, 50);
|
||||
$result = $this->repository->paginate(['payment_state' => '已付款'], 1, 50);
|
||||
|
||||
$this->assertSame(4, $result['total']);
|
||||
$this->assertSame('api', (string) $result['data'][0]->payment_source_state);
|
||||
}
|
||||
|
||||
public function test_completed_workflow_with_legacy_null_cashier_status_is_paid(): void
|
||||
{
|
||||
DB::connection('business_mirror')
|
||||
->table('ding_process_detail_mirror')
|
||||
->where('business_id', '202601011200000000001')
|
||||
->update(['cashier_status' => null, 'cashier_checked_at' => null]);
|
||||
|
||||
$result = $this->repository->paginate([
|
||||
'business_id' => '202601011200000000001',
|
||||
'payment_state' => '已付款',
|
||||
], 1, 50);
|
||||
|
||||
$this->assertSame(2, $result['total']);
|
||||
$this->assertSame(
|
||||
['已付款'],
|
||||
collect($result['data'])->pluck('payment_state')->unique()->values()->all(),
|
||||
);
|
||||
}
|
||||
|
||||
public function test_export_rows_returns_every_filtered_row(): void
|
||||
{
|
||||
$rows = iterator_to_array($this->repository->exportRows(['status' => '已完成']));
|
||||
|
||||
@ -143,7 +143,7 @@ class DingProcessDetailMirrorSynchronizerTest extends TestCase
|
||||
$row = app(DingProcessDetailMirrorRepository::class)
|
||||
->paginate(['business_id' => '202606031318000506330'], 1, 50)['data'][0];
|
||||
$this->assertSame('completed', $row->cashier_status);
|
||||
$this->assertSame('出纳已打款', $row->payment_state);
|
||||
$this->assertSame('已付款', $row->payment_state);
|
||||
$this->assertEqualsWithDelta(0.20, (float) $row->payment_difference, 0.001);
|
||||
}
|
||||
|
||||
@ -175,7 +175,7 @@ class DingProcessDetailMirrorSynchronizerTest extends TestCase
|
||||
$row = app(DingProcessDetailMirrorRepository::class)
|
||||
->paginate(['business_id' => '202610221534000124202'], 1, 50)['data'][0];
|
||||
$this->assertSame('returned', $row->cashier_status);
|
||||
$this->assertSame('出纳退回', $row->payment_state);
|
||||
$this->assertSame('待付款', $row->payment_state);
|
||||
$this->assertEqualsWithDelta(750.0, (float) $row->payment_difference, 0.001);
|
||||
}
|
||||
|
||||
@ -250,7 +250,7 @@ class DingProcessDetailMirrorSynchronizerTest extends TestCase
|
||||
$this->assertSame('missing', $row->payment_source_state);
|
||||
$this->assertSame('not_started', $row->cashier_status);
|
||||
$page = app(DingProcessDetailMirrorRepository::class)->paginate(
|
||||
['payment_state' => '出纳未开始'],
|
||||
['payment_state' => '待付款'],
|
||||
1,
|
||||
50,
|
||||
);
|
||||
@ -316,6 +316,12 @@ class DingProcessDetailMirrorSynchronizerTest extends TestCase
|
||||
->table('business_mirror_table_states')
|
||||
->first();
|
||||
$this->assertSame(101, (int) json_decode((string) $state->cursor, true)['scheme_high_watermark']);
|
||||
$this->assertFalse(collect($this->query->calls)->contains(
|
||||
static fn (array $call): bool => str_contains(
|
||||
(string) ($call['sql'] ?? ''),
|
||||
'ORDER BY w.processInstanceId, w.processInstanceId',
|
||||
),
|
||||
));
|
||||
}
|
||||
|
||||
public function test_official_api_fills_payment_when_replica_omits_payment_table(): void
|
||||
|
||||
@ -50,7 +50,7 @@ class ProcessDetailsPageDataTest extends TestCase
|
||||
->method('paginate')
|
||||
->with($this->callback(static fn (array $filters): bool =>
|
||||
$filters['paid_date'] === '2026-10-24'
|
||||
&& $filters['payment_state'] === '出纳已打款'
|
||||
&& $filters['payment_state'] === '已付款'
|
||||
), 2, 50)
|
||||
->willReturn([
|
||||
'data' => [$row],
|
||||
@ -73,12 +73,9 @@ class ProcessDetailsPageDataTest extends TestCase
|
||||
'document_types' => ['种菜核销/种菜报销'],
|
||||
'statuses' => ['审批中'],
|
||||
'payment_states' => [
|
||||
'出纳状态待同步',
|
||||
'出纳未开始',
|
||||
'出纳待打款',
|
||||
'出纳退回',
|
||||
'出纳已打款',
|
||||
'流程终止',
|
||||
'待付款',
|
||||
'已付款',
|
||||
'付款待核实',
|
||||
'不涉及付款',
|
||||
],
|
||||
]);
|
||||
@ -97,15 +94,12 @@ class ProcessDetailsPageDataTest extends TestCase
|
||||
$this->assertSame('succeeded', $data['mirrorStatus']);
|
||||
$this->assertSame(11331, $data['summary']['rows']);
|
||||
$this->assertSame('2026-10-24', $data['filters']['paid_date']);
|
||||
$this->assertSame('出纳已打款', $data['filters']['payment_state']);
|
||||
$this->assertSame('已付款', $data['filters']['payment_state']);
|
||||
$this->assertSame(
|
||||
[
|
||||
'出纳状态待同步',
|
||||
'出纳未开始',
|
||||
'出纳待打款',
|
||||
'出纳退回',
|
||||
'出纳已打款',
|
||||
'流程终止',
|
||||
'待付款',
|
||||
'已付款',
|
||||
'付款待核实',
|
||||
'不涉及付款',
|
||||
],
|
||||
$data['paymentStates'],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user