c-zhangr1/zhgh_squ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
=
2026-06-15 15:47:34 +08:00
parent 5e4e27023f
commit ec015a66df
4 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageManageController.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class ChildManageManageController {
public void index() {
}
@At("/h5")
@Ok("beetl:/platform/zhghh5/staffmanage/childManage/manage/index.html")
@Ok("beetl:/platform/zhghh5/staffmanage/childmanage/manage/index.html")
@SaCheckPermission("h5.childManage.manage")
public void h5Index() {
}
src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageMineController.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class ChildManageMineController {
public void index() {
}
@At("/h5")
@Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html")
@Ok("beetl:/platform/zhghh5/staffmanage/childmanage/mine/index.html")
@SaCheckPermission("h5.childManage.mine")
public void h5Index() {
}
src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageWriteController.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ChildManageWriteController {
public void index() {
}
@At("/h5")
@Ok("beetl:/platform/zhghh5/staffmanage/childManage/write/index.html")
@Ok("beetl:/platform/zhghh5/staffmanage/childmanage/write/index.html")
@SaCheckPermission("h5.childManage.write")
public void h5Index() {
}
src/main/java/com/budwk/app/zhgh/staffmanage/retired/user/service/impl/RetiredUserServiceImpl.java
+9 -29
View File
@@ -72,19 +72,15 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
u.education,
u.academicDegree,
u.nation,
campusDict.name as campusName,
null as campusName,
u.unionGroupName,
u.political,
u.personType,
u.userState,
u.unitName as unitname,
u.unionName as unionname,
CASE WHEN userUnit.unitLevel = 3 THEN userUnit.name ELSE NULL END as threeUnitName
null as threeUnitName
FROM vw_user u
LEFT JOIN sys_unit userUnit ON userUnit.id = u.unitId
LEFT JOIN sys_dict campusParent ON campusParent.code = 'USER_CAMPUS'
LEFT JOIN sys_dict campusDict ON campusDict.parentId = campusParent.id
AND (campusDict.id = userUnit.xqid OR campusDict.code = userUnit.xqid OR campusDict.name = userUnit.xqid)
$condition
""");
Cnd cnd = Cnd.NEW();
@@ -161,15 +157,11 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
u.memberTime,
u.families,
u.personalData,
campusDict.name as campusName,
CASE WHEN userUnit.unitLevel = 3 THEN userUnit.name ELSE NULL END as threeUnitName,
null as campusName,
null as threeUnitName,
rg.groupName as retiredGroupName,
rpb.partyBranchName as retiredPartyBranchName
FROM vw_user u
LEFT JOIN sys_unit userUnit ON userUnit.id = u.unitId
LEFT JOIN sys_dict campusParent ON campusParent.code = 'USER_CAMPUS'
LEFT JOIN sys_dict campusDict ON campusDict.parentId = campusParent.id
AND (campusDict.id = userUnit.xqid OR campusDict.code = userUnit.xqid OR campusDict.name = userUnit.xqid)
LEFT JOIN retired_group_unit rgu ON rgu.unitId = u.unitId
LEFT JOIN retired_group rg ON rg.id = rgu.retiredGroupId
LEFT JOIN retired_party_branch_user rpbu ON rpbu.userId = u.id
@@ -234,7 +226,7 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
u.education,
u.academicDegree,
u.nation,
campusDict.name as campusName,
null as campusName,
u.unionGroupName,
u.personType,
u.userState,
@@ -242,10 +234,6 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
u.unionName as unionname
FROM retired_user_change ruc
LEFT JOIN vw_user u ON u.id = ruc.userId
LEFT JOIN sys_unit userUnit ON userUnit.id = u.unitId
LEFT JOIN sys_dict campusParent ON campusParent.code = 'USER_CAMPUS'
LEFT JOIN sys_dict campusDict ON campusDict.parentId = campusParent.id
AND (campusDict.id = userUnit.xqid OR campusDict.code = userUnit.xqid OR campusDict.name = userUnit.xqid)
$condition
""");
Cnd cnd = Cnd.NEW();
@@ -276,21 +264,18 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
u.education,
u.academicDegree,
u.nation,
campusDict.name as campusName,
null as campusName,
unionGroup.name as unionGroupName,
u.personType,
u.userState,
n.name AS unitname,
gh.name AS unionname,
u.political,
CASE WHEN n.unitLevel = 3 THEN n.name ELSE NULL END as threeUnitName,
null as threeUnitName,
rg.groupName AS retiredGroupName,
rpb.partyBranchName AS retiredPartyBranchName
FROM retired_user_history u
LEFT JOIN sys_unit n ON n.id = u.unitId
LEFT JOIN sys_dict campusParent ON campusParent.code = 'USER_CAMPUS'
LEFT JOIN sys_dict campusDict ON campusDict.parentId = campusParent.id
AND (campusDict.id = n.xqid OR campusDict.code = n.xqid OR campusDict.name = n.xqid)
LEFT JOIN sys_union gh ON gh.id = n.unionId
LEFT JOIN sys_union_group unionGroup ON unionGroup.id = n.unionGroupId
LEFT JOIN retired_group_unit rgu ON rgu.unitId = u.unitId
@@ -321,7 +306,6 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
}
private Sql retiredUserSql() {
// 当前库的 vw_user 不直接提供科室和校区名称，科室按三级单位显示，校区按单位 xqid 关联 USER_CAMPUS 字典显示。
return Sqls.create("""
SELECT
u.id,
@@ -337,21 +321,17 @@ public class RetiredUserServiceImpl extends BaseServiceImpl<Sys_user> implements
u.education,
u.academicDegree,
u.nation,
campusDict.name as campusName,
null as campusName,
u.unionGroupName,
u.personType,
u.userState,
u.unitName as unitname,
u.unionName as unionname,
u.political,
CASE WHEN userUnit.unitLevel = 3 THEN userUnit.name ELSE NULL END as threeUnitName,
null as threeUnitName,
rg.groupName as retiredGroupName,
rpb.partyBranchName as retiredPartyBranchName
FROM vw_user u
LEFT JOIN sys_unit userUnit ON userUnit.id = u.unitId
LEFT JOIN sys_dict campusParent ON campusParent.code = 'USER_CAMPUS'
LEFT JOIN sys_dict campusDict ON campusDict.parentId = campusParent.id
AND (campusDict.id = userUnit.xqid OR campusDict.code = userUnit.xqid OR campusDict.name = userUnit.xqid)
LEFT JOIN retired_group_unit rgu ON rgu.unitId = u.unitId
LEFT JOIN retired_group rg ON rg.id = rgu.retiredGroupId
LEFT JOIN retired_party_branch_user rpbu ON rpbu.userId = u.id