Skip to content

platform / finance_serv

Go to a project
Commit ce25f982 by 王军业
Options

1234513215

1 parent 449fe9c4
Inline Side-by-side
Showing 5 changed files with 40 additions and 20 deletions
code/finance_serv/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java
...@@ -39,7 +39,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService { ...@@ -39,7 +39,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try { try {
Appendix appendix = new Appendix(); Appendix appendix = new Appendix();
logger.info("=====================增加发货信息====================="); logger.info("=====================增加发货信息=====================");
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<DeliverGoods> list=deliverGoodsVo.getList_deliver_data(); List<DeliverGoods> list=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list) { for(DeliverGoods deliverGoods:list) {
deliverGoods.setContract_unid(s); deliverGoods.setContract_unid(s);
...@@ -75,7 +76,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService { ...@@ -75,7 +76,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
deliverGoodsVo.setList_deliver_data(new ArrayList()); deliverGoodsVo.setList_deliver_data(new ArrayList());
Appendix appendix = null; Appendix appendix = null;
logger.info("========================查询发货信息========================"); logger.info("========================查询发货信息========================");
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<DeliverGoods> list=deliverGoodsMapper.queryDeliverGoods(s); List<DeliverGoods> list=deliverGoodsMapper.queryDeliverGoods(s);
if(list!=null) { if(list!=null) {
for(DeliverGoods deliverGoods:list) { for(DeliverGoods deliverGoods:list) {
...@@ -109,7 +111,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService { ...@@ -109,7 +111,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try { try {
Appendix appendix=null; Appendix appendix=null;
logger.info("===========================修改发货信息==========================="); logger.info("===========================修改发货信息===========================");
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<DeliverGoods> list_deliver_data=deliverGoodsVo.getList_deliver_data(); List<DeliverGoods> list_deliver_data=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list_deliver_data) { for(DeliverGoods deliverGoods:list_deliver_data) {
deliverGoodsMapper.updateDeliverGoods(deliverGoods); deliverGoodsMapper.updateDeliverGoods(deliverGoods);
...@@ -144,7 +147,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService { ...@@ -144,7 +147,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try { try {
logger.info("=========================删除合同发货信息======================="); logger.info("=========================删除合同发货信息=======================");
Appendix appendix=null; Appendix appendix=null;
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
if(deliverGoodsVo.getDeliver_unids()!=null) { if(deliverGoodsVo.getDeliver_unids()!=null) {
for(int deliverUnid :deliverGoodsVo.getDeliver_unids()) { for(int deliverUnid :deliverGoodsVo.getDeliver_unids()) {
deliverGoodsMapper.deleteDeliverGoods(deliverUnid); deliverGoodsMapper.deleteDeliverGoods(deliverUnid);
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/PaymentAgreeServiceImpl.java
...@@ -31,7 +31,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -31,7 +31,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
public Object addPaymentAgree(PaymentAgreeVo paymentAgreeVo, String s) { public Object addPaymentAgree(PaymentAgreeVo paymentAgreeVo, String s) {
try { try {
logger.info("==============增加付款约定信息==================="); logger.info("==============增加付款约定信息===================");
if (!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
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);
...@@ -56,7 +57,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -56,7 +57,8 @@ 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)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
return paymentAgreeMapper.queryPaymentAgree(s); return paymentAgreeMapper.queryPaymentAgree(s);
} }
failCode.setEcode("100"); failCode.setEcode("100");
...@@ -77,7 +79,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -77,7 +79,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
try { try {
logger.info("==============修改付款约定信息==================="); logger.info("==============修改付款约定信息===================");
if (!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
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);
...@@ -103,7 +106,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService { ...@@ -103,7 +106,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("==============删除付款约定信息==================="); logger.info("==============删除付款约定信息===================");
if (!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list = paymentAgreeVo.getPayment_unids(); List<Integer> list = paymentAgreeVo.getPayment_unids();
for (int n : list) { for (int n : list) {
//paymentAgree.setContract_unid(s); //paymentAgree.setContract_unid(s);
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectAcceptancServiceImpl.java
...@@ -39,7 +39,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService { ...@@ -39,7 +39,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try { try {
Appendix appendix = new Appendix(); Appendix appendix = new Appendix();
logger.info("=====================增加合同验收信息====================="); logger.info("=====================增加合同验收信息=====================");
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data(); List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) { for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s); projectAcceptanc.setContract_unid(s);
...@@ -76,7 +77,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService { ...@@ -76,7 +77,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
projectAcceptancVo.setList_check_data(new ArrayList()); projectAcceptancVo.setList_check_data(new ArrayList());
Appendix appendix = null; Appendix appendix = null;
logger.info("========================查询合同验收信息========================"); logger.info("========================查询合同验收信息========================");
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<ProjectAcceptanc> list=projectAcceptancMapper.queryProjectAcceptanc(s); List<ProjectAcceptanc> list=projectAcceptancMapper.queryProjectAcceptanc(s);
for(ProjectAcceptanc projectAcceptanc:list) { for(ProjectAcceptanc projectAcceptanc:list) {
appendix = new Appendix(); appendix = new Appendix();
...@@ -108,7 +110,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService { ...@@ -108,7 +110,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try { try {
logger.info("===========================修改合同验收信息==========================="); logger.info("===========================修改合同验收信息===========================");
Appendix appendix=null; Appendix appendix=null;
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete){
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data(); List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) { for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s); projectAcceptanc.setContract_unid(s);
...@@ -144,7 +147,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService { ...@@ -144,7 +147,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try { try {
logger.info("===========================删除合同验收信息==========================="); logger.info("===========================删除合同验收信息===========================");
Appendix appendix =null; Appendix appendix =null;
if(!contractService.isDelete(s)) { Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list=projectAcceptancVo.getAcceptanc_unids(); List<Integer> list=projectAcceptancVo.getAcceptanc_unids();
for(int n:list) { for(int n:list) {
projectAcceptancMapper.deleteProjectAcceptanc(n); projectAcceptancMapper.deleteProjectAcceptanc(n);
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ReceiptServiceImpl.java
...@@ -31,7 +31,8 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -31,7 +31,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("=====================增加合同开票信息====================="); logger.info("=====================增加合同开票信息=====================");
if(! contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Receipt> list=receiptVo.getList_receipt_data(); List<Receipt> list=receiptVo.getList_receipt_data();
for(Receipt receipt: list) { for(Receipt receipt: list) {
receipt.setContract_unid(s); receipt.setContract_unid(s);
...@@ -56,7 +57,8 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -56,7 +57,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("========================查询合同开票信息======================="); logger.info("========================查询合同开票信息=======================");
if(!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
return receiptMapper.queryReceipt(s); return receiptMapper.queryReceipt(s);
}else { }else {
failCode.setEcode("100"); failCode.setEcode("100");
...@@ -76,7 +78,8 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -76,7 +78,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("===================修改合同开票信息========================"); logger.info("===================修改合同开票信息========================");
if(!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Receipt> list=receiptVo.getList_receipt_data(); List<Receipt> list=receiptVo.getList_receipt_data();
for(Receipt receipt:list) { for(Receipt receipt:list) {
receipt.setContract_unid(s); receipt.setContract_unid(s);
...@@ -102,7 +105,8 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -102,7 +105,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("=========================删除合同开票信息======================="); logger.info("=========================删除合同开票信息=======================");
if(!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list=receiptVo.getReceipt_unids(); List<Integer> list=receiptVo.getReceipt_unids();
for(int n :list) { for(int n :list) {
receiptMapper.deleteReceipt(n); receiptMapper.deleteReceipt(n);
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ReturnInfoServiceImpl.java
...@@ -33,7 +33,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService { ...@@ -33,7 +33,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("==============增加合同回款信息==================="); logger.info("==============增加合同回款信息===================");
if(! contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<ReturnInfo> list = returnInfoVo.getList_reback_data(); List<ReturnInfo> list = returnInfoVo.getList_reback_data();
for(ReturnInfo returnInfo:list) { for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s); returnInfo.setContract_unid(s);
...@@ -59,7 +60,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService { ...@@ -59,7 +60,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("===============查询回款信息====================="); logger.info("===============查询回款信息=====================");
if(!contractServiceImpl.isDelete(s)){ Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
return returnInfoMapper.queryReturnInfo(s); return returnInfoMapper.queryReturnInfo(s);
}else { }else {
failCode.setEcode("100"); failCode.setEcode("100");
...@@ -80,7 +82,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService { ...@@ -80,7 +82,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("==============修改回款信息==================="); logger.info("==============修改回款信息===================");
if(! contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<ReturnInfo> list = returnInfoVo.getList_reback_data(); List<ReturnInfo> list = returnInfoVo.getList_reback_data();
for(ReturnInfo returnInfo:list) { for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s); returnInfo.setContract_unid(s);
...@@ -106,7 +109,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService { ...@@ -106,7 +109,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
try { try {
logger.info("==============删除回款信息==================="); logger.info("==============删除回款信息===================");
if(!contractServiceImpl.isDelete(s)) { Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list = paymentAgreeVo.getReback_unids(); List<Integer> list = paymentAgreeVo.getReback_unids();
for(int n:list) { for(int n:list) {
//returnInfo.setContract_unid(s); //returnInfo.setContract_unid(s);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!