Skip to content

platform / finance_serv

Go to a project
Commit 9fe8203f by 谢明辉
Options

Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

2 parents 39e08a78 e5664cc5
Inline Side-by-side
Showing 9 changed files with 278 additions and 120 deletions
code/finance_serv/src/main/java/com/vion/financial/mapper/ContractMapper.java
...@@ -19,6 +19,6 @@ public interface ContractMapper { ...@@ -19,6 +19,6 @@ public interface ContractMapper {
public List<String> queryList(); public List<String> queryList();
public List<ContractVo> selectByCondition(SelectVo selectVo); public List<ContractVo> selectByCondition(SelectVo selectVo);
public boolean isDelete(String contract_unid); public Boolean isDelete(String contract_unid);
public int countNumber(); public int countNumber();
} }
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -289,7 +289,19 @@ ...@@ -289,7 +289,19 @@
((select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid)-(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-(cast(deduct_amount as decimal(18,2)))-(cast(stop_amount as decimal(18,2)))-(cast(exemptions_amount as decimal(18,2)))-(cast(bad_amount as decimal(18,2)))) as total_amount_remain , ((select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid)-(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-(cast(deduct_amount as decimal(18,2)))-(cast(stop_amount as decimal(18,2)))-(cast(exemptions_amount as decimal(18,2)))-(cast(bad_amount as decimal(18,2)))) as total_amount_remain ,
(select over_days_view.over_days from over_days_view where over_days_view.contract_unid=tb_contract.contract_unid) as over_days, (select over_days_view.over_days from over_days_view where over_days_view.contract_unid=tb_contract.contract_unid) as over_days,
(select tb_project.project_name from tb_project where tb_project.project_unid=tb_contract.project_unid) as project_name, (select tb_project.project_name from tb_project where tb_project.project_unid=tb_contract.project_unid) as project_name,
(select tb_customer.customer_name from tb_customer where tb_customer.customer_unid=tb_contract.customer_unid) as customer_name (select tb_customer.customer_name from tb_customer where tb_customer.customer_unid=tb_contract.customer_unid) as customer_name,
(select cast(e17_view.e17 as decimal(18,2)) from e17_view where e17_view.contract_unid=tb_contract.contract_unid) as advance_pay,
(select cast(e18_view.e18 as decimal(18,2)) from e18_view where e18_view.contract_unid=tb_contract.contract_unid) as arrive_pay,
(select cast(e19_view.e19 as decimal(18,2)) from e19_view where e19_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay,
(select cast(e20_view.e20 as decimal(18,2)) from e20_view where e20_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver,
(select cast(e21_view.e21 as decimal(18,2)) from e21_view where e21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc,
(select d18_view.d18 from d18_view where d18_view.contract_unid=tb_contract.contract_unid) as advance_pay_date,
(select d19_view.d19 from d19_view where d19_view.contract_unid=tb_contract.contract_unid) as arrive_pay_date,
(select d20_view.d20 from d20_view where d20_view.contract_unid=tb_contract.contract_unid) as acceptanc_pay_date,
(select d21_view.d21 from d21_view where d21_view.contract_unid=tb_contract.contract_unid) as mainten_pay_deliver_date,
(select d22_view.d21 from d22_view where d22_view.contract_unid=tb_contract.contract_unid) as mainten_pay_acceptanc_date,
(select max(tb_deliver_goods.deliver_goods_date) from tb_deliver_goods where tb_deliver_goods.contract_unid=tb_contract.contract_unid ) as deliver_date,
(select max(tb_project_acceptanc.acceptanc_date) from tb_project_acceptanc where tb_project_acceptanc.contract_unid=tb_contract.contract_unid ) as acceptanc_date
from tb_contract where 1=1 from tb_contract where 1=1
<if test="salesperson_unids !=null"> <if test="salesperson_unids !=null">
and and
...@@ -362,22 +374,36 @@ ...@@ -362,22 +374,36 @@
and and
#{start_date} <![CDATA[<=]]> sign_date and sign_date <![CDATA[<=]]> #{end_date} #{start_date} <![CDATA[<=]]> sign_date and sign_date <![CDATA[<=]]> #{end_date}
</if> </if>
<if test="amount_point !=null and amount_point !=0.0"> <if test="amount_start_point !=null and amount_start_point !=0.00">
and and
contract_amount <![CDATA[>=]]> #{amount_point} contract_amount <![CDATA[>=]]> #{amount_start_point}
</if> </if>
<if test="overdays_point !=null and overdays_point !=0"> <if test="amount_end_point !=null and amount_end_point !=0.00">
and
contract_amount <![CDATA[<=]]> #{amount_end_point}
</if>
<if test="overdays_start_point !=null and overdays_start_point !=0">
and and
<!--逾期天数-->contract_unid in (select over_days_view.contract_unid from over_days_view where over_days <![CDATA[>=]]> #{overdays_point}) <!--逾期天数-->contract_unid in (select over_days_view.contract_unid from over_days_view where over_days <![CDATA[>=]]> #{overdays_start_point})
</if>
<if test="overdays_end_point !=null and overdays_end_point !=0">
and
<!--逾期天数-->contract_unid in (select over_days_view.contract_unid from over_days_view where over_days <![CDATA[<=]]> #{overdays_end_point})
</if> </if>
<if test="leave_amount_point !=null and leave_amount_point !=0.0"> <if test="leave_amount_start_point !=null and leave_amount_start_point !=0.00">
<!--应收款余额-->and <!--应收款余额-->and
contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[>=]]> #{leave_amount_point}) contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[>=]]> #{leave_amount_start_point})
</if>
<if test="leave_amount_end_point !=null and leave_amount_end_point !=0.00">
contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[<=]]> #{leave_amount_end_point})
</if> </if>
and is_delete=false and is_delete=false
<if test="limit !=null and offset !=null"> <if test="limit !=null and limit!=0 ">
limit #{limit} offset #{offset} limit #{limit}
</if> </if>
<if test="offset !=0 and offset !=null">
offset #{offset}
</if>
</select> </select>
<select id="isDelete" parameterType="String" resultType="boolean"> <select id="isDelete" parameterType="String" resultType="boolean">
select is_delete from tb_contract where contract_unid = #{contract_unid} select is_delete from tb_contract where contract_unid = #{contract_unid}
......
code/finance_serv/src/main/java/com/vion/financial/mapping/PaymentAgreeMapper.xml
...@@ -60,7 +60,16 @@ ...@@ -60,7 +60,16 @@
where payment_unid = #{payment_unid} where payment_unid = #{payment_unid}
</update> </update>
<select id="queryPaymentAgree" parameterType="String" resultType="com.vion.financial.entity.PaymentAgree"> <select id="queryPaymentAgree" parameterType="String" resultType="com.vion.financial.entity.PaymentAgree">
select payment_unid,contract_unid,payment_type,payment_progress,days,cast(payment_propority as decimal(18,2)),payment_requirement from tb_payment_agree where contract_unid = #{contract_unid} select
payment_unid,
contract_unid,
payment_type,
payment_progress,
days,
cast(payment_propority as decimal(18,2)),
payment_requirement
from tb_payment_agree
where contract_unid = #{contract_unid}
</select> </select>
<delete id="deletePaymentAgree" parameterType="int"> <delete id="deletePaymentAgree" parameterType="int">
delete from tb_payment_agree where payment_unid = #{payment_unid} delete from tb_payment_agree where payment_unid = #{payment_unid}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
...@@ -24,8 +24,6 @@ import com.vion.financial.vo.ResultVo; ...@@ -24,8 +24,6 @@ import com.vion.financial.vo.ResultVo;
import com.vion.financial.vo.SelectVo; import com.vion.financial.vo.SelectVo;
import com.vion.financial.vo.SuccessCode; import com.vion.financial.vo.SuccessCode;
import net.sf.json.JSONObject;
@Service @Service
public class ContractServiceImpl implements ContractService { public class ContractServiceImpl implements ContractService {
Logger logger = LoggerFactory.getLogger(ContractServiceImpl.class); Logger logger = LoggerFactory.getLogger(ContractServiceImpl.class);
...@@ -82,7 +80,8 @@ public class ContractServiceImpl implements ContractService { ...@@ -82,7 +80,8 @@ public class ContractServiceImpl implements ContractService {
public Object queryOne(String s) { public Object queryOne(String s) {
try { try {
logger.info("================查询合同start==================="); logger.info("================查询合同start===================");
if (contractMapper.isDelete(s)) { Boolean isdelete = contractMapper.isDelete(s);
if (isdelete != null && !isdelete) {
ContractVo contractVo = contractMapper.queryOne(s); ContractVo contractVo = contractMapper.queryOne(s);
Appendix appendix = new Appendix(); Appendix appendix = new Appendix();
appendix.setBusiness_table("tb_contract"); appendix.setBusiness_table("tb_contract");
...@@ -202,7 +201,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -202,7 +201,7 @@ public class ContractServiceImpl implements ContractService {
if(list_data != null && list_data.size() > 0) { if(list_data != null && list_data.size() > 0) {
for(Map _map:list_data) { for(Map _map:list_data) {
if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) { if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
contractVo.setSalesperson_name((String) _map.get("name")); contractVo.setSalesperson_name((String) _map.get("username"));
} }
} }
} }
...@@ -210,7 +209,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -210,7 +209,7 @@ public class ContractServiceImpl implements ContractService {
resultVo.setList_data(list); resultVo.setList_data(list);
resultVo.setList_size(selectVo.getLimit()); resultVo.setList_size(selectVo.getLimit());
resultVo.setOffset(selectVo.getOffset()); resultVo.setOffset(selectVo.getOffset());
resultVo.setTotal_number(contractMapper.countNumber()); resultVo.setTotal_number(list.size());
return resultVo; return resultVo;
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/PaymentAgreeServiceImpl.java
package com.vion.financial.service.imp; package com.vion.financial.service.imp;
import java.util.List; import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -18,7 +17,7 @@ import com.vion.financial.vo.SuccessCode; ...@@ -18,7 +17,7 @@ import com.vion.financial.vo.SuccessCode;
@Service @Service
public class PaymentAgreeServiceImpl implements PaymentAgreeService { public class PaymentAgreeServiceImpl implements PaymentAgreeService {
Logger logger=LoggerFactory.getLogger(PaymentAgreeServiceImpl.class); Logger logger = LoggerFactory.getLogger(PaymentAgreeServiceImpl.class);
@Autowired @Autowired
PaymentAgreeMapper paymentAgreeMapper; PaymentAgreeMapper paymentAgreeMapper;
@Autowired @Autowired
...@@ -27,25 +26,26 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -27,25 +26,26 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
ContractServiceImpl contractServiceImpl; ContractServiceImpl contractServiceImpl;
@Autowired @Autowired
SuccessCode SuccessCode; SuccessCode SuccessCode;
@Override @Override
public Object addPaymentAgree(PaymentAgreeVo paymentAgreeVo,String s) { public Object addPaymentAgree(PaymentAgreeVo paymentAgreeVo, String s) {
try { try {
logger.info("==============增加付款约定信息==================="); logger.info("==============增加付款约定信息===================");
if(! contractServiceImpl.isDelete(s)) { if (!contractServiceImpl.isDelete(s)) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data(); List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for(PaymentAgree paymentAgree:list) { for (PaymentAgree paymentAgree : list) {
paymentAgree.setContract_unid(s); paymentAgree.setContract_unid(s);
paymentAgreeMapper.addPaymentAgree(paymentAgree); paymentAgreeMapper.addPaymentAgree(paymentAgree);
} }
return SuccessCode; return SuccessCode;
}else{ } else {
failCode.setEcode("100"); failCode.setEcode("100");
failCode.setEnote("合同已删除"); failCode.setEnote("合同已删除");
return failCode; return failCode;
} }
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("增加付款预定信息异常"+e.getLocalizedMessage(),e); logger.error("增加付款预定信息异常" + e.getLocalizedMessage(), e);
failCode.setEcode("500"); failCode.setEcode("500");
failCode.setEnote("增加异常"); failCode.setEnote("增加异常");
return failCode; return failCode;
...@@ -56,15 +56,15 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -56,15 +56,15 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
public Object queryPaymentAgree(String s) { public Object queryPaymentAgree(String s) {
try { try {
logger.info("===============查询付款约定信息start====================="); logger.info("===============查询付款约定信息start=====================");
if(! contractServiceImpl.isDelete(s)) { if (!contractServiceImpl.isDelete(s)) {
return paymentAgreeMapper.queryPaymentAgree(s); return paymentAgreeMapper.queryPaymentAgree(s);
} }
failCode.setEcode("100"); failCode.setEcode("100");
failCode.setEnote("合同已删除"); failCode.setEnote("合同已删除");
return failCode; return failCode;
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("查询付款约定信息异常:"+e.getLocalizedMessage(), e); logger.error("查询付款约定信息异常:" + e.getLocalizedMessage(), e);
failCode.setEcode("500"); failCode.setEcode("500");
failCode.setEnote("查询异常"); failCode.setEnote("查询异常");
return failCode; return failCode;
...@@ -72,26 +72,26 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -72,26 +72,26 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
} }
@Override @Override
public Object updatePaymentAgree(PaymentAgreeVo paymentAgreeVo,String s) { public Object updatePaymentAgree(PaymentAgreeVo paymentAgreeVo, String s) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("==============修改付款约定信息==================="); logger.info("==============修改付款约定信息===================");
if(! contractServiceImpl.isDelete(s)) { if (!contractServiceImpl.isDelete(s)) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data(); List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for(PaymentAgree paymentAgree:list) { for (PaymentAgree paymentAgree : list) {
paymentAgree.setContract_unid(s); paymentAgree.setContract_unid(s);
paymentAgreeMapper.updatePaymentAgree(paymentAgree); paymentAgreeMapper.updatePaymentAgree(paymentAgree);
} }
return SuccessCode; return SuccessCode;
}else{ } else {
failCode.setEcode("100"); failCode.setEcode("100");
failCode.setEnote("合同已删除"); failCode.setEnote("合同已删除");
return failCode; return failCode;
} }
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("修改付款预定信息异常"+e.getLocalizedMessage(),e); logger.error("修改付款预定信息异常" + e.getLocalizedMessage(), e);
failCode.setEcode("500"); failCode.setEcode("500");
failCode.setEnote("修改异常"); failCode.setEnote("修改异常");
return failCode; return failCode;
...@@ -99,25 +99,25 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -99,25 +99,25 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
} }
@Override @Override
public Object deletePaymentAgree(PaymentAgreeVo paymentAgreeVo,String s) { public Object deletePaymentAgree(PaymentAgreeVo paymentAgreeVo, String s) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("==============删除付款约定信息==================="); logger.info("==============删除付款约定信息===================");
if(! contractServiceImpl.isDelete(s)) { if (!contractServiceImpl.isDelete(s)) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data(); List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for(PaymentAgree paymentAgree:list) { for (PaymentAgree paymentAgree : list) {
paymentAgree.setContract_unid(s); paymentAgree.setContract_unid(s);
paymentAgreeMapper.deletePaymentAgree(paymentAgree.getPayment_unid()); paymentAgreeMapper.deletePaymentAgree(paymentAgree.getPayment_unid());
} }
return SuccessCode; return SuccessCode;
}else{ } else {
failCode.setEcode("100"); failCode.setEcode("100");
failCode.setEnote("合同已删除"); failCode.setEnote("合同已删除");
return failCode; return failCode;
} }
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("删除付款预定信息异常"+e.getLocalizedMessage(),e); logger.error("删除付款预定信息异常" + e.getLocalizedMessage(), e);
failCode.setEcode("500"); failCode.setEcode("500");
failCode.setEnote("删除异常"); failCode.setEnote("删除异常");
return failCode; return failCode;
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectServiceImpl.java
...@@ -36,7 +36,7 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -36,7 +36,7 @@ public class ProjectServiceImpl implements ProjectService {
return successCode; return successCode;
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("增加合同信息出错"+e.getLocalizedMessage(),e); logger.error("增加合同信息出错",e);
failCode.setEcode("500"); failCode.setEcode("500");
failCode.setEnote("Fail"); failCode.setEnote("Fail");
return failCode; return failCode;
......
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
...@@ -3,6 +3,7 @@ package com.vion.financial.vo; ...@@ -3,6 +3,7 @@ package com.vion.financial.vo;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
...@@ -55,9 +56,23 @@ public class ContractVo extends SelectVo{ ...@@ -55,9 +56,23 @@ public class ContractVo extends SelectVo{
private String year; private String year;
private String month; private String month;
private String salesperson_name; private String salesperson_name;
private Integer total_number; /*@JsonIgnoreProperties(value={"total_number"}) */
private Integer list_size; private Integer list_size;
private Integer offset; private Integer offset;
private Double advance_pay; //预付款金额
private Double arrive_pay;
private Double acceptanc_pay;
private Double mainten_pay_deliver;
private Double mainten_pay_acceptanc;
private Date advance_pay_date; //预付款到期日
private Date arrive_pay_date;
private Date acceptanc_pay_date;
private Date mainten_pay_deliver_date; //质保款发货节点计算
private Date mainten_pay_acceptanc_date; //质保款验收节点计算
private Date deliver_date; //发货日期
private Date acceptanc_date; //验收日期
private List<String> salesperson_unids; private List<String> salesperson_unids;
...@@ -82,6 +97,18 @@ public class ContractVo extends SelectVo{ ...@@ -82,6 +97,18 @@ public class ContractVo extends SelectVo{
public void setProject_unid(Integer project_unid) { public void setProject_unid(Integer project_unid) {
this.project_unid = project_unid; this.project_unid = project_unid;
} }
public String getProject_name() {
return project_name;
}
public void setProject_name(String project_name) {
this.project_name = project_name;
}
public String getCustomer_name() {
return customer_name;
}
public void setCustomer_name(String customer_name) {
this.customer_name = customer_name;
}
public Integer getCustomer_unid() { public Integer getCustomer_unid() {
return customer_unid; return customer_unid;
} }
...@@ -197,7 +224,6 @@ public class ContractVo extends SelectVo{ ...@@ -197,7 +224,6 @@ public class ContractVo extends SelectVo{
public void setBad_amount_note(String bad_amount_note) { public void setBad_amount_note(String bad_amount_note) {
this.bad_amount_note = bad_amount_note; this.bad_amount_note = bad_amount_note;
} }
public Double getConfirm_income_amount() { public Double getConfirm_income_amount() {
return confirm_income_amount; return confirm_income_amount;
} }
...@@ -278,30 +304,6 @@ public class ContractVo extends SelectVo{ ...@@ -278,30 +304,6 @@ public class ContractVo extends SelectVo{
public void setContract_remain(Double contract_remain) { public void setContract_remain(Double contract_remain) {
this.contract_remain = contract_remain; this.contract_remain = contract_remain;
} }
public List<PaymentAgree> getPaymentAgree_list() {
return paymentAgree_list;
}
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;
}
public String getProject_name() {
return project_name;
}
public void setProject_name(String project_name) {
this.project_name = project_name;
}
public String getCustomer_name() {
return customer_name;
}
public void setCustomer_name(String customer_name) {
this.customer_name = customer_name;
}
public Double getTotal_receive_amount() { public Double getTotal_receive_amount() {
return total_receive_amount; return total_receive_amount;
} }
...@@ -332,24 +334,12 @@ public class ContractVo extends SelectVo{ ...@@ -332,24 +334,12 @@ public class ContractVo extends SelectVo{
public void setMonth(String month) { public void setMonth(String month) {
this.month = month; this.month = month;
} }
public List<String> getSalesperson_unids() {
return salesperson_unids;
}
public void setSalesperson_unids(List<String> salesperson_unids) {
this.salesperson_unids = salesperson_unids;
}
public String getSalesperson_name() { public String getSalesperson_name() {
return salesperson_name; return salesperson_name;
} }
public void setSalesperson_name(String salesperson_name) { public void setSalesperson_name(String salesperson_name) {
this.salesperson_name = salesperson_name; this.salesperson_name = salesperson_name;
} }
public Integer getTotal_number() {
return total_number;
}
public void setTotal_number(Integer total_number) {
this.total_number = total_number;
}
public Integer getList_size() { public Integer getList_size() {
return list_size; return list_size;
} }
...@@ -362,6 +352,103 @@ public class ContractVo extends SelectVo{ ...@@ -362,6 +352,103 @@ public class ContractVo extends SelectVo{
public void setOffset(Integer offset) { public void setOffset(Integer offset) {
this.offset = offset; this.offset = offset;
} }
public Double getAdvance_pay() {
return advance_pay;
}
public void setAdvance_pay(Double advance_pay) {
this.advance_pay = advance_pay;
}
public Double getArrive_pay() {
return arrive_pay;
}
public void setArrive_pay(Double arrive_pay) {
this.arrive_pay = arrive_pay;
}
public Double getAcceptanc_pay() {
return acceptanc_pay;
}
public void setAcceptanc_pay(Double acceptanc_pay) {
this.acceptanc_pay = acceptanc_pay;
}
public Double getMainten_pay_deliver() {
return mainten_pay_deliver;
}
public void setMainten_pay_deliver(Double mainten_pay_deliver) {
this.mainten_pay_deliver = mainten_pay_deliver;
}
public Double getMainten_pay_acceptanc() {
return mainten_pay_acceptanc;
}
public void setMainten_pay_acceptanc(Double mainten_pay_acceptanc) {
this.mainten_pay_acceptanc = mainten_pay_acceptanc;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getAdvance_pay_date() {
return advance_pay_date;
}
public void setAdvance_pay_date(Date advance_pay_date) {
this.advance_pay_date = advance_pay_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getArrive_pay_date() {
return arrive_pay_date;
}
public void setArrive_pay_date(Date arrive_pay_date) {
this.arrive_pay_date = arrive_pay_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getAcceptanc_pay_date() {
return acceptanc_pay_date;
}
public void setAcceptanc_pay_date(Date acceptanc_pay_date) {
this.acceptanc_pay_date = acceptanc_pay_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getMainten_pay_deliver_date() {
return mainten_pay_deliver_date;
}
public void setMainten_pay_deliver_date(Date mainten_pay_deliver_date) {
this.mainten_pay_deliver_date = mainten_pay_deliver_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getMainten_pay_acceptanc_date() {
return mainten_pay_acceptanc_date;
}
public void setMainten_pay_acceptanc_date(Date mainten_pay_acceptanc_date) {
this.mainten_pay_acceptanc_date = mainten_pay_acceptanc_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getDeliver_date() {
return deliver_date;
}
public void setDeliver_date(Date deliver_date) {
this.deliver_date = deliver_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getAcceptanc_date() {
return acceptanc_date;
}
public void setAcceptanc_date(Date acceptanc_date) {
this.acceptanc_date = acceptanc_date;
}
public List<String> getSalesperson_unids() {
return salesperson_unids;
}
public void setSalesperson_unids(List<String> salesperson_unids) {
this.salesperson_unids = salesperson_unids;
}
public List<PaymentAgree> getPaymentAgree_list() {
return paymentAgree_list;
}
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/finance_serv/src/main/java/com/vion/financial/vo/SelectVo.java
...@@ -26,9 +26,13 @@ public class SelectVo { ...@@ -26,9 +26,13 @@ public class SelectVo {
private String amount_state_unid; //账款状态 private String amount_state_unid; //账款状态
private Date start_date; //设置开始查询时间 private Date start_date; //设置开始查询时间
private Date end_date; //设置结束时间 private Date end_date; //设置结束时间
private Double amount_point; //设置金额查询节点 private Double amount_start_point; //设置金额开始查询节点
private Integer overdays_point; //逾期天数查询节点 private Double amount_end_point; //设置金额结束查询节点
private Double leave_amount_point; //账款余额查询节点 private Integer overdays_start_point; //设置逾期天数开始查询节点
private Integer overdays_end_point; //设置逾期天数结束查询节点
private Double leave_amount_start_point; //设置应收账款余额开始查询节点
private Double leave_amount_end_point; //设置应收账款余额结束查询节点
private Integer offset; //设置查询起始位置 private Integer offset; //设置查询起始位置
private Integer limit; //设置每次查询条数 private Integer limit; //设置每次查询条数
private List<String> salesperson_unids; private List<String> salesperson_unids;
...@@ -77,7 +81,6 @@ public class SelectVo { ...@@ -77,7 +81,6 @@ public class SelectVo {
public void setGuarantee_period(Integer guarantee_period) { public void setGuarantee_period(Integer guarantee_period) {
this.guarantee_period = guarantee_period; this.guarantee_period = guarantee_period;
} }
public String getYear() { public String getYear() {
return year; return year;
} }
...@@ -144,23 +147,41 @@ public class SelectVo { ...@@ -144,23 +147,41 @@ public class SelectVo {
public void setEnd_date(Date end_date) { public void setEnd_date(Date end_date) {
this.end_date = end_date; this.end_date = end_date;
} }
public Double getAmount_point() { public Double getAmount_start_point() {
return amount_point; return amount_start_point;
}
public void setAmount_start_point(Double amount_start_point) {
this.amount_start_point = amount_start_point;
}
public Double getAmount_end_point() {
return amount_end_point;
}
public void setAmount_end_point(Double amount_end_point) {
this.amount_end_point = amount_end_point;
}
public Integer getOverdays_start_point() {
return overdays_start_point;
}
public void setOverdays_start_point(Integer overdays_start_point) {
this.overdays_start_point = overdays_start_point;
}
public Integer getOverdays_end_point() {
return overdays_end_point;
} }
public void setAmount_point(Double amount_point) { public void setOverdays_end_point(Integer overdays_end_point) {
this.amount_point = amount_point; this.overdays_end_point = overdays_end_point;
} }
public Integer getOverdays_point() { public Double getLeave_amount_start_point() {
return overdays_point; return leave_amount_start_point;
} }
public void setOverdays_point(Integer overdays_point) { public void setLeave_amount_start_point(Double leave_amount_start_point) {
this.overdays_point = overdays_point; this.leave_amount_start_point = leave_amount_start_point;
} }
public Double getLeave_amount_point() { public Double getLeave_amount_end_point() {
return leave_amount_point; return leave_amount_end_point;
} }
public void setLeave_amount_point(Double leave_amount_point) { public void setLeave_amount_end_point(Double leave_amount_end_point) {
this.leave_amount_point = leave_amount_point; this.leave_amount_end_point = leave_amount_end_point;
} }
public Integer getOffset() { public Integer getOffset() {
return offset; return offset;
......
documents/api/build/html/02-finance-http.html
...@@ -434,10 +434,12 @@ ...@@ -434,10 +434,12 @@
<span class="s2">&quot;start_date&quot;</span><span class="p">:</span><span class="s2">&quot;2018-03-02&quot;</span><span class="p">,</span> <span class="c1">#签订时间，设置开始时间</span> <span class="s2">&quot;start_date&quot;</span><span class="p">:</span><span class="s2">&quot;2018-03-02&quot;</span><span class="p">,</span> <span class="c1">#签订时间，设置开始时间</span>
<span class="s2">&quot;end_date&quot;</span><span class="p">:</span><span class="s2">&quot;2018-06-09&quot;</span> <span class="c1">#结束时间，设置结束时间</span> <span class="s2">&quot;end_date&quot;</span><span class="p">:</span><span class="s2">&quot;2018-06-09&quot;</span> <span class="c1">#结束时间，设置结束时间</span>
<span class="s2">&quot;amount_point&quot;</span><span class="p">:</span><span class="mf">140000.00</span><span class="p">,</span> <span class="c1">#设置金额查询节点</span> <span class="s2">&quot;amount_start_point&quot;</span><span class="p">:</span><span class="mf">140000.00</span><span class="p">,</span> <span class="c1">#设置金额查询开始节点</span>
<span class="s2">&quot;overdays_point&quot;</span><span class="p">:</span><span class="mi">176</span><span class="p">,</span> <span class="c1">#设置逾期天数查询节点</span> <span class="s2">&quot;amount_end_point&quot;</span><span class="p">:</span><span class="s2">&quot;150000.00&quot;</span><span class="p">,</span> <span class="c1">#设置金额查询结束节点</span>
<span class="s2">&quot;leave_amount_point&quot;</span><span class="p">:</span><span class="mf">11200.00</span><span class="p">,</span> <span class="c1">#设置应收账款余额查询节点</span> <span class="s2">&quot;overdays_start_point&quot;</span><span class="p">:</span><span class="mi">176</span><span class="p">,</span> <span class="c1">#设置逾期天数开始查询节点</span>
<span class="s2">&quot;overdays_end_point&quot;</span><span class="p">:</span><span class="s2">&quot;520&quot;</span><span class="p">,</span> <span class="c1">#设置逾期天数结束查询节点</span>
<span class="s2">&quot;leave_amount_start_point&quot;</span><span class="p">:</span><span class="mf">11200.00</span><span class="p">,</span> <span class="c1">#设置应收账款余额开始查询节点</span>
<span class="s2">&quot;leave_amount_end_point&quot;</span><span class="p">:</span><span class="s2">&quot;320000.00&quot;</span><span class="p">,</span> <span class="c1">#设置应收账款余额结束查询节点</span>
<span class="s2">&quot;offset&quot;</span><span class="p">:</span><span class="mi">45</span><span class="p">,</span> <span class="c1">#起始位置</span> <span class="s2">&quot;offset&quot;</span><span class="p">:</span><span class="mi">45</span><span class="p">,</span> <span class="c1">#起始位置</span>
<span class="s2">&quot;limit&quot;</span><span class="p">:</span><span class="mi">25</span> <span class="c1">#每页显示的数量</span> <span class="s2">&quot;limit&quot;</span><span class="p">:</span><span class="mi">25</span> <span class="c1">#每页显示的数量</span>
<span class="p">}</span> <span class="p">}</span>
...@@ -470,6 +472,20 @@ ...@@ -470,6 +472,20 @@
<span class="s2">&quot;account_state_unid&quot;</span><span class="p">:</span><span class="s2">&quot;3&quot;</span><span class="p">,</span> <span class="c1">#账款状态</span> <span class="s2">&quot;account_state_unid&quot;</span><span class="p">:</span><span class="s2">&quot;3&quot;</span><span class="p">,</span> <span class="c1">#账款状态</span>
<span class="s2">&quot;total_receive_amount&quot;</span><span class="p">:</span><span class="mf">15000.00</span><span class="p">,</span> <span class="c1">#累计应收</span> <span class="s2">&quot;total_receive_amount&quot;</span><span class="p">:</span><span class="mf">15000.00</span><span class="p">,</span> <span class="c1">#累计应收</span>
<span class="s2">&quot;total_amount_remain&quot;</span><span class="p">:</span><span class="mf">8000.00</span><span class="p">,</span> <span class="c1">#应收账款余额</span> <span class="s2">&quot;total_amount_remain&quot;</span><span class="p">:</span><span class="mf">8000.00</span><span class="p">,</span> <span class="c1">#应收账款余额</span>
<span class="s2">&quot;total_receive_amount&quot;</span><span class="p">:</span> <span class="mi">133000</span><span class="p">,</span> <span class="c1">#累计回款额</span>
<span class="s2">&quot;over_days&quot;</span><span class="p">:</span> <span class="mi">137</span><span class="p">,</span> <span class="c1">#逾期天数</span>
<span class="s2">&quot;advance_pay&quot;</span><span class="p">:</span> <span class="mi">42000</span><span class="p">,</span> <span class="c1">#预付款金额</span>
<span class="s2">&quot;arrive_pay&quot;</span><span class="p">:</span> <span class="mi">70000</span><span class="p">,</span> <span class="c1">#到货款金额</span>
<span class="s2">&quot;acceptanc_pay&quot;</span><span class="p">:</span> <span class="mi">21000</span><span class="p">,</span> <span class="c1">#验收款金额</span>
<span class="s2">&quot;mainten_pay_deliver&quot;</span><span class="p">:</span> <span class="mi">35000</span><span class="p">,</span> <span class="c1">#质保款金额（按发货节点计算）</span>
<span class="s2">&quot;mainten_pay_acceptanc&quot;</span><span class="p">:</span> <span class="mi">7000</span><span class="p">,</span> <span class="c1">#质保款金额（按验收节点计算）</span>
<span class="s2">&quot;advance_pay_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2018-03-19&quot;</span><span class="p">,</span> <span class="c1">#预付款到期日</span>
<span class="s2">&quot;arrive_pay_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2018-01-12&quot;</span><span class="p">,</span> <span class="c1">#发货款到期日</span>
<span class="s2">&quot;acceptanc_pay_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2018-06-29&quot;</span><span class="p">,</span> <span class="c1">#验收款到期日</span>
<span class="s2">&quot;mainten_pay_deliver_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2020-01-05&quot;</span><span class="p">,</span> <span class="c1">#质保款到期日（按发货节点计算）</span>
<span class="s2">&quot;mainten_pay_acceptanc_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2020-05-29&quot;</span><span class="p">,</span> <span class="c1">#质保款到期日（按验收节点计算）</span>
<span class="s2">&quot;deliver_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2018-01-05&quot;</span><span class="p">,</span> <span class="c1">#发货时间</span>
<span class="s2">&quot;acceptanc_date&quot;</span><span class="p">:</span> <span class="s2">&quot;2018-05-30&quot;</span><span class="p">,</span> <span class="c1">#验收时间</span>
<span class="s2">&quot;over_days&quot;</span><span class="p">:</span><span class="mi">176</span><span class="p">,</span> <span class="c1">#逾期天数</span> <span class="s2">&quot;over_days&quot;</span><span class="p">:</span><span class="mi">176</span><span class="p">,</span> <span class="c1">#逾期天数</span>
<span class="s2">&quot;payment_data&quot;</span><span class="p">:[</span> <span class="c1">#付款约定</span> <span class="s2">&quot;payment_data&quot;</span><span class="p">:[</span> <span class="c1">#付款约定</span>
<span class="p">{</span> <span class="p">{</span>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!