wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev-ui' (#1) from dev-ui into dev

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
wkc
2026-04-22 01:50:37 +00:00
parent 2b321a8621 addea20fa1
commit 55f6eb9129
48 changed files with 2788 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml
View File

@@ -836,6 +836,7 @@
<select id="selectPersonAnalysisObjectRows" resultType="com.ruoyi.ccdi.project.domain.vo.CcdiProjectPersonAnalysisObjectRecordVO">
select
max(tr.model_code) as modelCode,
coalesce(max(staff.name), max(relation.relation_name), max(tr.object_key), max(tr.object_type)) as title,
max(case
when tr.object_type = 'STAFF_ID_CARD' then '员工对象'