Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
finance_serv
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 594941aa
authored
Jul 30, 2018
by
王军业
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
加入合同验收信息部分
1 parent
c8847d85
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
130 additions
and
35 deletions
code/FinancialSystem/src/main/java/com/vion/financial/controller/ContractController.java
code/FinancialSystem/src/main/java/com/vion/financial/controller/DeliverGoodsController.java
code/FinancialSystem/src/main/java/com/vion/financial/entity/Appendix.java
code/FinancialSystem/src/main/java/com/vion/financial/entity/DeliverGoods.java
code/FinancialSystem/src/main/java/com/vion/financial/entity/ProjectAcceptanc.java
code/FinancialSystem/src/main/java/com/vion/financial/mapper/ContractMapper.java
code/FinancialSystem/src/main/java/com/vion/financial/mapper/ProjectAcceptancMapper.java
code/FinancialSystem/src/main/java/com/vion/financial/mapper/ProjectMapper.java
code/FinancialSystem/src/main/java/com/vion/financial/mapping/AppendixMapper.xml
code/FinancialSystem/src/main/java/com/vion/financial/mapping/ContractMapper.xml
code/FinancialSystem/src/main/java/com/vion/financial/mapping/ProjectAcceptancMapper.xml
code/FinancialSystem/src/main/java/com/vion/financial/mapping/ProjectMapper.xml
code/FinancialSystem/src/main/java/com/vion/financial/service/ContractService.java
code/FinancialSystem/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
code/FinancialSystem/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java
code/FinancialSystem/src/main/java/com/vion/financial/vo/ContractVo.java
code/FinancialSystem/src/main/java/com/vion/financial/vo/DeliverGoodsVo.java
code/FinancialSystem/src/main/resources/application.yml
code/FinancialSystem/src/main/java/com/vion/financial/controller/ContractController.java
View file @
594941a
...
...
@@ -44,4 +44,10 @@ public class ContractController extends BaseController {
public
Object
deleteOne
(
@PathVariable
String
contract_unid
)
{
return
contractService
.
deleteOne
(
contract_unid
);
}
@GetMapping
(
value
=
"codes"
)
@ResponseBody
public
Object
queryList
()
{
return
contractService
.
queryList
();
}
}
code/FinancialSystem/src/main/java/com/vion/financial/controller/DeliverGoodsController.java
View file @
594941a
...
...
@@ -2,6 +2,7 @@ package com.vion.financial.controller;
import
javax.annotation.Resource
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -36,4 +37,10 @@ public class DeliverGoodsController extends BaseController{
public
Object
updateDeliverInf
(
@RequestBody
DeliverGoodsVo
deliverGoodsVo
,
@PathVariable
String
contract_unid
)
{
return
deliverGoodsService
.
updateDeliverGoods
(
deliverGoodsVo
,
contract_unid
);
}
@DeleteMapping
(
"/{contract_unid}/delivers"
)
@ResponseBody
public
Object
deleteDeliverInfo
(
@RequestBody
DeliverGoodsVo
deliverGoodsVo
,
@PathVariable
String
contract_unid
)
{
return
deliverGoodsService
.
deleteDeliverGoods
(
deliverGoodsVo
,
contract_unid
);
}
}
code/FinancialSystem/src/main/java/com/vion/financial/entity/Appendix.java
View file @
594941a
package
com
.
vion
.
financial
.
entity
;
public
class
Appendix
{
private
int
appendix_unid
;
private
Integer
appendix_unid
;
private
String
business_table
;
private
String
business_unid
;
private
String
appendix_name
;
private
String
appendix_type
;
private
String
appendix_url
;
public
int
getAppendix_unid
()
{
public
Integer
getAppendix_unid
()
{
return
appendix_unid
;
}
public
void
setAppendix_unid
(
int
appendix_unid
)
{
public
void
setAppendix_unid
(
Integer
appendix_unid
)
{
this
.
appendix_unid
=
appendix_unid
;
}
public
String
getBusiness_table
()
{
...
...
code/FinancialSystem/src/main/java/com/vion/financial/entity/DeliverGoods.java
View file @
594941a
...
...
@@ -12,7 +12,8 @@ public class DeliverGoods {
private
String
contract_unid
;
private
Date
deliver_goods_date
;
private
Date
goods_acceptanc_date
;
private
List
<
Appendix
>
appendix_list
;
private
List
<
Appendix
>
list_deliver_data
;
List
<
Integer
>
appendix_unids
;
public
int
getDeliver_unid
()
{
return
deliver_unid
;
}
...
...
@@ -37,11 +38,18 @@ public class DeliverGoods {
public
void
setGoods_acceptanc_date
(
Date
goods_acceptanc_date
)
{
this
.
goods_acceptanc_date
=
goods_acceptanc_date
;
}
public
List
<
Appendix
>
get
Appendix_list
()
{
return
appendix_list
;
public
List
<
Appendix
>
get
List_deliver_data
()
{
return
list_deliver_data
;
}
public
void
set
Appendix_list
(
List
<
Appendix
>
appendix_list
)
{
this
.
appendix_list
=
appendix_list
;
public
void
set
List_deliver_data
(
List
<
Appendix
>
list_deliver_data
)
{
this
.
list_deliver_data
=
list_deliver_data
;
}
public
List
<
Integer
>
getAppendix_unids
()
{
return
appendix_unids
;
}
public
void
setAppendix_unids
(
List
<
Integer
>
appendix_unids
)
{
this
.
appendix_unids
=
appendix_unids
;
}
}
code/FinancialSystem/src/main/java/com/vion/financial/entity/ProjectAcceptanc.java
View file @
594941a
package
com
.
vion
.
financial
.
entity
;
import
java.util.Date
;
import
java.util.List
;
public
class
ProjectAcceptanc
{
private
int
acceptanc_unid
;
...
...
@@ -8,6 +9,8 @@ public class ProjectAcceptanc {
private
String
acceptanc_type
;
private
Date
acceptanc_date
;
private
String
acceptanc_note
;
private
List
<
Integer
>
appendix_unids
;
private
List
<
ProjectAcceptanc
>
appendix_list
;
public
int
getAcceptanc_unid
()
{
return
acceptanc_unid
;
}
...
...
@@ -38,5 +41,17 @@ public class ProjectAcceptanc {
public
void
setAcceptanc_note
(
String
acceptanc_note
)
{
this
.
acceptanc_note
=
acceptanc_note
;
}
public
List
<
ProjectAcceptanc
>
getAppendix_list
()
{
return
appendix_list
;
}
public
void
setAppendix_list
(
List
<
ProjectAcceptanc
>
appendix_list
)
{
this
.
appendix_list
=
appendix_list
;
}
public
List
<
Integer
>
getAppendix_unids
()
{
return
appendix_unids
;
}
public
void
setAppendix_unids
(
List
<
Integer
>
appendix_unids
)
{
this
.
appendix_unids
=
appendix_unids
;
}
}
code/FinancialSystem/src/main/java/com/vion/financial/mapper/ContractMapper.java
View file @
594941a
package
com
.
vion
.
financial
.
mapper
;
import
java.util.List
;
import
org.springframework.transaction.annotation.Transactional
;
import
com.vion.financial.vo.ContractVo
;
...
...
@@ -14,8 +16,9 @@ public interface ContractMapper {
public
void
updateOne
(
ContractVo
contractVo
);
@Transactional
public
void
deleteOne
(
String
contract_unid
);
public
List
<
String
>
queryList
();
public
ContractsListVo
selectByCondition
(
SelectVo
selectVo
);
public
boolean
isDelete
(
String
contract_unid
);
}
code/FinancialSystem/src/main/java/com/vion/financial/mapper/ProjectAcceptancMapper.java
View file @
594941a
package
com
.
vion
.
financial
.
mapper
;
import
java.util.List
;
import
com.vion.financial.entity.ProjectAcceptanc
;
public
interface
ProjectAcceptancMapper
{
public
Object
addProjectAcceptanc
(
ProjectAcceptanc
projectAcceptanc
);
public
ProjectAcceptanc
queryProjectAcceptanc
(
String
s
);
public
Object
updateProjectAcceptanc
(
ProjectAcceptanc
projectAcceptanc
);
public
Object
deleteProjectAcceptanc
(
int
n
);
public
void
addProjectAcceptanc
(
ProjectAcceptanc
projectAcceptanc
);
public
List
<
ProjectAcceptanc
>
queryProjectAcceptanc
(
String
s
);
public
void
updateProjectAcceptanc
(
ProjectAcceptanc
projectAcceptanc
);
public
void
deleteProjectAcceptanc
(
int
n
);
}
code/FinancialSystem/src/main/java/com/vion/financial/mapper/ProjectMapper.java
View file @
594941a
package
com
.
vion
.
financial
.
mapper
;
import
java.util.List
;
import
com.vion.financial.entity.Project
;
public
interface
ProjectMapper
{
public
Object
addProject
(
Project
projec
);
public
Project
queryProject
(
String
s
);
public
Object
updateProject
(
Project
project
);
public
Object
deleteProject
(
int
n
);
public
void
addProject
(
Project
projec
);
public
List
<
Project
>
queryProject
();
public
void
updateProject
(
Project
project
);
public
void
deleteProject
(
int
n
);
}
code/FinancialSystem/src/main/java/com/vion/financial/mapping/AppendixMapper.xml
View file @
594941a
...
...
@@ -76,6 +76,6 @@
where appendix_unid = #{appendix_unid}
</update>
<delete
id=
"deleteAppendix"
parameterType=
"com.vion.financial.entity.Appendix"
>
delete from tb_appendix where business_table = #{business_table}
and business_unid = #{business_unid}
delete from tb_appendix where business_table = #{business_table}
or business_unid = #{business_unid}
</delete>
</mapper>
\ No newline at end of file
code/FinancialSystem/src/main/java/com/vion/financial/mapping/ContractMapper.xml
View file @
594941a
...
...
@@ -279,4 +279,7 @@
<select
id=
"isDelete"
parameterType=
"String"
resultType=
"boolean"
>
select is_delete from tb_contract where contract_unid = #{contract_unid}
</select>
<select
id=
"queryList"
resultType=
"String"
>
select contract_unid from tb_contract
</select>
</mapper>
code/FinancialSystem/src/main/java/com/vion/financial/mapping/ProjectAcceptancMapper.xml
View file @
594941a
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.vion.financial.mapper.ProjectAcceptancMapper"
>
<insert
id=
"addProjectAcceptanc"
parameterType=
"com.vion.financial.entity.ProjectAcceptanc"
>
<insert
id=
"addProjectAcceptanc"
parameterType=
"com.vion.financial.entity.ProjectAcceptanc"
keyColumn=
"acceptanc_unid"
useGeneratedKeys=
"true"
keyProperty=
"acceptanc_unid"
>
insert into tb_project_acceptanc (contract_unid,acceptanc_type,acceptanc_date,acceptanc_note)
values(#{contract_unid},#{acceptanc_type},#{acceptanc_date},#{acceptanc_note})
</insert>
...
...
@@ -9,7 +9,7 @@
update tb_project_acceptanc set contract_unid = #{contract_unid},acceptanc_type = #{acceptanc_type},acceptanc_date = #{acceptanc_date},acceptanc_note = #{acceptanc_note}
where acceptanc_unid = #{acceptanc_unid}
</update>
<select
id=
"queryProjectAcceptanc"
parameterType=
"String"
>
<select
id=
"queryProjectAcceptanc"
parameterType=
"String"
resultType=
"com.vion.financial.entity.ProjectAcceptanc"
>
select *from tb_project_acceptanc where contract_unid = #{contract_unid}
</select>
<delete
id=
"deleteProjectAcceptanc"
parameterType=
"int"
>
...
...
code/FinancialSystem/src/main/java/com/vion/financial/mapping/ProjectMapper.xml
View file @
594941a
...
...
@@ -8,8 +8,8 @@
update tb_project set contract_unid = #{contract_unid},project_name = #{project_name}
where project_unid = #{project_unid}
</update>
<select
id=
"queryProject"
parameterType=
"String"
>
select *
from tb_project where contract_unid = #{contract_unid}
<select
id=
"queryProject"
resultType=
"com.vion.financial.entity.Project"
>
select *
from tb_project where contract_unid = #{contract_unid}
</select>
<delete
id=
"deleteProject"
parameterType=
"int"
>
delete from tb_project where project_unid = #{project_unid}
...
...
code/FinancialSystem/src/main/java/com/vion/financial/service/ContractService.java
View file @
594941a
...
...
@@ -3,9 +3,10 @@ package com.vion.financial.service;
import
com.vion.financial.vo.ContractVo
;
public
interface
ContractService
{
Object
addOne
(
ContractVo
vontractVo
);
Object
queryOne
(
String
s
);
Object
updateOne
(
ContractVo
vontractVo
);
Object
deleteOne
(
String
s
);
public
Object
addOne
(
ContractVo
vontractVo
);
public
Object
queryOne
(
String
s
);
public
Object
updateOne
(
ContractVo
vontractVo
);
public
Object
deleteOne
(
String
s
);
public
Object
queryList
();
boolean
isDelete
(
String
s
);
}
code/FinancialSystem/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
View file @
594941a
...
...
@@ -124,4 +124,20 @@ public class ContractServiceImpl implements ContractService {
public
boolean
isDelete
(
String
s
)
{
return
contractMapper
.
isDelete
(
s
);
}
@Override
public
Object
queryList
()
{
// TODO Auto-generated method stub
try
{
logger
.
info
(
"=================查询合同编号================="
);
return
contractMapper
.
queryList
();
}
catch
(
Exception
e
)
{
// TODO: handle exception
logger
.
error
(
"查询合同列表异常"
+
e
.
getLocalizedMessage
(),
e
);
e
.
printStackTrace
();
failCode
.
setEnode
(
"500"
);
failCode
.
setEnode
(
"查询异常"
);
return
failCode
;
}
}
}
code/FinancialSystem/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java
View file @
594941a
...
...
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import
com.vion.financial.entity.Appendix
;
import
com.vion.financial.entity.DeliverGoods
;
import
com.vion.financial.entity.Receipt
;
import
com.vion.financial.mapper.DeliverGoodsMapper
;
import
com.vion.financial.service.AppendixService
;
import
com.vion.financial.service.ContractService
;
...
...
@@ -43,10 +44,11 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
for
(
DeliverGoods
deliverGoods:
list
)
{
deliverGoods
.
setContract_unid
(
s
);
deliverGoodsMapper
.
addDeliverGoods
(
deliverGoods
);
for
(
int
appendixUnid:
deliverGoods
Vo
.
getAppendix_unids
())
{
for
(
int
appendixUnid:
deliverGoods
.
getAppendix_unids
())
{
appendix
.
setAppendix_unid
(
appendixUnid
);
appendix
.
setBusiness_table
(
"tb_deliver_goods"
);
appendix
.
setBusiness_unid
(
String
.
valueOf
(
deliverGoods
.
getDeliver_unid
()));
appendixService
.
updateAppendix
(
appendix
);
}
}
return
successCode
;
...
...
@@ -78,7 +80,7 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
appendix
.
setBusiness_table
(
"tb_deliver_goods"
);
appendix
.
setBusiness_unid
(
String
.
valueOf
(
deliverGoods
.
getDeliver_unid
()));
Object
o
=
appendixService
.
queryAppendixList
(
appendix
);
deliverGoods
.
set
Appendix_list
(
o
==
null
?
null
:
(
List
)
o
);
deliverGoods
.
set
List_deliver_data
(
o
==
null
?
null
:
(
List
)
o
);
deliverGoodsVo
.
getList_deliver_data
().
add
(
deliverGoods
);
}
}
...
...
@@ -125,7 +127,25 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
@Override
public
Object
deleteDeliverGoods
(
DeliverGoodsVo
deliverGoodsVo
,
String
s
)
{
// TODO Auto-generated method stub
return
null
;
try
{
logger
.
info
(
"=========================删除合同发货信息======================="
);
if
(
contractService
.
isDelete
(
s
))
{
for
(
int
receiptUnid
:
deliverGoodsVo
.
getDeliver_unids
())
{
deliverGoodsMapper
.
deleteDeliverGoods
(
receiptUnid
);;
}
return
successCode
;
}
else
{
failCode
.
setEnode
(
"100"
);
failCode
.
setEnote
(
"合同已删除"
);
return
failCode
;
}
}
catch
(
Exception
e
)
{
logger
.
error
(
"删除发货信息异常"
+
e
.
getLocalizedMessage
(),
e
);
failCode
.
setEnode
(
"500"
);
failCode
.
setEnode
(
"删除异常"
);
return
failCode
;
}
}
}
code/FinancialSystem/src/main/java/com/vion/financial/vo/ContractVo.java
View file @
594941a
...
...
@@ -44,6 +44,7 @@ public class ContractVo extends SelectVo{
private
String
business_table
;
private
String
business_unid
;
private
List
<
PaymentAgree
>
paymentAgree_list
;
private
List
<
String
>
contract_unids
;
//private List<> payment_data;
public
String
getContract_unid
()
{
...
...
@@ -250,6 +251,12 @@ public class ContractVo extends SelectVo{
public
void
setPaymentAgree_list
(
List
<
PaymentAgree
>
paymentAgree_list
)
{
this
.
paymentAgree_list
=
paymentAgree_list
;
}
public
List
<
String
>
getContract_unids
()
{
return
contract_unids
;
}
public
void
setContract_unids
(
List
<
String
>
contract_unids
)
{
this
.
contract_unids
=
contract_unids
;
}
}
code/FinancialSystem/src/main/java/com/vion/financial/vo/DeliverGoodsVo.java
View file @
594941a
...
...
@@ -16,7 +16,7 @@ public class DeliverGoodsVo {
private
Date
deliver_goods_date
;
private
Date
goods_acceptanc_date
;
List
<
DeliverGoods
>
list_deliver_data
;
List
<
Integer
>
appendix_unids
;
List
<
Integer
>
deliver_unids
;
public
List
<
DeliverGoods
>
getList_deliver_data
()
{
return
list_deliver_data
;
}
...
...
@@ -47,10 +47,12 @@ public class DeliverGoodsVo {
public
void
setGoods_acceptanc_date
(
Date
goods_acceptanc_date
)
{
this
.
goods_acceptanc_date
=
goods_acceptanc_date
;
}
public
List
<
Integer
>
get
Appendix_unids
()
{
return
appendix_unids
;
public
List
<
Integer
>
get
Deliver_unids
()
{
return
deliver_unids
;
}
public
void
set
Appendix_unids
(
List
<
Integer
>
appendix_unids
)
{
this
.
appendix_unids
=
appendix_unids
;
public
void
set
Deliver_unids
(
List
<
Integer
>
deliver_unids
)
{
this
.
deliver_unids
=
deliver_unids
;
}
}
code/FinancialSystem/src/main/resources/application.yml
View file @
594941a
...
...
@@ -14,8 +14,11 @@ spring:
password
:
authpass
driver-class-name
:
org.postgresql.Driver
hikari
:
connection-timeout
:
1800000
connection-timeout
:
30000
maximum-pool-size
:
20
dbcp2
:
max-total
:
20
pool-prepared-statements
:
true
# hikari:
# maximum-pool-size:
http
:
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment