|
|
|
@ -499,13 +499,15 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
List<Business> businessList = (List<Business>)pramsMap.get("business"); |
|
|
|
|
int start = new Long(pageInfo.getStartRow()).intValue(); |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < pageList.size(); i++) { |
|
|
|
|
currentTax.add(pageList.get(i).getTaxAmount()); |
|
|
|
|
hjje.add(pageList.get(i).getInvoiceAmount()); |
|
|
|
|
log.info("maxTax====>"+maxTax+",currentTax====>"+currentTax); |
|
|
|
|
|
|
|
|
|
if (maxTax.compareTo(currentTax) >0){ |
|
|
|
|
count++; |
|
|
|
|
log.info("count++{}",count); |
|
|
|
|
BaseSggxCxRespVO vo = new BaseSggxCxRespVO(); |
|
|
|
|
if (taxnoList.contains(pageList.get(i).getGfTaxNo())) { |
|
|
|
|
vo.setUpgradeStatus("1"); |
|
|
|
@ -528,14 +530,14 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
String businessCode = pageList.get(i).getDeptId(); |
|
|
|
|
String businessName = this.getBusinessName(businessCode, businessList); |
|
|
|
|
|
|
|
|
|
log.info("businessName={}",businessName); |
|
|
|
|
// log.info("businessName={}",businessName);
|
|
|
|
|
vo.setVoucherNumber(pageList.get(i).getVoucherNumber()); |
|
|
|
|
vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber()); |
|
|
|
|
vo.setImageNumber(pageList.get(i).getImageNumber()); |
|
|
|
|
vo.setPostingTime(pageList.get(i).getPostingTime()); |
|
|
|
|
vo.setAccountPeriod(pageList.get(i).getAccountPeriod()); |
|
|
|
|
vo.setId(String.valueOf(pageList.get(i).getId())); |
|
|
|
|
vo.setXh(String.valueOf(start + i)); |
|
|
|
|
vo.setXh(String.valueOf(count)); |
|
|
|
|
vo.setInvoiceAmount( |
|
|
|
|
AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getInvoiceAmount().toString()))); |
|
|
|
|
vo.setInvoiceCode(pageList.get(i).getInvoiceCode()); |
|
|
|
@ -576,7 +578,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo()); |
|
|
|
|
vo.setSelect(true); |
|
|
|
|
|
|
|
|
|
log.info("智能勾选查询返回对象VO {}",vo); |
|
|
|
|
// log.info("智能勾选查询返回对象VO {}",vo);
|
|
|
|
|
|
|
|
|
|
String invoiceStatus="07"; |
|
|
|
|
if ( pageList.get(i).getInvoiceStatus() != null && !invoiceStatus.contains(pageList.get(i).getInvoiceStatus()) |
|
|
|
@ -586,6 +588,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
currentTax.subtract(pageList.get(i).getTaxAmount()); |
|
|
|
|
hjje.subtract(pageList.get(i).getInvoiceAmount()); |
|
|
|
|
count--; |
|
|
|
|
log.info("count--{}",count); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) { |
|
|
|
@ -593,6 +596,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
currentTax.subtract(pageList.get(i).getTaxAmount()); |
|
|
|
|
hjje.subtract(pageList.get(i).getInvoiceAmount()); |
|
|
|
|
count--; |
|
|
|
|
log.info("count--{}",count); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
// if ("1".equals(qsflag) && !"1".equals(pageList.get(i).getQsStatus())) {
|
|
|
|
@ -601,8 +605,10 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
// voList.add(vo);
|
|
|
|
|
// continue;
|
|
|
|
|
// }
|
|
|
|
|
log.info("returnList添加vo"); |
|
|
|
|
returnList.add(vo); |
|
|
|
|
}else { |
|
|
|
|
log.info("统计税额超出税额上限减去最后一个,并结束循环遍历"); |
|
|
|
|
currentTax.subtract(pageList.get(i).getTaxAmount()); |
|
|
|
|
hjje.subtract(pageList.get(i).getInvoiceAmount()); |
|
|
|
|
break; |
|
|
|
|