bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复： 4641 建议优化分页控件

This commit is contained in:
gaowdong 2025-01-09 16:49:42 +08:00
parent 4eb15791b3
commit 03d8f1b8af
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/bmw/src/main/java/com/bonus/bmw/team/service/PersonSettingServiceImpl.java
View File

@ -169,30 +169,30 @@ public class PersonSettingServiceImpl implements PersonSettingService {
@Override
public List<TeamPersonBean> databaseListList(Map<String, Object> params, Integer offset, Integer limit) {
//1.0先查有哪些人员已经在场但无分包班组
List<TeamPersonBean> personBeanList = dao.getEinWorkerByNoTeam(params);
//2.0哪些在场但无分包班组人员可以被选中
List<TeamPersonBean> personList = dao.getEinWorkerByNoTeam2(params);
for (int i = 0; i < personBeanList.size(); i++) {
for (TeamPersonBean teamPersonBean : personList) {
if (personBeanList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
personBeanList.remove(i);
i--;
break;
}
}
}
// //1.0先查有哪些人员已经在场但无分包班组
// List<TeamPersonBean> personBeanList = dao.getEinWorkerByNoTeam(params);
// //2.0哪些在场但无分包班组人员可以被选中
// List<TeamPersonBean> personList = dao.getEinWorkerByNoTeam2(params);
// for (int i = 0; i < personBeanList.size(); i++) {
// for (TeamPersonBean teamPersonBean : personList) {
// if (personBeanList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
// personBeanList.remove(i);
// i--;
// break;
// }
// }
// }
//2.0查询此班组绑定工程
List<TeamPersonBean> allList = dao.databaseListList(params, offset, limit);
for (int i = 0; i < allList.size(); i++) {
for (TeamPersonBean teamPersonBean : personBeanList) {
if (allList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
allList.remove(i);
i--;
break;
}
}
}
// for (int i = 0; i < allList.size(); i++) {
// for (TeamPersonBean teamPersonBean : personBeanList) {
// if (allList.get(i).getIdNumber().equals(teamPersonBean.getIdNumber())){
// allList.remove(i);
// i--;
// break;
// }
// }
// }
return allList;
}

24
modules/bmw/src/main/resources/mapper/team/PersonSettingMapper.xml
View File

@ -259,6 +259,30 @@
LEFT JOIN bm_certificate_type bct ON bct.id = cer.certificate_id
WHERE
btur.ID_NUMBER IS NULL
and not exists (
select
bweh.id_number
from
bm_worker_ein_history bweh
left join bm_team_user_relation btur on
btur.ID_NUMBER = bweh.id_number
and btur.is_active = '1'
left join bm_sub_contract bsc on
bweh.project_id = bsc.pro_id
and bsc.is_active = '1'
left join bm_sub_relation bsr on
bsc.id = bsr.sub_contract_id
and bsr.is_active = '1'
and bsr.v is not null
where
bweh.is_active = '1'
and bweh.sub_id = '0'
and bweh.team_id = '0'
and bw.id_number = bweh.id_number
and btur.ID_NUMBER is null
and bsr.v != #{params.teamId}
group by
bweh.id_number)
AND bw.IS_ACTIVE = '1'
AND bw.is_furlough_person != '1'
<if test=" params.keyWord != null and params.keyWord != '' ">