Skip to content

platform / finance_serv

Go to a project
Commit f1804a7c by 王军业
Options

[筛选合同接口]

1 parent 2c9ab75d
Inline Side-by-side
Showing 15 changed files with 435 additions and 122 deletions
code/finance_serv/pom.xml
......@@ -81,6 +81,17 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
</dependencies>
<build>
......
code/finance_serv/src/main/java/com/vion/financial/FinancialSystemApplication.java
......@@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@MapperScan(basePackages="com.vion.financial.mapper")
@ComponentScan(basePackages="com.vion.financial")
@ComponentScan(basePackages="com.vion.financial.*")
public class FinancialSystemApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
......
code/finance_serv/src/main/java/com/vion/financial/controller/ContractController.java
......@@ -52,7 +52,7 @@ public class ContractController extends BaseController {
return contractService.queryList();
}
@GetMapping
@GetMapping()
@ResponseBody
public Object queryByCondition(SelectVo selectVo) {
return contractService.selectByCondition(selectVo);
......
code/finance_serv/src/main/java/com/vion/financial/mapper/ContractMapper.java
......@@ -4,6 +4,7 @@ import java.util.List;
import org.springframework.transaction.annotation.Transactional;
import com.vion.financial.vo.ContractVo;
import com.vion.financial.vo.SelectVo;
......@@ -19,5 +20,5 @@ public interface ContractMapper {
public List<ContractVo> selectByCondition(SelectVo selectVo);
public boolean isDelete(String contract_unid);
public int countNumber();
}
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
......@@ -16,10 +16,10 @@
<if test="county != null and county != ''">
,county
</if>
<if test="guarantee_period != null and guarantee_period != ''">
<if test="guarantee_period != null">
,guarantee_period
</if>
<if test="sign_date != null and sign_date != ''">
<if test="sign_date != null">
,sign_date
</if>
<if test="product_line_type != null and product_line_type != ''">
......@@ -274,31 +274,37 @@
</delete>
<select id="selectByCondition" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.vo.ContractVo">
select contract_unid, salesperson_unid, province, city, county,
select
contract_unid, salesperson_unid, province, city, county,
guarantee_period, sign_date, product_line_type, contract_state,
contract_type, contract_amount, deduct_amount, contract_amount_note,
stop_amount, reback_note, exemptions_amount, contract_remain_note,
is_archive, bad_amount, bad_amount_note, confirm_income_amount,
contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note,
cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
is_archive, cast(bad_amount as decimal(18,2)), bad_amount_note, cast(confirm_income_amount as decimal(18,2)),
amount_state_unid, start_guarantee_date, end_guarantee_date,
mainten_start_point, contract_note, is_delete, project_unid,
customer_unid,
(select total_reback_view.sum from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
(contract_amount-(select total_reback_view.sum from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-deduct_amount-stop_amount-exemptions_amount-bad_amount) as contract_remain,
(select total_recv_amount_view.total_recv_amount from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount ,
((select total_recv_amount_view.total_recv_amount from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid)-(select total_reback_view.sum from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-deduct_amount-stop_amount-exemptions_amount-bad_amount) 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
(cast(contract_amount as decimal(18,2))-(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 contract_remain,
(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
(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) as total_receive_amount ,
((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 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
from tb_contract where 1=1
<if test="salesperson_name__like !=null and salesperson_name__like !=''">
<if test="salesperson_unids !=null">
and
salesperson_unid like #{salesperson_name__like}
salesperson_unid in
<foreach collection="salesperson_unids" index="index" item="salesperson_unid" open="(" close=")" separator=",">
#{salesperson_unid}
</foreach>
</if>
<if test="project_name__like !=null and project_name__like !=''">
and
project_unid like #{project_name__like}
tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%')
</if>
<if test="customer_name__like !=null and customer_name__like !=''">
and
customer_unid like #{customer_name__like}
tb_contract.customer_unid in (select tb_customer.customer_unid from tb_customer where customer_name like '%'||#{customer_name__like}||'%')
</if>
<if test="province !=null and province !=''">
and
......@@ -312,17 +318,17 @@
and
county=#{county}
</if>
<if test="guarantee_period !=null">
<if test="guarantee_period !=null and guarantee_period !=0">
and
guarantee_period=#{guarantee_period}
</if>
<if test="year !=null and year !=''">
and
to_char(sign_date,"yyyy")=#{year}
to_char(sign_date,'yyyy')=#{year}
</if>
<if test="month !=null and month!=''">
and
to_char(sign_date,"MM")=#{month}
to_char(sign_date,'MM')=#{month}
</if>
<if test="product_line_type !=null and product_line_type !=''">
and
......@@ -348,7 +354,7 @@
and
confirm_income_amount=#{confirm_income_amount}
</if>
<if test="amount_state_unid !=null">
<if test="amount_state_unid !=null and amount_state_unid !=''">
and
amount_state_unid=#{amount_state_unid}
</if>
......@@ -356,18 +362,19 @@
and
#{start_date} <![CDATA[<=]]> sign_date and sign_date <![CDATA[<=]]> #{end_date}
</if>
<if test="amount_point !=null">
<if test="amount_point !=null and amount_point !=0.0">
and
contract_amount <![CDATA[>=]]> #{amount_point}
</if>
<if test="overdays_point !=null">
<if test="overdays_point !=null and overdays_point !=0">
and
<!--逾期天数-->contract_unid in (select over_days_view.contract_unid from over_days_view where over_days <![CDATA[>=]]> #{overdays_point})
</if>
<if test="leave_amount_point !=null">
<if test="leave_amount_point !=null and leave_amount_point !=0.0">
<!--应收款余额-->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})
</if>
and is_delete=false
<if test="limit !=null and offset !=null">
limit #{limit} offset #{offset}
</if>
......@@ -378,4 +385,7 @@
<select id="queryList" resultType="String">
select contract_unid from tb_contract
</select>
<select id="countNumber" resultType="int">
select count(contract_unid) from tb_contract where is_delete=false
</select>
</mapper>
code/finance_serv/src/main/java/com/vion/financial/mapping/PaymentAgreeMapper.xml
......@@ -60,7 +60,7 @@
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 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>
<delete id="deletePaymentAgree" parameterType="int">
delete from tb_payment_agree where payment_unid = #{payment_unid}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
......@@ -2,22 +2,30 @@ package com.vion.financial.service.imp;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.vion.financial.config.FinanceConfig;
import com.vion.financial.entity.Appendix;
import com.vion.financial.mapper.AppendixMapper;
import com.vion.financial.mapper.ContractMapper;
import com.vion.financial.mapper.PaymentAgreeMapper;
import com.vion.financial.service.ContractService;
import com.vion.financial.utils.HttpNetClient;
import com.vion.financial.utils.JavaBean2Json;
import com.vion.financial.vo.ContractVo;
import com.vion.financial.vo.FailCode;
import com.vion.financial.vo.ResultVo;
import com.vion.financial.vo.SelectVo;
import com.vion.financial.vo.SuccessCode;
import net.sf.json.JSONObject;
@Service
public class ContractServiceImpl implements ContractService {
Logger logger = LoggerFactory.getLogger(ContractServiceImpl.class);
......@@ -34,32 +42,36 @@ public class ContractServiceImpl implements ContractService {
@Autowired
FailCode failCode;
@Autowired
FinanceConfig financeConfig;
/***
* 新增合同信息
*/
@Override
public Object addOne(ContractVo contractVo) {
try {
//先插入合同信息
// 先插入合同信息
logger.info("============新增合同 start ============");
//根据附件unid集合更新附件表信息
// 根据附件unid集合更新附件表信息
Appendix appendix = new Appendix();
if(contractMapper.queryOne(contractVo.getContract_unid()) !=null) {
if (contractMapper.queryOne(contractVo.getContract_unid()) != null) {
contractMapper.updateOne(contractVo);
}else {
} else {
contractMapper.addOne(contractVo);
}
appendix.setBusiness_table("tb_contract");
appendix.setBusiness_unid(contractVo.getContract_unid());
for(int n:contractVo.getAppendix_unids()) {
for (int n : contractVo.getAppendix_unids()) {
appendix.setAppendix_unid(n);
appendixMapper.updateAppendix(appendix);
}
return successCode;
} catch (Exception e) {
e.printStackTrace();
logger.error("增加合同异常:"+e.getLocalizedMessage(), e);
logger.error("增加合同异常:" + e.getLocalizedMessage(), e);
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
......@@ -70,6 +82,7 @@ public class ContractServiceImpl implements ContractService {
public Object queryOne(String s) {
try {
logger.info("================查询合同start===================");
if (contractMapper.isDelete(s)) {
ContractVo contractVo = contractMapper.queryOne(s);
Appendix appendix = new Appendix();
appendix.setBusiness_table("tb_contract");
......@@ -77,10 +90,15 @@ public class ContractServiceImpl implements ContractService {
List<Appendix> appendixs = appendixMapper.queryAppendixList(appendix);
contractVo.setAppendix_list(appendixs);
return contractVo;
} else {
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
/* return failCode;*/
logger.error("查询合同异常"+e.getLocalizedMessage(),e);
/* return failCode; */
logger.error("查询合同异常" + e.getLocalizedMessage(), e);
e.printStackTrace();
failCode.setEcode("500");
failCode.setEnote("查询异常");
......@@ -96,14 +114,14 @@ public class ContractServiceImpl implements ContractService {
Appendix appendix = new Appendix();
appendix.setBusiness_table("tb_contract");
appendix.setBusiness_unid(vontractVo.getContract_unid());
for(int n:vontractVo.getAppendix_unids()) {
for (int n : vontractVo.getAppendix_unids()) {
appendix.setAppendix_unid(n);
appendixMapper.updateAppendix(appendix);
}
return successCode;
} catch (Exception e) {
// TODO: handle exception
logger.error("修改合同异常"+e.getLocalizedMessage(), e);
logger.error("修改合同异常" + e.getLocalizedMessage(), e);
e.printStackTrace();
failCode.setEcode("500");
failCode.setEnote("修改异常");
......@@ -115,11 +133,14 @@ public class ContractServiceImpl implements ContractService {
public Object deleteOne(String s) {
try {
logger.info("=================删除合同=================");
//contractMapper.updateSingleContract(contractVo);
Appendix appendix = new Appendix();
appendix.setBusiness_unid(s);
// contractMapper.updateSingleContract(contractVo);
contractMapper.deleteOne(s);
appendixMapper.deleteAppendix(appendix);
return successCode;
} catch (Exception e) {
logger.error("删除合同异常"+e.getLocalizedMessage(),e);
logger.error("删除合同异常" + e.getLocalizedMessage(), e);
e.printStackTrace();
failCode.setEcode("500");
failCode.setEnote("删除异常");
......@@ -139,7 +160,7 @@ public class ContractServiceImpl implements ContractService {
return contractMapper.queryList();
} catch (Exception e) {
// TODO: handle exception
logger.error("查询合同列表异常"+e.getLocalizedMessage(),e);
logger.error("查询合同列表异常" + e.getLocalizedMessage(), e);
e.printStackTrace();
failCode.setEcode("500");
failCode.setEnote("查询异常");
......@@ -152,15 +173,42 @@ public class ContractServiceImpl implements ContractService {
// TODO Auto-generated method stub
try {
logger.info("========================筛选合同列表===========================");
List<ContractVo> list=new ArrayList<ContractVo>();
for(ContractVo contractVo:contractMapper.selectByCondition(selectVo)) {
List<Map> list_data = null;
if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
// 调用auth服务的接口获取用户列表信息
String url = financeConfig.getAuthurl();
String result = HttpNetClient.doGet(url, null);
Map map = JavaBean2Json.Json2JavaBean(result, Map.class);
list_data = (List<Map>) map.get("list_data");
if(list_data != null && list_data.size() > 0) {
List<String> salesperson_unids = new ArrayList<String>(list_data.size());
for(Map _map:list_data) {
salesperson_unids.add((String) _map.get("user_unid"));
}
selectVo.setSalesperson_unids(salesperson_unids);
}
}
List<ContractVo> list = contractMapper.selectByCondition(selectVo);
for (ContractVo contractVo : list) {
contractVo.setPaymentAgree_list(paymentAgreeMapper.queryPaymentAgree(contractVo.getContract_unid()));
list.add(contractVo);
if(list_data != null && list_data.size() > 0) {
for(Map _map:list_data) {
if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
contractVo.setSalesperson_name((String) _map.get("name"));
}
}
}
}
return list;
ResultVo resultVo=new ResultVo();
resultVo.setList_data(list);
resultVo.setList_size(selectVo.getLimit());
resultVo.setOffset(selectVo.getOffset());
resultVo.setTotal_number(contractMapper.countNumber());
return resultVo;
} catch (Exception e) {
// TODO: handle exception
logger.error("筛选合同列表异常"+e.getLocalizedMessage(),e);
logger.error("筛选合同列表异常" + e.getLocalizedMessage(), e);
failCode.setEcode("500");
failCode.setEnote("筛选异常");
return failCode;
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java
......@@ -39,7 +39,7 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try {
Appendix appendix = new Appendix();
logger.info("=====================增加发货信息=====================");
if((boolean)contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<DeliverGoods> list=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list) {
deliverGoods.setContract_unid(s);
......@@ -73,7 +73,7 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
deliverGoodsVo.setList_deliver_data(new ArrayList());
Appendix appendix = null;
logger.info("========================查询发货信息========================");
if(contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<DeliverGoods> list=deliverGoodsMapper.queryDeliverGoods(s);
for(DeliverGoods deliverGoods:list) {
appendix = new Appendix();
......@@ -105,7 +105,7 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try {
Appendix appendix=null;
logger.info("===========================修改发货信息===========================");
if(contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<DeliverGoods> list_deliver_data=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list_deliver_data) {
deliverGoodsMapper.updateDeliverGoods(deliverGoods);
......@@ -138,7 +138,7 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try {
logger.info("=========================删除合同发货信息=======================");
Appendix appendix=null;
if(contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
for(int deliverUnid :deliverGoodsVo.getDeliver_unids()) {
deliverGoodsMapper.deleteDeliverGoods(deliverUnid);
appendix=new Appendix();
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/PaymentAgreeServiceImpl.java
......@@ -31,7 +31,7 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
public Object addPaymentAgree(PaymentAgreeVo paymentAgreeVo,String s) {
try {
logger.info("==============增加付款约定信息===================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for(PaymentAgree paymentAgree:list) {
paymentAgree.setContract_unid(s);
......@@ -56,7 +56,7 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
public Object queryPaymentAgree(String s) {
try {
logger.info("===============查询付款约定信息start=====================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
return paymentAgreeMapper.queryPaymentAgree(s);
}
failCode.setEcode("100");
......@@ -77,7 +77,7 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
try {
logger.info("==============修改付款约定信息===================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for(PaymentAgree paymentAgree:list) {
paymentAgree.setContract_unid(s);
......@@ -103,7 +103,7 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
// TODO Auto-generated method stub
try {
logger.info("==============删除付款约定信息===================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for(PaymentAgree paymentAgree:list) {
paymentAgree.setContract_unid(s);
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectAcceptancServiceImpl.java
......@@ -39,7 +39,7 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try {
Appendix appendix = new Appendix();
logger.info("=====================增加合同验收信息=====================");
if((boolean)contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s);
......@@ -74,7 +74,7 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
projectAcceptancVo.setList_check_data(new ArrayList());
Appendix appendix = null;
logger.info("========================查询合同验收信息========================");
if(contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<ProjectAcceptanc> list=projectAcceptancMapper.queryProjectAcceptanc(s);
for(ProjectAcceptanc projectAcceptanc:list) {
appendix = new Appendix();
......@@ -106,7 +106,7 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try {
logger.info("===========================修改合同验收信息===========================");
Appendix appendix=null;
if(contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s);
......@@ -140,7 +140,7 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try {
logger.info("===========================删除合同验收信息===========================");
Appendix appendix =null;
if(contractService.isDelete(s)) {
if(!contractService.isDelete(s)) {
List<Integer> list=projectAcceptancVo.getAcceptanc_unids();
for(int n:list) {
projectAcceptancMapper.deleteProjectAcceptanc(n);
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ReceiptServiceImpl.java
......@@ -31,7 +31,7 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("=====================增加合同开票信息=====================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
List<Receipt> list=receiptVo.getList_receipt_data();
for(Receipt receipt: list) {
receipt.setContract_unid(s);
......@@ -56,7 +56,7 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("========================查询合同开票信息=======================");
if((boolean)contractServiceImpl.isDelete(s)) {
if(!contractServiceImpl.isDelete(s)) {
return receiptMapper.queryReceipt(s);
}else {
failCode.setEcode("100");
......@@ -76,7 +76,7 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("===================修改合同开票信息========================");
if((boolean)contractServiceImpl.isDelete(s)) {
if(!contractServiceImpl.isDelete(s)) {
List<Receipt> list=receiptVo.getList_receipt_data();
for(Receipt receipt:list) {
receipt.setContract_unid(s);
......@@ -102,7 +102,7 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("=========================删除合同开票信息=======================");
if((boolean)contractServiceImpl.isDelete(s)) {
if(!contractServiceImpl.isDelete(s)) {
List<Receipt> list=receiptVo.getReceipt_unids();
for(Receipt receiptUnid :list) {
receiptMapper.deleteReceipt(receiptUnid.getReceipt_unid());
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ReturnInfoServiceImpl.java
......@@ -33,7 +33,7 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("==============增加合同回款信息===================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
List<ReturnInfo> list = returnInfoVo.getList_reback_data();
for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s);
......@@ -59,7 +59,7 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("===============查询回款信息=====================");
if((boolean) contractServiceImpl.isDelete(s)){
if(!contractServiceImpl.isDelete(s)){
return returnInfoMapper.queryReturnInfo(s);
}else {
failCode.setEcode("100");
......@@ -80,7 +80,7 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("==============修改回款信息===================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(! contractServiceImpl.isDelete(s)) {
List<ReturnInfo> list = returnInfoVo.getList_reback_data();
for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s);
......@@ -106,7 +106,7 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("==============删除回款信息===================");
if((boolean) contractServiceImpl.isDelete(s)) {
if(!contractServiceImpl.isDelete(s)) {
List<ReturnInfo> list = paymentAgreeVo.getReback_unids();
for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s);
......
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
......@@ -5,51 +5,65 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.vion.financial.entity.Appendix;
import com.vion.financial.entity.PaymentAgree;
import com.vion.financial.serializer.DateYMDHMSJsonSerializer;
@JsonInclude(value=Include.NON_NULL)
public class ContractVo extends SelectVo{
private String contract_unid;
private String salesperson_unid;
private int project_unid;
private int customer_unid;
private Integer project_unid;
private String project_name;
private String customer_name;
private Integer customer_unid;
private String province;
private String city;
private String county;
private int guarantee_period;
private Integer guarantee_period;
private Date sign_date;
private String product_line_type;
private String contract_state;
private String contract_type;
private double contract_amount;
private double deduct_amount;
private Double contract_amount;
private Double deduct_amount;
private String contract_amount_note;
private double stop_amount;
private Double stop_amount;
private String reback_note;
private double exemptions_amount;
private Double exemptions_amount;
private String contract_remain_note;
private boolean is_archive;
private double bad_amount;
private Boolean is_archive;
private Double bad_amount;
private String bad_amount_note;
private double confirm_income_amount;
private Double confirm_income_amount;
private String amount_state_unid;
private Date start_guarantee_date;
private Date end_guarantee_date;
private String mainten_start_point;
private String contract_note;
private boolean is_delete;
private Boolean is_delete;
private List<Integer> appendix_unids;
private List<Appendix> appendix_list;
private String business_table;
private String business_unid;
private double total_reback_amount;
private double contract_remain;
private Double total_reback_amount;
private Double contract_remain;
private Double total_receive_amount;
private Double total_amount_remain;
private Integer over_days;
private String year;
private String month;
private String salesperson_name;
private Integer total_number;
private Integer list_size;
private Integer offset;
private List<String> salesperson_unids;
private List<PaymentAgree> paymentAgree_list;
private List<String> contract_unids;
//private List<> payment_data;
public String getContract_unid() {
return contract_unid;
}
......@@ -62,16 +76,16 @@ public class ContractVo extends SelectVo{
public void setSalesperson_unid(String salesperson_unid) {
this.salesperson_unid = salesperson_unid;
}
public int getProject_unid() {
public Integer getProject_unid() {
return project_unid;
}
public void setProject_unid(int project_unid) {
public void setProject_unid(Integer project_unid) {
this.project_unid = project_unid;
}
public int getCustomer_unid() {
public Integer getCustomer_unid() {
return customer_unid;
}
public void setCustomer_unid(int customer_unid) {
public void setCustomer_unid(Integer customer_unid) {
this.customer_unid = customer_unid;
}
public String getProvince() {
......@@ -92,12 +106,13 @@ public class ContractVo extends SelectVo{
public void setCounty(String county) {
this.county = county;
}
public int getGuarantee_period() {
public Integer getGuarantee_period() {
return guarantee_period;
}
public void setGuarantee_period(int guarantee_period) {
public void setGuarantee_period(Integer guarantee_period) {
this.guarantee_period = guarantee_period;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getSign_date() {
return sign_date;
}
......@@ -122,16 +137,16 @@ public class ContractVo extends SelectVo{
public void setContract_type(String contract_type) {
this.contract_type = contract_type;
}
public double getContract_amount() {
public Double getContract_amount() {
return contract_amount;
}
public void setContract_amount(double contract_amount) {
public void setContract_amount(Double contract_amount) {
this.contract_amount = contract_amount;
}
public double getDeduct_amount() {
public Double getDeduct_amount() {
return deduct_amount;
}
public void setDeduct_amount(double deduct_amount) {
public void setDeduct_amount(Double deduct_amount) {
this.deduct_amount = deduct_amount;
}
public String getContract_amount_note() {
......@@ -140,10 +155,10 @@ public class ContractVo extends SelectVo{
public void setContract_amount_note(String contract_amount_note) {
this.contract_amount_note = contract_amount_note;
}
public double getStop_amount() {
public Double getStop_amount() {
return stop_amount;
}
public void setStop_amount(double stop_amount) {
public void setStop_amount(Double stop_amount) {
this.stop_amount = stop_amount;
}
public String getReback_note() {
......@@ -152,10 +167,10 @@ public class ContractVo extends SelectVo{
public void setReback_note(String reback_note) {
this.reback_note = reback_note;
}
public double getExemptions_amount() {
public Double getExemptions_amount() {
return exemptions_amount;
}
public void setExemptions_amount(double exemptions_amount) {
public void setExemptions_amount(Double exemptions_amount) {
this.exemptions_amount = exemptions_amount;
}
public String getContract_remain_note() {
......@@ -164,16 +179,16 @@ public class ContractVo extends SelectVo{
public void setContract_remain_note(String contract_remain_note) {
this.contract_remain_note = contract_remain_note;
}
public boolean isIs_archive() {
public Boolean getIs_archive() {
return is_archive;
}
public void setIs_archive(boolean is_archive) {
public void setIs_archive(Boolean is_archive) {
this.is_archive = is_archive;
}
public double getBad_amount() {
public Double getBad_amount() {
return bad_amount;
}
public void setBad_amount(double bad_amount) {
public void setBad_amount(Double bad_amount) {
this.bad_amount = bad_amount;
}
public String getBad_amount_note() {
......@@ -182,10 +197,11 @@ public class ContractVo extends SelectVo{
public void setBad_amount_note(String bad_amount_note) {
this.bad_amount_note = bad_amount_note;
}
public double getConfirm_income_amount() {
public Double getConfirm_income_amount() {
return confirm_income_amount;
}
public void setConfirm_income_amount(double confirm_income_amount) {
public void setConfirm_income_amount(Double confirm_income_amount) {
this.confirm_income_amount = confirm_income_amount;
}
public String getAmount_state_unid() {
......@@ -194,12 +210,14 @@ public class ContractVo extends SelectVo{
public void setAmount_state_unid(String amount_state_unid) {
this.amount_state_unid = amount_state_unid;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getStart_guarantee_date() {
return start_guarantee_date;
}
public void setStart_guarantee_date(Date start_guarantee_date) {
this.start_guarantee_date = start_guarantee_date;
}
@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
public Date getEnd_guarantee_date() {
return end_guarantee_date;
}
......@@ -218,10 +236,10 @@ public class ContractVo extends SelectVo{
public void setContract_note(String contract_note) {
this.contract_note = contract_note;
}
public boolean isIs_delete() {
public Boolean getIs_delete() {
return is_delete;
}
public void setIs_delete(boolean is_delete) {
public void setIs_delete(Boolean is_delete) {
this.is_delete = is_delete;
}
public List<Integer> getAppendix_unids() {
......@@ -230,6 +248,12 @@ public class ContractVo extends SelectVo{
public void setAppendix_unids(List<Integer> appendix_unids) {
this.appendix_unids = appendix_unids;
}
public List<Appendix> getAppendix_list() {
return appendix_list;
}
public void setAppendix_list(List<Appendix> appendix_list) {
this.appendix_list = appendix_list;
}
public String getBusiness_table() {
return business_table;
}
......@@ -242,11 +266,17 @@ public class ContractVo extends SelectVo{
public void setBusiness_unid(String business_unid) {
this.business_unid = business_unid;
}
public List<Appendix> getAppendix_list() {
return appendix_list;
public Double getTotal_reback_amount() {
return total_reback_amount;
}
public void setAppendix_list(List<Appendix> appendix_list) {
this.appendix_list = appendix_list;
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;
}
public List<PaymentAgree> getPaymentAgree_list() {
return paymentAgree_list;
......@@ -260,17 +290,77 @@ 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 String getProject_name() {
return project_name;
}
public void setTotal_reback_amount(double total_reback_amount) {
this.total_reback_amount = total_reback_amount;
public void setProject_name(String project_name) {
this.project_name = project_name;
}
public double getContract_remain() {
return contract_remain;
public String getCustomer_name() {
return customer_name;
}
public void setContract_remain(double contract_remain) {
this.contract_remain = contract_remain;
public void setCustomer_name(String customer_name) {
this.customer_name = customer_name;
}
public Double getTotal_receive_amount() {
return total_receive_amount;
}
public void setTotal_receive_amount(Double total_receive_amount) {
this.total_receive_amount = total_receive_amount;
}
public Double getTotal_amount_remain() {
return total_amount_remain;
}
public void setTotal_amount_remain(Double total_amount_remain) {
this.total_amount_remain = total_amount_remain;
}
public Integer getOver_days() {
return over_days;
}
public void setOver_days(Integer over_days) {
this.over_days = over_days;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getMonth() {
return month;
}
public void setMonth(String 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() {
return salesperson_name;
}
public void setSalesperson_name(String 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() {
return list_size;
}
public void setList_size(Integer list_size) {
this.list_size = list_size;
}
public Integer getOffset() {
return offset;
}
public void setOffset(Integer offset) {
this.offset = offset;
}
......
code/finance_serv/src/main/java/com/vion/financial/vo/SelectVo.java
package com.vion.financial.vo;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
......@@ -13,24 +14,172 @@ public class SelectVo {
private String province; //所属省份
private String city; //所属市
private String county; //所属县
private int guarantee_period; //保质周
private Integer guarantee_period; //保质周
private String year; //所属年份
private String month; //所属月份
private String product_line_type; //生产线类型
private String contract_state; //合同状态
private String contract_type; //合同性质
private String acceptanc_type; //验收类型
private boolean is_archive; //是否归档
private double confirm_income_amount; //确认收入金额
private Boolean is_archive; //是否归档
private Double confirm_income_amount; //确认收入金额
private String amount_state_unid; //账款状态
private Date start_date; //设置开始查询时间
private Date end_date; //设置结束时间
private double amount_point; //设置金额查询节点
private int overdays_point; //逾期天数查询节点
private double leave_amount_point; //账款余额查询节点
private int offset; //设置查询起始位置
private int limit; //设置每次查询条数
private Double amount_point; //设置金额查询节点
private Integer overdays_point; //逾期天数查询节点
private Double leave_amount_point; //账款余额查询节点
private Integer offset; //设置查询起始位置
private Integer limit; //设置每次查询条数
private List<String> salesperson_unids;
/*
* 查询条件
*/
public String getSalesperson_name__like() {
return salesperson_name__like;
}
public void setSalesperson_name__like(String salesperson_name__like) {
this.salesperson_name__like = salesperson_name__like;
}
public String getProject_name__like() {
return project_name__like;
}
public void setProject_name__like(String project_name__like) {
this.project_name__like = project_name__like;
}
public String getCustomer_name__like() {
return customer_name__like;
}
public void setCustomer_name__like(String customer_name__like) {
this.customer_name__like = customer_name__like;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getCounty() {
return county;
}
public void setCounty(String county) {
this.county = county;
}
public Integer getGuarantee_period() {
return guarantee_period;
}
public void setGuarantee_period(Integer guarantee_period) {
this.guarantee_period = guarantee_period;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getMonth() {
return month;
}
public void setMonth(String month) {
this.month = month;
}
public String getProduct_line_type() {
return product_line_type;
}
public void setProduct_line_type(String product_line_type) {
this.product_line_type = product_line_type;
}
public String getContract_state() {
return contract_state;
}
public void setContract_state(String contract_state) {
this.contract_state = contract_state;
}
public String getContract_type() {
return contract_type;
}
public void setContract_type(String contract_type) {
this.contract_type = contract_type;
}
public String getAcceptanc_type() {
return acceptanc_type;
}
public void setAcceptanc_type(String acceptanc_type) {
this.acceptanc_type = acceptanc_type;
}
public Boolean getIs_archive() {
return is_archive;
}
public void setIs_archive(Boolean is_archive) {
this.is_archive = is_archive;
}
public Double getConfirm_income_amount() {
return confirm_income_amount;
}
public void setConfirm_income_amount(Double confirm_income_amount) {
this.confirm_income_amount = confirm_income_amount;
}
public String getAmount_state_unid() {
return amount_state_unid;
}
public void setAmount_state_unid(String amount_state_unid) {
this.amount_state_unid = amount_state_unid;
}
public Date getStart_date() {
return start_date;
}
public void setStart_date(Date start_date) {
this.start_date = start_date;
}
public Date getEnd_date() {
return end_date;
}
public void setEnd_date(Date end_date) {
this.end_date = end_date;
}
public Double getAmount_point() {
return amount_point;
}
public void setAmount_point(Double amount_point) {
this.amount_point = amount_point;
}
public Integer getOverdays_point() {
return overdays_point;
}
public void setOverdays_point(Integer overdays_point) {
this.overdays_point = overdays_point;
}
public Double getLeave_amount_point() {
return leave_amount_point;
}
public void setLeave_amount_point(Double leave_amount_point) {
this.leave_amount_point = leave_amount_point;
}
public Integer getOffset() {
return offset;
}
public void setOffset(Integer offset) {
this.offset = offset;
}
public Integer getLimit() {
return limit;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public List<String> getSalesperson_unids() {
return salesperson_unids;
}
public void setSalesperson_unids(List<String> salesperson_unids) {
this.salesperson_unids = salesperson_unids;
}
}
code/finance_serv/src/main/resources/application.yml
......@@ -37,11 +37,15 @@ mybatis:
logging:
level:
root: INFO
root: DEBUG
pattern:
level: INFO
level: DEBUG
console: "[financial_serv]-[%d{yyyy-MM-dd HH:mm:ss.SSS}]-%m%n"
path: F:\LOG\
finance:
authurl: http://192.168.9.162:20080/api/v1/auth/users
#pagehelper:
# helperDialect: postgresql
# reasonable: true
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!