首页查询问题
This commit is contained in:
parent
68bd62731a
commit
a324b16778
|
|
@ -44,6 +44,7 @@ public class HomePageSubServiceImpl implements HomePageSubService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<HomePageSubProVo> getTeamMsg(HomePagePoVo o) {
|
public List<HomePageSubProVo> getTeamMsg(HomePagePoVo o) {
|
||||||
|
o.setCurrentDay(DateUtil.today());
|
||||||
if (o.getProId() != null){
|
if (o.getProId() != null){
|
||||||
String[] split = o.getProId().split(",");
|
String[] split = o.getProId().split(",");
|
||||||
o.setProIds(Arrays.asList(split));
|
o.setProIds(Arrays.asList(split));
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
pp.vol_level,
|
pp.vol_level,
|
||||||
pp.pro_status,
|
pp.pro_status,
|
||||||
count(DISTINCT ps.id) AS subNum,
|
count(DISTINCT ps.id) AS subNum,
|
||||||
count(DISTINCT psc.id) AS teamNum,
|
count(DISTINCT pst.id) AS teamNum,
|
||||||
count(DISTINCT bwem.worker_id) AS einNum,
|
count(DISTINCT bwem.worker_id) AS einNum,
|
||||||
count(DISTINCT bap.worker_id) AS attNum,
|
count(DISTINCT bap.worker_id) AS attNum,
|
||||||
count(DISTINCT IF(bwem.light_status = 1, bwem.worker_id, NULL)) AS yellowNum,
|
count(DISTINCT IF(bwem.light_status = 1, bwem.worker_id, NULL)) AS yellowNum,
|
||||||
|
|
@ -204,7 +204,7 @@
|
||||||
INNER JOIN bm_sub_contract bsc ON ps.id = bsc.sub_id
|
INNER JOIN bm_sub_contract bsc ON ps.id = bsc.sub_id
|
||||||
AND bsc.is_active = 1
|
AND bsc.is_active = 1
|
||||||
AND bsc.sub_ein_status = 1
|
AND bsc.sub_ein_status = 1
|
||||||
INNER JOIN pm_project pp ON pp.id = bsc.pro_id
|
INNER JOIN pm_project pp ON pp.id = bsc.pro_id and pp.id = pstc.pro_id
|
||||||
AND pp.is_active = 1
|
AND pp.is_active = 1
|
||||||
LEFT JOIN pm_sub_company psc ON pp.sub_com_id = psc.id
|
LEFT JOIN pm_sub_company psc ON pp.sub_com_id = psc.id
|
||||||
LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id
|
LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue