Commit ce25f982 by 王军业

1234513215

1 parent 449fe9c4
......@@ -39,7 +39,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try {
Appendix appendix = new Appendix();
logger.info("=====================增加发货信息=====================");
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<DeliverGoods> list=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list) {
deliverGoods.setContract_unid(s);
......@@ -75,7 +76,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
deliverGoodsVo.setList_deliver_data(new ArrayList());
Appendix appendix = null;
logger.info("========================查询发货信息========================");
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<DeliverGoods> list=deliverGoodsMapper.queryDeliverGoods(s);
if(list!=null) {
for(DeliverGoods deliverGoods:list) {
......@@ -109,7 +111,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try {
Appendix appendix=null;
logger.info("===========================修改发货信息===========================");
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<DeliverGoods> list_deliver_data=deliverGoodsVo.getList_deliver_data();
for(DeliverGoods deliverGoods:list_deliver_data) {
deliverGoodsMapper.updateDeliverGoods(deliverGoods);
......@@ -144,7 +147,8 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
try {
logger.info("=========================删除合同发货信息=======================");
Appendix appendix=null;
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
if(deliverGoodsVo.getDeliver_unids()!=null) {
for(int deliverUnid :deliverGoodsVo.getDeliver_unids()) {
deliverGoodsMapper.deleteDeliverGoods(deliverUnid);
......
......@@ -31,7 +31,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
public Object addPaymentAgree(PaymentAgreeVo paymentAgreeVo, String s) {
try {
logger.info("==============增加付款约定信息===================");
if (!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for (PaymentAgree paymentAgree : list) {
paymentAgree.setContract_unid(s);
......@@ -56,7 +57,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
public Object queryPaymentAgree(String s) {
try {
logger.info("===============查询付款约定信息start=====================");
if (!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
return paymentAgreeMapper.queryPaymentAgree(s);
}
failCode.setEcode("100");
......@@ -77,7 +79,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
try {
logger.info("==============修改付款约定信息===================");
if (!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<PaymentAgree> list = paymentAgreeVo.getList_payment_data();
for (PaymentAgree paymentAgree : list) {
paymentAgree.setContract_unid(s);
......@@ -103,7 +106,8 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
// TODO Auto-generated method stub
try {
logger.info("==============删除付款约定信息===================");
if (!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list = paymentAgreeVo.getPayment_unids();
for (int n : list) {
//paymentAgree.setContract_unid(s);
......
......@@ -39,7 +39,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try {
Appendix appendix = new Appendix();
logger.info("=====================增加合同验收信息=====================");
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s);
......@@ -76,7 +77,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
projectAcceptancVo.setList_check_data(new ArrayList());
Appendix appendix = null;
logger.info("========================查询合同验收信息========================");
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<ProjectAcceptanc> list=projectAcceptancMapper.queryProjectAcceptanc(s);
for(ProjectAcceptanc projectAcceptanc:list) {
appendix = new Appendix();
......@@ -108,7 +110,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try {
logger.info("===========================修改合同验收信息===========================");
Appendix appendix=null;
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete){
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s);
......@@ -144,7 +147,8 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
try {
logger.info("===========================删除合同验收信息===========================");
Appendix appendix =null;
if(!contractService.isDelete(s)) {
Boolean isdelete = contractService.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list=projectAcceptancVo.getAcceptanc_unids();
for(int n:list) {
projectAcceptancMapper.deleteProjectAcceptanc(n);
......
......@@ -31,7 +31,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("=====================增加合同开票信息=====================");
if(! contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Receipt> list=receiptVo.getList_receipt_data();
for(Receipt receipt: list) {
receipt.setContract_unid(s);
......@@ -56,7 +57,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("========================查询合同开票信息=======================");
if(!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
return receiptMapper.queryReceipt(s);
}else {
failCode.setEcode("100");
......@@ -76,7 +78,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("===================修改合同开票信息========================");
if(!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Receipt> list=receiptVo.getList_receipt_data();
for(Receipt receipt:list) {
receipt.setContract_unid(s);
......@@ -102,7 +105,8 @@ public class ReceiptServiceImpl implements ReceiptService {
// TODO Auto-generated method stub
try {
logger.info("=========================删除合同开票信息=======================");
if(!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list=receiptVo.getReceipt_unids();
for(int n :list) {
receiptMapper.deleteReceipt(n);
......
......@@ -33,7 +33,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("==============增加合同回款信息===================");
if(! contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<ReturnInfo> list = returnInfoVo.getList_reback_data();
for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s);
......@@ -59,7 +60,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("===============查询回款信息=====================");
if(!contractServiceImpl.isDelete(s)){
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
return returnInfoMapper.queryReturnInfo(s);
}else {
failCode.setEcode("100");
......@@ -80,7 +82,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("==============修改回款信息===================");
if(! contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<ReturnInfo> list = returnInfoVo.getList_reback_data();
for(ReturnInfo returnInfo:list) {
returnInfo.setContract_unid(s);
......@@ -106,7 +109,8 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
// TODO Auto-generated method stub
try {
logger.info("==============删除回款信息===================");
if(!contractServiceImpl.isDelete(s)) {
Boolean isdelete = contractServiceImpl.isDelete(s);
if (isdelete != null && !isdelete) {
List<Integer> list = paymentAgreeVo.getReback_unids();
for(int n:list) {
//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!