|
|
@@ -575,6 +575,7 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
|
|
|
'person.name as name',
|
|
|
'person.gender as gender',
|
|
|
'person.idCard as idCard',
|
|
|
+ 'person.disabilityId as disabilityId',
|
|
|
'person.disabilityType as disabilityType',
|
|
|
'person.disabilityLevel as disabilityLevel',
|
|
|
'person.phone as phone',
|
|
|
@@ -584,7 +585,7 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
|
|
|
'MAX(op.workStatus) as workStatus', // 获取最新工作状态
|
|
|
'order.orderName as orderName'
|
|
|
])
|
|
|
- .groupBy('person.id, person.name, person.gender, person.idCard, person.disabilityType, person.disabilityLevel, person.phone, person.birth_date, order.orderName');
|
|
|
+ .groupBy('person.id, person.name, person.gender, person.idCard, person.disabilityId, person.disabilityType, person.disabilityLevel, person.phone, person.birth_date, order.orderName');
|
|
|
|
|
|
// 按最新入职日期排序
|
|
|
queryBuilder.orderBy('latestJoinDate', 'DESC');
|
|
|
@@ -609,6 +610,7 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
|
|
|
name: row.name,
|
|
|
gender: row.gender,
|
|
|
idCard: row.idcard,
|
|
|
+ disabilityId: row.disabilityid,
|
|
|
disabilityType: row.disabilitytype,
|
|
|
disabilityLevel: row.disabilitylevel,
|
|
|
phone: row.phone,
|
|
|
@@ -690,8 +692,10 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
|
|
|
name: person.name,
|
|
|
gender: person.gender,
|
|
|
idCard: person.idCard,
|
|
|
+ disabilityId: person.disabilityId,
|
|
|
disabilityType: person.disabilityType,
|
|
|
disabilityLevel: person.disabilityLevel,
|
|
|
+ idAddress: person.idAddress,
|
|
|
birthDate: person.birthDate,
|
|
|
salaryDetail: latestOrderPerson?.salaryDetail || null,
|
|
|
phone: person.phone,
|