Skip to content

platform / finance_serv

Go to a project
Commit 4502b71d by 王军业
Options

u

1 parent de0448d2
Expand all
Inline Side-by-side
Showing 16 changed files with 37 additions and 488 deletions
code/finance_serv/src/main/java/com/vion/financial/mapping/AppendixMapper.xml
......@@ -76,6 +76,15 @@
where appendix_unid = #{appendix_unid}
</update>
<delete id="deleteAppendix" parameterType="com.vion.financial.entity.Appendix">
delete from tb_appendix where business_table = #{business_table} or business_unid = #{business_unid}
delete from tb_appendix where 1=1
<if test="business_table">
business_table = #{business_table} and
</if>
<if test="business_unid">
business_unid = #{business_unid} and
</if>
<if test="appendix_unid">
appendix_unid=#{appendix_unid}
</if>
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
......@@ -281,7 +281,10 @@
is_archive, bad_amount, bad_amount_note, confirm_income_amount,
amount_state_unid, start_guarantee_date, end_guarantee_date,
mainten_start_point, contract_note, is_delete, project_unid,
customer_unid from tb_contract where
customer_unid,
(sum(total_reback_view.actual_reback_amount) where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
(contract_amount-total_reback_amount-deduct_amount-stop_amount-exemptions_amount-bad_amount) ascontract_remain,
from tb_contract where
<if test="salesperson_name__like !=null and salesperson_name__like !=''">
salesperson_unid like #{salesperson_name__like}
and
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java
......@@ -103,11 +103,17 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
public Object updateDeliverGoods(DeliverGoodsVo deliverGoodsVo, String s) {
// TODO Auto-generated method stub
try {
Appendix appendix=null;
logger.info("===========================修改发货信息===========================");
if(contractService.isDelete(s)) {
List<DeliverGoods> list_deliver_data=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list_deliver_data) {
deliverGoodsMapper.updateDeliverGoods(deliverGoods);
for(int n:deliverGoods.getAppendix_unids()) {
appendix=new Appendix();
appendix.setAppendix_unid(n);
appendixService.deleteAppendix(appendix);
}
}
return successCode;
}else {
......@@ -131,7 +137,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
logger.info("=========================删除合同发货信息=======================");
if(contractService.isDelete(s)) {
for(int receiptUnid :deliverGoodsVo.getDeliver_unids()) {
deliverGoodsMapper.deleteDeliverGoods(receiptUnid);;
deliverGoodsMapper.deleteDeliverGoods(receiptUnid);
}
return successCode;
}
......
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
......@@ -43,6 +43,9 @@ public class ContractVo extends SelectVo{
private List<Appendix> appendix_list;
private String business_table;
private String business_unid;
private double total_reback_amount;
private double contract_remain;
private List<PaymentAgree> paymentAgree_list;
private List<String> contract_unids;
//private List<> payment_data;
......@@ -257,6 +260,18 @@ public class ContractVo extends SelectVo{
public void setContract_unids(List<String> contract_unids) {
this.contract_unids = contract_unids;
}
public double getTotal_reback_amount() {
return total_reback_amount;
}
public void setTotal_reback_amount(double total_reback_amount) {
this.total_reback_amount = total_reback_amount;
}
public double getContract_remain() {
return contract_remain;
}
public void setContract_remain(double contract_remain) {
this.contract_remain = contract_remain;
}
}
code/finance_serv/target/classes/application.yml deleted 100644 → 0
server:
port: 8080
spring:
thymeleaf:
prefix: classpath:/templates/thymeleaf/
suffix: .html
mode: HTML5
encoding: UTF-8
cache: false
datasource:
url: jdbc:postgresql://192.168.9.162:5432/financial_serv
username: postgres
password: authpass
driver-class-name: org.postgresql.Driver
###################以下为druid增加的配置###########################
type: com.alibaba.druid.pool.DruidDataSource
# 下面为连接池的补充设置，应用到上面所有数据源中
# 初始化大小，最小，最大
initialSize: 5
minIdle: 5
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# hikari:
# maximum-pool-size:
http:
multipart:
max-file-size: 20Mb
max-request-size: 40Mb
mybatis:
mapper-locations: com/vion/financial/mapping/*.xml
logging:
level:
root: INFO
pattern:
level: INFO
console: "[financial_serv]-[%d{yyyy-MM-dd HH:mm:ss.SSS}]-%m%n"
path: F:\LOG\
#pagehelper:
# helperDialect: postgresql
# reasonable: true
# supportMethodsArguments: true
# params: count=countSql
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/AppendixMapper.xml deleted 100644 → 0
<?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.AppendixMapper">
<select id="queryAppendixList" resultType="com.vion.financial.entity.Appendix" parameterType="com.vion.financial.entity.Appendix">
select * from tb_appendix where
<if test="business_table !=null and business_table !=''">
business_table = #{business_table}
</if>
<if test="business_unid !=null and business_unid !=''">
and business_unid = #{business_unid}
</if>
<!-- and
<if test="appendix_name !=null and appendix_name !=''">
appendix_name = #{appendix_name}
</if>
and
<if test="appendix_type !=null and appendix_type !=''">
appendix_type = #{appendix_type}
</if>
and
<if test="appendix_url !=null and appendix_url !=''">
appendix_url = #{appendix_url}
</if> -->
</select>
<insert id="addAppendix" parameterType="com.vion.financial.entity.Appendix" keyColumn="appendix_unid" keyProperty="appendix_unid" useGeneratedKeys="true" >
insert into tb_appendix (
business_table
<if test="business_unid !=null and business_unid !=''">
,business_unid
</if>
<if test="appendix_name !=null and appendix_name !=''">
,appendix_name
</if>
<if test="appendix_type !=null and appendix_type !=''">
,appendix_type
</if>
<if test="appendix_url !=null and appendix_url !=''">
,appendix_url
</if>
) values (
#{business_table}
<if test="business_unid !=null and business_unid !=''">
,#{business_unid}
</if>
<if test="appendix_name !=null and appendix_name !=''">
,#{appendix_name}
</if>
<if test="appendix_type !=null and appendix_type !=''">
,#{appendix_type}
</if>
<if test="appendix_url !=null and appendix_url !=''">
,#{appendix_url}
</if>
)
</insert>
<update id="updateAppendix" parameterType="com.vion.financial.entity.Appendix">
update tb_appendix set
<if test="appendix_unid != null and appendix_unid != ''">
appendix_unid=#{appendix_unid}
</if>
<if test="business_table != null and business_table != ''">
,business_table=#{business_table}
</if>
<if test="business_unid !=null and business_unid != ''">
, business_unid=#{business_unid}
</if>
<if test="appendix_name != null and appendix_name != ''">
,appendix_name=#{appendix_name}
</if>
<if test="appendix_type != null and appendix_type != ''">
,appendix_type=#{appendix_type}
</if>
<if test="appendix_url != null and appendix_url != ''">
,appendix_url=#{appendix_url}
</if>
where appendix_unid = #{appendix_unid}
</update>
<delete id="deleteAppendix" parameterType="com.vion.financial.entity.Appendix">
delete from tb_appendix where business_table = #{business_table} or business_unid = #{business_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/CustomerMapper.xml deleted 100644 → 0
<?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.CustomerMapper">
<insert id="addCustomer" parameterType="com.vion.financial.entity.Customer">
insert into tb_customer (customer_name) values (#{customer_name})
</insert>
<update id="updateCustomer" parameterType="com.vion.financial.entity.Customer">
update tb_customer set customer_name = #{customer_name}
where customer_unid = #{customer_unid}
</update>
<select id="queryCustomer" resultType="com.vion.financial.entity.Customer" >
select * from tb_customer
</select>
<delete id="deleteCustomer" parameterType="int">
delete from tb_customer where customer_unid = #{customer_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/DeliverGoodsMapper.xml deleted 100644 → 0
<?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.DeliverGoodsMapper">
<insert id="addDeliverGoods" parameterType="com.vion.financial.entity.DeliverGoods">
insert into tb_deliver_goods (contract_unid,deliver_goods_date,goods_acceptanc_date)
values(#{contract_unid},#{deliver_goods_date},#{goods_acceptanc_date})
</insert>
<update id="updateDeliverGoods" parameterType="com.vion.financial.entity.DeliverGoods">
update tb_deliver_goods set
<if test="deliver_goods_date !=null">
deliver_goods_date = #{deliver_goods_date},
goods_acceptanc_date = #{goods_acceptanc_date}
</if>
where deliver_unid = #{deliver_unid}
</update>
<select id="queryDeliverGoods" parameterType="String" resultType="com.vion.financial.entity.DeliverGoods">
select *from tb_deliver_goods where contract_unid = #{contract_unid}
</select>
<delete id="deleteDeliverGoods" parameterType="int">
delete from tb_deliver_goods where deliver_unid = #{deliver_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/PaymentAgreeMapper.xml deleted 100644 → 0
<?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.PaymentAgreeMapper">
<insert id="addPaymentAgree" parameterType="com.vion.financial.entity.PaymentAgree">
insert into tb_payment_agree (
contract_unid,
<if test="payment_type !=null and payment_type !=''">
payment_type,
</if>
<if test="payment_progress !=null and payment_progress !=''">
payment_progress,
</if>
<if test="days !=null and days !=''">
days,
</if>
<if test="payment_propority !=null and payment_propority !=''">
payment_propority,
</if>
<if test="payment_requirement !=null and payment_requirement !=''">
payment_requirement
</if>
)
values(
#{contract_unid},
<if test="payment_type !=null and payment_type !=''">
#{payment_type},
</if>
<if test="payment_progress !=null and payment_progress !=''">
#{payment_progress},
</if>
<if test="days !=null and days !=''">
#{days},
</if>
<if test="payment_propority !=null and payment_propority !=''">
#{payment_propority},
</if>
<if test="payment_requirement !=null and payment_requirement !=''">
#{payment_requirement}
</if>
)
</insert>
<update id="updatePaymentAgree" parameterType="com.vion.financial.entity.PaymentAgree">
update tb_payment_agree set
contract_unid=#{contract_unid},
<if test="payment_type != null and payment_type !=''">
payment_type = #{payment_type} ,
</if>
<if test="payment_progress !=null and payment_progress !=''">
payment_progress = #{payment_progress} ,
</if>
<if test="days !=null and days !=''">
days = #{days} ,
</if>
<if test="payment_propority !=null and payment_propority !=''">
payment_propority = #{payment_propority} ,
</if>
<if test="payment_requirement !=null and payment_requirement !=''">
payment_requirement = #{payment_requirement}
</if>
where payment_unid = #{payment_unid}
</update>
<select id="queryPaymentAgree" parameterType="String" resultType="com.vion.financial.entity.PaymentAgree">
select * from tb_payment_agree where contract_unid = #{contract_unid}
</select>
<delete id="deletePaymentAgree" parameterType="int">
delete from tb_payment_agree where payment_unid = #{payment_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/ProjectAcceptancMapper.xml deleted 100644 → 0
<?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" 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>
<update id="updateProjectAcceptanc" parameterType="com.vion.financial.entity.ProjectAcceptanc">
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" resultType="com.vion.financial.entity.ProjectAcceptanc">
select *from tb_project_acceptanc where contract_unid = #{contract_unid}
</select>
<delete id="deleteProjectAcceptanc" parameterType="int">
delete from tb_project_acceptanc where acceptanc_unid = #{acceptanc_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/ProjectMapper.xml deleted 100644 → 0
<?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.ProjectMapper">
<insert id="addProject" parameterType="com.vion.financial.entity.Project">
insert into tb_project (project_name) values (#{project_name})
</insert>
<update id="updateProject" parameterType="com.vion.financial.entity.Project">
update tb_project set project_name = #{project_name}
where project_unid = #{project_unid}
</update>
<select id="queryProject" resultType="com.vion.financial.entity.Project">
select * from tb_project
</select>
<delete id="deleteProject" parameterType="int">
delete from tb_project where project_unid = #{project_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/ReceiptMapper.xml deleted 100644 → 0
<?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.ReceiptMapper">
<insert id="addReceipt" parameterType="com.vion.financial.entity.Receipt">
insert into tb_receipt (contract_unid,receipt_progress,receipt_amount,oa_flow_id,
<if test="receipt_note !=null and receipt_note !=''">
receipt_note,
</if>
create_date)
values( #{contract_unid},#{receipt_progress},#{receipt_amount},#{oa_flow_id},
<if test="receipt_note !=null and receipt_note !=''">
#{receipt_note},
</if>
now())
</insert>
<update id="updateReceipt" parameterType="com.vion.financial.entity.Receipt">
update tb_receipt set
<if test="receipt_progress !=null">
receipt_progress = #{receipt_progress},
</if>
<if test="receipt_amount !=null">
receipt_amount = #{receipt_amount},
</if>
<if test="oa_flow_id !=null and oa_flow_id !=''">
oa_flow_id = #{oa_flow_id},
</if>
<if test="receipt_note !=null and receipt_note !=''">
receipt_note = #{receipt_note}
</if>
<!-- <if test="create_date !=null ">
create_date = now()
</if> -->
where receipt_unid = #{receipt_unid}
</update>
<select id="queryReceipt" parameterType="String" resultType="com.vion.financial.entity.Receipt">
select *from tb_receipt where contract_unid = #{contract_unid}
</select>
<delete id="deleteReceipt" parameterType="int">
delete from tb_receipt where receipt_unid = #{receipt_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/classes/com/vion/financial/mapping/ReturnInfoMapper.xml deleted 100644 → 0
<?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.ReturnInfoMapper">
<insert id="addReturnInfo" parameterType="com.vion.financial.entity.ReturnInfo">
insert into tb_return_info (
contract_unid,
<if test="reback_progress !=null and reback_progress !=''">
reback_progress,
</if>
<if test="reback_date !=null">
reback_date,
</if>
<if test="actual_reback_amount !=null and actual_reback_amount !=''">
actual_reback_amount,
</if>
<if test="reback_note !=null and reback_note !=''">
reback_note
</if>
)
values (
#{contract_unid},
<if test="reback_progress !=null and reback_progress !=''">
#{reback_progress},
</if>
<if test="reback_date !=null">
#{reback_date,jdbcType=DATE},
</if>
<if test="actual_reback_amount !=null and actual_reback_amount !=''">
#{actual_reback_amount},
</if>
<if test="reback_note !=null and reback_note !=''">
#{reback_note}
</if>
)
</insert>
<update id="updateReturnInfo" parameterType="com.vion.financial.entity.ReturnInfo">
update tb_return_info set (
<if test="reback_progress !=null and reback_progress !=''">
reback_progress = #{reback_progress},
</if>
<if test="reback_date !=null and reback_date !=''">
reback_date = #{reback_date},
</if>
<if test="actual_reback_amount !=null and actual_reback_amount !=''">
actual_reback_amount = #{actual_reback_amount},
</if>
<if test="reback_note !=null and reback_note !=''">
reback_note = #{reback_note}
</if>
)
where reback_unid = #{reback_unid}
</update>
<select id="queryReturnInfo" parameterType="String" resultType="com.vion.financial.entity.ReturnInfo">
select *from tb_return_info where contract_unid = #{contract_unid}
</select>
<delete id="deleteReturnInfo" parameterType="int">
delete from tb_return_info where reback_unid = #{reback_unid}
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/target/m2e-wtp/web-resources/META-INF/maven/com.vion/finance_serv/pom.properties deleted 100644 → 0
#Generated by Maven Integration for Eclipse
#Wed Aug 01 08:58:35 CST 2018
version=SNAPSHOT
groupId=com.vion
m2e.projectName=finance_serv
m2e.projectLocation=F\:\\\u9879\u76EE\\\u8D22\u52A1\u8FDB\u5EA6\\finance_serv\\code\\finance_serv
artifactId=finance_serv
code/finance_serv/target/m2e-wtp/web-resources/META-INF/maven/com.vion/finance_serv/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.vion</groupId>
<artifactId>finance_serv</artifactId>
<version>SNAPSHOT</version>
<packaging>war</packaging>
<name>FinancialSystem</name>
<description>Financial System project for Spring Boot</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.6.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<!-- <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId>
<optional>true</optional> </dependency> -->
<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency> -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.0.18</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.3-1102-jdbc41</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<!-- 是否替换资源中的属性 -->
<filtering>false</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!