Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bailuntec-cost
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
bailuntec-cost
Commits
3fad4f1e
Commit
3fad4f1e
authored
Nov 03, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据最后更新时间查询同步
parent
9cfb6558
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
77 additions
and
93 deletions
+77
-93
BuyDomain.java
...rc/main/java/com/bailuntec/cost/api/domain/BuyDomain.java
+6
-5
BuyMapper.xml
bailuntec-cost-core/src/main/resources/mapper/BuyMapper.xml
+62
-79
Cost.xml
bailuntec-cost-core/src/main/resources/mapper/Cost.xml
+9
-9
No files found.
bailuntec-cost-api/src/main/java/com/bailuntec/cost/api/domain/BuyDomain.java
View file @
3fad4f1e
...
@@ -5,13 +5,14 @@ import lombok.Data;
...
@@ -5,13 +5,14 @@ import lombok.Data;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
@Data
@Data
public
class
BuyDomain
{
public
class
BuyDomain
{
private
Integer
id
;
private
Integer
id
;
private
String
no
;
// 采购计划单号
private
String
no
;
// 采购计划单号
private
String
buyno
;
// 采购单号
private
String
buyno
;
// 采购单号
private
Integer
buystatus
;
//采购单状态,-1:作废,0:待确认 1:待出纳审核 2:出纳未付款 3:已付款 4:发货入库中,5:退换货 6:采购完成
private
Integer
buystatus
;
//采购单状态,-1:作废,0:待确认 1:待出纳审核 2:出纳未付款 3:已付款 4:发货入库中,5:退换货 6:采购完成
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
arrivaldate
;
// 预计到货日期
private
Date
arrivaldate
;
// 预计到货日期
private
String
warehouseid
;
// 接收货物仓库
private
String
warehouseid
;
// 接收货物仓库
private
String
warehousename
;
// 接收货物仓库名称
private
String
warehousename
;
// 接收货物仓库名称
...
@@ -24,11 +25,11 @@ public class BuyDomain {
...
@@ -24,11 +25,11 @@ public class BuyDomain {
private
BigDecimal
payamount
;
// 实际支付总金额
private
BigDecimal
payamount
;
// 实际支付总金额
private
Integer
count
;
// 采购总数量
private
Integer
count
;
// 采购总数量
private
BigDecimal
expressfee
;
// 快递费
private
BigDecimal
expressfee
;
// 快递费
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createtime
;
//` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
private
Date
createtime
;
//` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
private
Integer
lastupdateuserid
;
// 最后操作人id
private
Integer
lastupdateuserid
;
// 最后操作人id
private
String
lastupdateusername
;
// 最后操作人名称
private
String
lastupdateusername
;
// 最后操作人名称
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
lastupdatetime
;
// 最后更新时间
private
Date
lastupdatetime
;
// 最后更新时间
private
Integer
buyuserid
;
// 采购员id
private
Integer
buyuserid
;
// 采购员id
private
Integer
paystatus
;
// 付款状态,0:未付款,1:部分付款,2:已付款,3无需付款
private
Integer
paystatus
;
// 付款状态,0:未付款,1:部分付款,2:已付款,3无需付款
...
@@ -46,7 +47,7 @@ public class BuyDomain {
...
@@ -46,7 +47,7 @@ public class BuyDomain {
private
String
departmentname
;
// 部门名称
private
String
departmentname
;
// 部门名称
private
Integer
audituserid
;
// 审核人id
private
Integer
audituserid
;
// 审核人id
private
String
auditusername
;
// 审核人名称
private
String
auditusername
;
// 审核人名称
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
audittime
;
// 审核时间
private
Date
audittime
;
// 审核时间
private
String
auditnote
;
// 审核备注
private
String
auditnote
;
// 审核备注
private
String
skucode
;
// sku 编码
private
String
skucode
;
// sku 编码
...
@@ -60,7 +61,7 @@ public class BuyDomain {
...
@@ -60,7 +61,7 @@ public class BuyDomain {
private
String
supplierBankname
;
// 供应商银行名称
private
String
supplierBankname
;
// 供应商银行名称
private
String
supplierCardno
;
// 供应商银行账号
private
String
supplierCardno
;
// 供应商银行账号
private
String
supplierCardusername
;
// 供应商持卡人
private
String
supplierCardusername
;
// 供应商持卡人
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
payTime
;
// 付款时间
private
Date
payTime
;
// 付款时间
private
String
skuTypeName
;
// sku 大类标题
private
String
skuTypeName
;
// sku 大类标题
private
Integer
companyValue
;
// 采购公司主体value
private
Integer
companyValue
;
// 采购公司主体value
...
...
bailuntec-cost-core/src/main/resources/mapper/BuyMapper.xml
View file @
3fad4f1e
...
@@ -4,62 +4,56 @@
...
@@ -4,62 +4,56 @@
<mapper
namespace=
"com.blt.other.module.purchasing.dao.BuyDao"
>
<mapper
namespace=
"com.blt.other.module.purchasing.dao.BuyDao"
>
<insert
id=
"insert"
useGeneratedKeys=
"true"
keyColumn=
"id"
keyProperty=
"id"
>
<insert
id=
"insert"
useGeneratedKeys=
"true"
keyColumn=
"id"
keyProperty=
"id"
>
INSERT INTO
INSERT INTO buy(no, buyno, buystatus, arrivaldate, warehouseid, warehousename, paycompanyid, paycompanyname,
buy(
supplierid, suppliername,
no,buyno,buystatus,arrivaldate,warehouseid,warehousename,paycompanyid,paycompanyname,supplierid,suppliername,
paytype, amount, payamount, count, expressfee, createtime, lastupdateuserid, lastupdateusername,
paytype,amount,payamount,count,expressfee,createtime,lastupdateuserid,lastupdateusername,lastupdatetime,
lastupdatetime,
buyuserid,paystatus,sendstatus,createuserid,createusername,
buyuserid, paystatus, sendstatus, createuserid, createusername,
orderno,note,delstatus,isurgency,buyusername,fileid,filepath,departmentid,departmentname,
orderno, note, delstatus, isurgency, buyusername, fileid, filepath, departmentid,
audituserid,auditusername,audittime,auditnote,skucode,skuname,company,supplier_no,reject_reason,detail_key,link_lend_cost_no,
departmentname,
supplier_bankname,supplier_cardno,supplier_cardusername,pay_time,sku_type_name,company_value,buy_type,installment_info
audituserid, auditusername, audittime, auditnote, skucode, skuname, company, supplier_no,
)
reject_reason, detail_key, link_lend_cost_no,
supplier_bankname, supplier_cardno, supplier_cardusername, pay_time, sku_type_name,
company_value, buy_type, installment_info)
VALUE
VALUE
(
(
#{no},#{buyno},#{buystatus},#{arrivaldate},#{warehouseid},#{warehousename},#{paycompanyid},#{paycompanyname},#{supplierid},#{suppliername},
#{no}, #{buyno}, #{buystatus}, #{arrivaldate}, #{warehouseid}, #{warehousename}, #{paycompanyid},
#{paytype},#{amount},#{payamount},#{count},#{expressfee},#{createtime},#{lastupdateuserid},#{lastupdateusername},#{lastupdatetime},
#{paycompanyname}, #{supplierid}, #{suppliername},
#{buyuserid},#{paystatus},#{sendstatus},#{createuserid},#{createusername},
#{paytype}, #{amount}, #{payamount}, #{count}, #{expressfee}, #{createtime}, #{lastupdateuserid},
#{orderno},#{note},#{delstatus},#{isurgency},#{buyusername},#{fileid},#{filepath},#{departmentid},#{departmentname},
#{lastupdateusername}, #{lastupdatetime},
#{audituserid},#{auditusername},#{audittime},#{auditnote},#{skucode},#{skuname},#{company},#{supplierNo},#{rejectReason},#{detailKey},#{linkLendCostNo},
#{buyuserid}, #{paystatus}, #{sendstatus}, #{createuserid}, #{createusername},
#{supplierBankname},#{supplierCardno},#{supplierCardusername},#{payTime},#{skuTypeName},#{companyValue},#{buyType},#{installmentInfo}
#{orderno}, #{note}, #{delstatus}, #{isurgency}, #{buyusername}, #{fileid}, #{filepath}, #{departmentid},
#{departmentname},
#{audituserid}, #{auditusername}, #{audittime}, #{auditnote}, #{skucode}, #{skuname}, #{company},
#{supplierNo}, #{rejectReason}, #{detailKey}, #{linkLendCostNo},
#{supplierBankname}, #{supplierCardno}, #{supplierCardusername}, #{payTime}, #{skuTypeName},
#{companyValue}, #{buyType}, #{installmentInfo}
)
)
</insert>
</insert>
<select
id=
"selectByNoAndSkucode"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectByNoAndSkucode"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE no = #{no}
buy
AND skucode = #{skucode}
WHERE
no = #{no}
AND
skucode = #{skucode}
</select>
</select>
<select
id=
"selectAll"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectAll"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
ORDER BY id DESC
buy
ORDER BY
id DESC
</select>
</select>
<select
id=
"selectBySkucode"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectBySkucode"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE skucode = #{skucode}
buy
WHERE
skucode = #{skucode}
</select>
</select>
<select
id=
"selectByBuyno"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectByBuyno"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE buyno = #{buyno}
buy
WHERE
buyno = #{buyno}
</select>
</select>
<update
id=
"update"
parameterType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<update
id=
"update"
parameterType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
...
@@ -126,53 +120,40 @@
...
@@ -126,53 +120,40 @@
<update
id=
"updateInstallment"
parameterType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<update
id=
"updateInstallment"
parameterType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
UPDATE
UPDATE
buy
buy
SET
SET buy_type=#{buyType},
buy_type=#{buyType},
installment_info=#{installmentInfo}
installment_info=#{installmentInfo}
WHERE
WHERE buyno = #{buyno}
buyno = #{buyno}
</update>
</update>
<delete
id=
"deleteBuy"
>
<delete
id=
"deleteBuy"
>
delete from buy where buyno = #{buyNo}
delete
from buy
where buyno = #{buyNo}
</delete>
</delete>
<select
id=
"selectBuy"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectBuy"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE buyno = #{buyno}
buy
WHERE
buyno = #{buyno}
</select>
</select>
<select
id=
"selectByPlanNo"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectByPlanNo"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE no = #{planNo}
buy
WHERE
no = #{planNo}
</select>
</select>
<select
id=
"selectBySkuKeyWord"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectBySkuKeyWord"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE skuname LIKE CONCAT('%', #{searchKey}, '%')
buy
WHERE
skuname LIKE CONCAT('%',#{searchKey},'%')
</select>
</select>
<select
id=
"selectLastBuy"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectLastBuy"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE buy_type != 2
buy
ORDER BY id DESC
WHERE
buy_type != 2
ORDER BY
id DESC
LIMIT 1
LIMIT 1
</select>
</select>
...
@@ -187,12 +168,9 @@
...
@@ -187,12 +168,9 @@
</update>
</update>
<select
id=
"findByBuyNo"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"findByBuyNo"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT
SELECT *
*
FROM buy
FROM
WHERE buyno = #{buyNo}
buy
WHERE
buyno = #{buyNo}
LIMIT 1
LIMIT 1
</select>
</select>
...
@@ -233,6 +211,11 @@
...
@@ -233,6 +211,11 @@
</select>
</select>
<select
id=
"selectBalanceSheetBuy"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
<select
id=
"selectBalanceSheetBuy"
resultType=
"com.bailuntec.cost.api.domain.BuyDomain"
>
SELECT * FROM buy WHERE pay_time
<![CDATA[>=]]>
#{startDate} AND pay_time
<![CDATA[<]]>
#{endDate} AND sku_type_name = '固定资产' and buy_type
<![CDATA[<]]>
3
SELECT *
FROM buy
WHERE lastupdatetime
<![CDATA[>=]]>
#{startDate}
AND lastupdatetime
<![CDATA[<]]>
#{endDate}
AND sku_type_name = '固定资产'
and buy_type
<![CDATA[<]]>
3
</select>
</select>
</mapper>
</mapper>
bailuntec-cost-core/src/main/resources/mapper/Cost.xml
View file @
3fad4f1e
...
@@ -521,23 +521,23 @@
...
@@ -521,23 +521,23 @@
WHERE cost_form = 3
WHERE cost_form = 3
AND is_lend = 1
AND is_lend = 1
AND cost_status = 4
AND cost_status = 4
AND
pay_tim
e
<![CDATA[>=]]>
#{startDate}
AND
last_modify_dat
e
<![CDATA[>=]]>
#{startDate}
AND
pay_tim
e
<![CDATA[<]]>
#{endDate}
AND
last_modify_dat
e
<![CDATA[<]]>
#{endDate}
UNION
UNION
SELECT *
SELECT *
FROM cost
FROM cost
WHERE cost_form = 3
WHERE cost_form = 3
AND is_lend = 2
AND is_lend = 2
AND cost_status = 4
AND cost_status = 4
AND
pay_tim
e
<![CDATA[>=]]>
#{startDate}
AND
last_modify_dat
e
<![CDATA[>=]]>
#{startDate}
AND
pay_tim
e
<![CDATA[<]]>
#{endDate}
AND
last_modify_dat
e
<![CDATA[<]]>
#{endDate}
UNION
UNION
SELECT *
SELECT *
FROM cost
FROM cost
WHERE cost_form = 1
WHERE cost_form = 1
AND cost_status = 4
AND cost_status = 4
AND
pay_tim
e
<![CDATA[>=]]>
#{startDate}
AND
last_modify_dat
e
<![CDATA[>=]]>
#{startDate}
AND
pay_tim
e
<![CDATA[<]]>
#{endDate}
AND
last_modify_dat
e
<![CDATA[<]]>
#{endDate}
AND kind_name IN ('还款--其他应付款', '借出--其他应付款')
AND kind_name IN ('还款--其他应付款', '借出--其他应付款')
UNION
UNION
SELECT *
SELECT *
...
@@ -545,14 +545,14 @@
...
@@ -545,14 +545,14 @@
WHERE cost_form = 1
WHERE cost_form = 1
AND cost_status = 2
AND cost_status = 2
AND audit_time
<![CDATA[>=]]>
#{startDate}
AND audit_time
<![CDATA[>=]]>
#{startDate}
AND
audit_tim
e
<![CDATA[<]]>
#{endDate}
AND
last_modify_dat
e
<![CDATA[<]]>
#{endDate}
UNION
UNION
SELECT *
SELECT *
FROM cost
FROM cost
WHERE cost_form = 2
WHERE cost_form = 2
AND cost_status = 4
AND cost_status = 4
AND
pay_tim
e
<![CDATA[>=]]>
#{startDate}
AND
last_modify_dat
e
<![CDATA[>=]]>
#{startDate}
AND
pay_tim
e
<![CDATA[<]]>
#{endDate}
AND
last_modify_dat
e
<![CDATA[<]]>
#{endDate}
AND kind_name IN ('借款--其他应付款', '收款--其他应付款')
AND kind_name IN ('借款--其他应付款', '收款--其他应付款')
</select>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment