修改管理成本报表规则, 香港百伦支付给物流供应商的物流费用不统计

cost-core/src/main/resources/mapper/Cost.xml

@@ -343,7 +343,7 @@
           d.amount * c.to_rmb_rate amountRmb
         FROM user u, cost c, cost_detail d, type_relation t
         WHERE c.create_userid = u.userid AND c.cost_no = d.cost_no AND t.fee_type = c.type_name AND c.cost_form = 1 AND c.cost_status = 4
-        AND c.logistics_supplier_id is null AND c.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND d.kind_name not in ('百伦咨询服务费')
+        AND c.logistics_supplier_id is null AND c.company_value =2 AND d.kind_name not in ('百伦咨询服务费','物流费')
         <if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if>
         <if test="feeSubType != null and feeSubType != ''">AND d.kind_name = #{feeSubType}</if>
         <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
@@ -354,12 +354,47 @@
         <if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if>
         <if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if>
         UNION
+        SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form manageCostType,u.departmentname1 departmentName,
+          c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,d.kind_name feeSubType,d.amount amount,c.dic currency,
+          d.amount * c.to_rmb_rate amountRmb
+        FROM user u, cost c, cost_detail d, type_relation t
+        WHERE c.create_userid = u.userid AND c.cost_no = d.cost_no AND t.fee_type = c.type_name AND c.cost_form = 1 AND c.cost_status = 4
+        AND c.logistics_supplier_id is null AND c.company_value in (1,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND d.kind_name not in ('百伦咨询服务费')
+        <if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if>
+        <if test="feeSubType != null and feeSubType != ''">AND d.kind_name = #{feeSubType}</if>
+        <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
+        <if test="companyValue != null and companyValue != 0">AND c.company_value = #{companyValue}</if>
+        <if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if>
+        <if test="createUserId != null and createUserId != ''">AND c.create_userid = #{createUserId}</if>
+        <if test="payUserId != null and payUserId != ''">AND c.pay_user_id = #{payUserId}</if>
+        <if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if>
+        <if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if>
+        UNION
+        SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form manageCostType,u.departmentname1 departmentName,
+        c1.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name feeSubType,-c1.amount amount,c1.dic currency,
+        -c1.amount_rmb amountRmb
+        FROM user u, type_relation t ,cost c1
+        WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4
+        AND c1.company_value =2 AND c1.kind_name not in ('百伦咨询服务费','物流费')
+        AND exists (SELECT 1 FROM cost c2 WHERE c1.company_value = c2.company_value AND c1.type_name = c2.type_name
+        AND c2.create_userid = u.userid AND t.fee_type = c2.type_name AND c2.cost_form = 1 AND c2.cost_status = 4
+        AND c2.logistics_supplier_id is null)
+        <if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if>
+        <if test="feeSubType != null and feeSubType != ''">AND c1.kind_name = #{feeSubType}</if>
+        <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
+        <if test="companyValue != null and companyValue != 0">AND c1.company_value = #{companyValue}</if>
+        <if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if>
+        <if test="createUserId != null and createUserId != ''">AND c1.create_userid = #{createUserId}</if>
+        <if test="payUserId != null and payUserId != ''">AND c1.pay_user_id = #{payUserId}</if>
+        <if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if>
+        <if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if>
+        UNION
         SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form manageCostType,u.departmentname1 departmentName,
         c1.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name feeSubType,-c1.amount amount,c1.dic currency,
         -c1.amount_rmb amountRmb
         FROM user u, type_relation t ,cost c1
         WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4
-        AND c1.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND c1.kind_name not in ('百伦咨询服务费')
+        AND c1.company_value in (1,3,5,7,8,11,46,48,50,53,59,60,61,66,69) AND c1.kind_name not in ('百伦咨询服务费')
         AND exists (SELECT 1 FROM cost c2 WHERE c1.company_value = c2.company_value AND c1.type_name = c2.type_name
         AND c2.create_userid = u.userid AND t.fee_type = c2.type_name AND c2.cost_form = 1 AND c2.cost_status = 4
         AND c2.logistics_supplier_id is null)