Skip to content

D
dc-cost-system
Commit e737220c by huluobin
Options

update

parent 71e36dfb
Showing with 28 additions and 48 deletions
bailuntec-cost-core/src/main/resources/mapper/Cost.xml
...@@ -307,7 +307,6 @@ ...@@ -307,7 +307,6 @@
ORDER BY id DESC ORDER BY id DESC
</select> </select>
<!--查询所有的物流费用单和采购单-->
<select id="getLogisticsCostList" resultType="com.bailuntec.cost.api.dto.ManageCostDto"> <select id="getLogisticsCostList" resultType="com.bailuntec.cost.api.dto.ManageCostDto">
SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form
manageCostType,u.departmentname1 departmentName, manageCostType,u.departmentname1 departmentName,
...@@ -321,10 +320,8 @@ ...@@ -321,10 +320,8 @@
<if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form manageCostType,u.departmentname1 departmentName,
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.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name
feeSubType,-c1.amount amount,c1.dic currency,
-c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId -c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId
FROM user u, type_relation t ,cost c1 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 WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4
...@@ -353,25 +350,20 @@ ...@@ -353,25 +350,20 @@
and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3 and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3
<if test="startDate != null">AND b.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND b.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND b.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND b.pay_time <![CDATA[<]]>#{endDate}</if>
</select> </select>
<select id="getCostList" resultType="com.bailuntec.cost.api.dto.CostDto"> <select id="getCostList" resultType="com.bailuntec.cost.api.dto.CostDto">
select * select * from cost where last_modify_date &gt;= #{startDate} and last_modify_date &lt;= #{endDate}
from cost
where last_modify_date &gt;= #{startDate}
and last_modify_date &lt;= #{endDate}
</select> </select>
<!--管理成本：查询付款单+收款单+借还单+采购单--> <!--管理成本：查询付款单+收款单+借还单+采购单-->
<select id="selectManageCost" resultType="com.bailuntec.cost.api.dto.ManageCostDto"> <select id="selectManageCost" resultType="com.bailuntec.cost.api.dto.ManageCostDto">
SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form manageCostType,u.departmentname1 departmentName,
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,
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, d.id as costId1, c.id as costId d.amount * c.to_rmb_rate amountRmb, d.id as costId1, c.id as costId
FROM user u, cost c, cost_detail d, type_relation t 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 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
c.cost_status = 4
AND c.logistics_supplier_id is null AND c.company_value =2 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="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="feeSubType != null and feeSubType != ''">AND d.kind_name = #{feeSubType}</if>
...@@ -379,7 +371,7 @@ ...@@ -379,7 +371,7 @@
<if test="companyValueList != null and companyValueList.size() > 0"> <if test="companyValueList != null and companyValueList.size() > 0">
AND c.company_value in AND c.company_value in
<foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=","> <foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=",">
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0"> #{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if> <if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if>
...@@ -388,23 +380,19 @@ ...@@ -388,23 +380,19 @@
<if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form SELECT c.cost_no no,c.bank_company receiveUnit,d.cost_reason reason,c.pay_time payTime,c.cost_form manageCostType,u.departmentname1 departmentName,
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,
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, d.id as costId1, c.id as costId d.amount * c.to_rmb_rate amountRmb, d.id as costId1, c.id as costId
FROM user u, cost c, cost_detail d, type_relation t 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 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
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,78,72,71,67,58,64,46) AND d.kind_name not in ('百伦咨询服务费')
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,78,72,71,67,58,54,46) AND
d.kind_name not in ('百伦咨询服务费')
<if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if> <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="feeSubType != null and feeSubType != ''">AND d.kind_name = #{feeSubType}</if>
<if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if> <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
<if test="companyValueList != null and companyValueList.size() > 0"> <if test="companyValueList != null and companyValueList.size() > 0">
AND c.company_value in AND c.company_value in
<foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=","> <foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=",">
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0"> #{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if> <if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if>
...@@ -413,10 +401,8 @@ ...@@ -413,10 +401,8 @@
<if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form manageCostType,u.departmentname1 departmentName,
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.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name
feeSubType,-c1.amount amount,c1.dic currency,
-c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId -c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId
FROM user u, type_relation t ,cost c1 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 WHERE c1.create_userid = u.userid AND t.fee_type = c1.type_name AND c1.cost_form = 2 AND c1.cost_status = 4
...@@ -430,7 +416,7 @@ ...@@ -430,7 +416,7 @@
<if test="companyValueList != null and companyValueList.size() > 0"> <if test="companyValueList != null and companyValueList.size() > 0">
AND c1.company_value in AND c1.company_value in
<foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=","> <foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=",">
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0"> #{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if> <if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if>
...@@ -439,14 +425,12 @@ ...@@ -439,14 +425,12 @@
<if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form SELECT c1.cost_no no,c1.bank_company receiveUnit,c1.cost_reason reason,c1.pay_time payTime,c1.cost_form manageCostType,u.departmentname1 departmentName,
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.company_value companyValue,c1.company_name companyName,t.manage_cost_type feeSuperType,c1.kind_name
feeSubType,-c1.amount amount,c1.dic currency,
-c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId -c1.amount * c1.to_rmb_rate amountRmb, 0 as costId1, c1.id as costId
FROM user u, type_relation t ,cost c1 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 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,3,5,7,8,11,46,48,50,53,59,60,61,66,69,78,72,71,67,58,54,46) 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,78,72,71,67,58,64,46) 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 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.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) AND c2.logistics_supplier_id is null)
...@@ -456,7 +440,7 @@ ...@@ -456,7 +440,7 @@
<if test="companyValueList != null and companyValueList.size() > 0"> <if test="companyValueList != null and companyValueList.size() > 0">
AND c1.company_value in AND c1.company_value in
<foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=","> <foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=",">
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0"> #{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if> <if test="companyName != null and companyName != ''">AND c1.company_name = #{companyName}</if>
...@@ -465,22 +449,19 @@ ...@@ -465,22 +449,19 @@
<if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c1.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c1.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT c.cost_no no,c.bank_company receiveUnit,c.cost_reason reason,c.pay_time payTime,c.cost_form SELECT c.cost_no no,c.bank_company receiveUnit,c.cost_reason reason,c.pay_time payTime,c.cost_form manageCostType,u.departmentname1 departmentName,
manageCostType,u.departmentname1 departmentName, c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,c.kind_name feeSubType,c.amount amount,c.dic currency,
c.company_value companyValue,c.company_name companyName,t.manage_cost_type feeSuperType,c.kind_name
feeSubType,c.amount amount,c.dic currency,
c.amount * c.to_rmb_rate amountRmb, 0 as costId1, c.id as costId c.amount * c.to_rmb_rate amountRmb, 0 as costId1, c.id as costId
FROM user u, cost c, type_relation t FROM user u, cost c, type_relation t
WHERE c.create_userid = u.userid AND t.fee_type = c.type_name AND c.cost_form = 3 AND c.is_lend = 2 AND WHERE c.create_userid = u.userid AND t.fee_type = c.type_name AND c.cost_form = 3 AND c.is_lend = 2 AND c.cost_status = 4
c.cost_status = 4 AND c.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69,78,72,71,67,58,64,46) AND c.kind_name not in ('百伦咨询服务费')
AND c.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69,78,72,71,67,58,54,46) AND c.kind_name not in ('百伦咨询服务费')
<if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if> <if test="feeSuperType != null and feeSuperType != ''">AND t.manage_cost_type = #{feeSuperType}</if>
<if test="feeSubType != null and feeSubType != ''">AND c.kind_name = #{feeSubType}</if> <if test="feeSubType != null and feeSubType != ''">AND c.kind_name = #{feeSubType}</if>
<if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if> <if test="departmentName != null and departmentName != ''">AND u.departmentname1 = #{departmentName}</if>
<if test="companyValueList != null and companyValueList.size() > 0"> <if test="companyValueList != null and companyValueList.size() > 0">
AND c.company_value in AND c.company_value in
<foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=","> <foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=",">
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0"> #{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if> <if test="companyName != null and companyName != ''">AND c.company_name = #{companyName}</if>
...@@ -489,12 +470,11 @@ ...@@ -489,12 +470,11 @@
<if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if> <if test="startDate != null">AND c.pay_time <![CDATA[>=]]> #{startDate}</if>
<if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if> <if test="endDate != null">AND c.pay_time <![CDATA[<]]>#{endDate}</if>
UNION UNION
SELECT b.buyno no,b.suppliername receiveUnit,b.note reason,b.pay_time payTime,0 as SELECT b.buyno no,b.suppliername receiveUnit,b.note reason,b.pay_time payTime,0 as manageCostType,b.departmentname departmentName,
manageCostType,b.departmentname departmentName,
b.company_value companyValue,b.company companyName,b.sku_type_name feeSuperType,b.sku_type_name feeSubType, b.company_value companyValue,b.company companyName,b.sku_type_name feeSuperType,b.sku_type_name feeSubType,
b.amount amount,'CNY',b.amount amountRmb, 0 as costId1, b.id as costId b.amount amount,'CNY',b.amount amountRmb, 0 as costId1, b.id as costId
FROM buy b FROM buy b
WHERE b.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69,78,72,71,67,58,54,46) AND b.sku_type_name in ('固定资产','低值易耗品') WHERE b.company_value in (1,2,3,5,7,8,11,46,48,50,53,59,60,61,66,69,78,72,71,67,58,64,46) AND b.sku_type_name in ('固定资产','低值易耗品')
and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3 and b.buystatus <![CDATA[>]]> 3 and b.buystatus <![CDATA[<]]> 7 and b.buy_type <![CDATA[<]]> 3
<if test="feeSuperType != null and feeSuperType != ''">AND b.sku_type_name = #{feeSuperType}</if> <if test="feeSuperType != null and feeSuperType != ''">AND b.sku_type_name = #{feeSuperType}</if>
<if test="feeSubType != null and feeSubType != ''">AND b.sku_type_name = #{feeSubType}</if> <if test="feeSubType != null and feeSubType != ''">AND b.sku_type_name = #{feeSubType}</if>
...@@ -502,7 +482,7 @@ ...@@ -502,7 +482,7 @@
<if test="companyValueList != null and companyValueList.size() > 0"> <if test="companyValueList != null and companyValueList.size() > 0">
AND b.company_value in AND b.company_value in
<foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=","> <foreach collection="companyValueList" item="companyValue" index="index" open="(" close=")" separator=",">
<if test="companyValue != null and companyValue != 0">#{companyValue}</if> <if test="companyValue != null and companyValue != 0"> #{companyValue}</if>
</foreach> </foreach>
</if> </if>
<if test="companyName != null and companyName != ''">AND b.company = #{companyName}</if> <if test="companyName != null and companyName != ''">AND b.company = #{companyName}</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment