diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/ProDataMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/ProDataMapper.xml index 3f726f6..651889e 100644 --- a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/ProDataMapper.xml +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/ProDataMapper.xml @@ -413,43 +413,43 @@ select concat(IFNULL(COUNT(jcm.id),0),"/",IFNULL(SUM(current_constr_headcount),0)) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.bidding_section_code=#{bidCode} + and jcm.single_project_code=#{bidCode} UNION ALL select concat(IFNULL(COUNT(jcm.id),0),"/",IFNULL(SUM(current_constr_headcount),0)) from jj_class_meetting jcm WHERE jcm.current_constr_date= DATE_FORMAT(curdate() - INTERVAL 1 DAY, '%Y-%m-%d') - and jcm.delete_flag=0 and jcm.bidding_section_code=#{bidCode} + and jcm.delete_flag=0 and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='2' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='2' and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='3' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='3' and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='4' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='4' and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='5' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='5' and jcm.single_project_code=#{bidCode} union ALL select IFNULL(COUNT(jtt.id),0) from jj_team jtt where jtt.delete_flag=0 and jtt.team_status='01' - and jtt.bidding_section_code=#{bidCode} + and jtt.single_project_code=#{bidCode} union ALL select IFNULL(COUNT(tnv.id),0) from t_notice_voi tnv WHERE tnv.`status` IN ('1','2','3','4','5') AND (tnv.sup_type IS NULL OR tnv.sup_type = '1') - AND tnv.bid_code=#{bidCode} + AND tnv.sign_code=#{bidCode} diff --git a/securityControl-modules/securityControl-proteam/target/classes/mapper/ProDataMapper.xml b/securityControl-modules/securityControl-proteam/target/classes/mapper/ProDataMapper.xml index 3f726f6..651889e 100644 --- a/securityControl-modules/securityControl-proteam/target/classes/mapper/ProDataMapper.xml +++ b/securityControl-modules/securityControl-proteam/target/classes/mapper/ProDataMapper.xml @@ -413,43 +413,43 @@ select concat(IFNULL(COUNT(jcm.id),0),"/",IFNULL(SUM(current_constr_headcount),0)) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.bidding_section_code=#{bidCode} + and jcm.single_project_code=#{bidCode} UNION ALL select concat(IFNULL(COUNT(jcm.id),0),"/",IFNULL(SUM(current_constr_headcount),0)) from jj_class_meetting jcm WHERE jcm.current_constr_date= DATE_FORMAT(curdate() - INTERVAL 1 DAY, '%Y-%m-%d') - and jcm.delete_flag=0 and jcm.bidding_section_code=#{bidCode} + and jcm.delete_flag=0 and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='2' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='2' and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='3' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='3' and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='4' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='4' and jcm.single_project_code=#{bidCode} UNION ALL select IFNULL(COUNT(jcm.id),0) from jj_class_meetting jcm WHERE jcm.current_constr_date=CURRENT_DATE() and jcm.delete_flag=0 - and jcm.re_assessment_risk_level='5' and jcm.bidding_section_code=#{bidCode} + and jcm.re_assessment_risk_level='5' and jcm.single_project_code=#{bidCode} union ALL select IFNULL(COUNT(jtt.id),0) from jj_team jtt where jtt.delete_flag=0 and jtt.team_status='01' - and jtt.bidding_section_code=#{bidCode} + and jtt.single_project_code=#{bidCode} union ALL select IFNULL(COUNT(tnv.id),0) from t_notice_voi tnv WHERE tnv.`status` IN ('1','2','3','4','5') AND (tnv.sup_type IS NULL OR tnv.sup_type = '1') - AND tnv.bid_code=#{bidCode} + AND tnv.sign_code=#{bidCode}