diff --git a/project/project_search_2014.asp b/project/project_search_2014.asp index 2e2e0b9..926e6ac 100644 --- a/project/project_search_2014.asp +++ b/project/project_search_2014.asp @@ -540,9 +540,9 @@ end if query = query & " select " query = query & " A1.*, " query = query & " isnull(A2.child_est_money_sum,0) as child_est_money_sum, " - query = query & " isnull(A2.child_act_money_sum,0) as child_act_money_sum, " + query = query & " isnull(A2.child_act_money_sum,0)+ISNULL(MC.marketing_cost, 0)+ISNULL(JC.job_money, 0) as child_act_money_sum, " query = query & " isnull(A3.est_money_sum,0) as est_money_sum, " - query = query & " isnull(A3.act_money_sum,0) as act_money_sum " + query = query & " isnull(A3.act_money_sum,0)+ISNULL(MC.marketing_cost, 0)+ISNULL(JC.job_money, 0) as act_money_sum " query = query & " from " query = query & " ( " query = query & " select p_sn, p_subject, isnull(p_depart,'') as p_depart, p_method, p_cli_company, p_conv_date, c_code_name, " @@ -833,7 +833,20 @@ end if query = query & " where del_yes_no='no' " query = query & " group by p_sn " query = query & " ) A3 " - query = query & " on A1.p_sn=A3.p_sn " + query = query & " on A1.p_sn=A3.p_sn " + query = query & " LEFT JOIN ( " + query = query & " SELECT M.p_sn, SUM(CONVERT(money, REPLACE(CONVERT(varchar(100), M.target6), ',', ''))) AS marketing_cost " + query = query & " FROM project2.dbo.문서내용 M LEFT JOIN project2.dbo.Document D ON M.문서번호 = D.d_no " + query = query & " WHERE M.문서제목 = '접대비보고서' AND M.del_yes_no = 'no' " + query = query & " AND D.d_order_cnt = '77' " + query = query & " GROUP BY M.p_sn " + query = query & " ) MC ON A1.p_child_sn = MC.p_sn " + query = query & " LEFT JOIN ( " + query = query & " SELECT CA.p_sn, SUM(CA.cost_money) AS job_money " + query = query & " FROM project2.dbo.V_BUSI_COST CA " + query = query & " WHERE CA.cost_money > 0 " + query = query & " GROUP BY CA.p_sn " + query = query & " ) JC ON A1.p_child_sn = JC.p_sn " dim psql : psql="" @@ -842,7 +855,7 @@ end if psql="" psql=psql&" select A1.*, " psql=psql& " isnull(A3.est_money_sum,0) as est_money_sum, " - psql=psql& " isnull(A3.act_money_sum,0) as act_money_sum " + psql=psql& " isnull(A3.act_money_sum,0)+ISNULL(MC.marketing_cost, 0)+ISNULL(JC.job_money, 0) as act_money_sum " psql=psql& " from " psql=psql&" ( " psql=psql&" SELECT p_sn, PB.p_cli_company_cd, PB.p_client_type_cd, p_subject, PB.p_cli_per_cd, PB.p_state, E.p_cli_company_nm, CP.p_cli_depart, " @@ -885,7 +898,20 @@ end if psql=psql &" where del_yes_no='no' " psql=psql &" group by p_sn " psql=psql &" ) A3 " - psql=psql &" on A1.p_sn=A3.p_sn " + psql=psql &" on A1.p_sn=A3.p_sn " + psql=psql & " LEFT JOIN ( " + psql=psql & " SELECT M.p_sn, SUM(CONVERT(money, REPLACE(CONVERT(varchar(100), M.target6), ',', ''))) AS marketing_cost " + psql=psql & " FROM project2.dbo.문서내용 M LEFT JOIN project2.dbo.Document D ON M.문서번호 = D.d_no " + psql=psql & " WHERE M.문서제목 = '접대비보고서' AND M.del_yes_no = 'no' " + psql=psql & " AND D.d_order_cnt = '77' " + psql=psql & " GROUP BY M.p_sn " + psql=psql & " ) MC ON A1.p_child_sn = MC.p_sn " + psql=psql & " LEFT JOIN ( " + psql=psql & " SELECT CA.p_sn, SUM(CA.cost_money) AS job_money " + psql=psql & " FROM project2.dbo.V_BUSI_COST CA " + psql=psql & " WHERE CA.cost_money > 0 " + psql=psql & " GROUP BY CA.p_sn " + psql=psql & " ) JC ON A1.p_child_sn = JC.p_sn " psql=psql &" where 1=1 " if pps_state_nm<>"" then '-- 제안등록 상태 검색시 psql=psql&" and A1.p_state='"&pps_state_nm&"' "