release
yishiqihuasheng 2 years ago
parent 1b549efc3f
commit 32ea2fa583
  1. 17
      dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
  2. 21
      dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
  3. 4
      dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java

@ -20,12 +20,14 @@ import com.dxhy.common.vo.Tax;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.HashedMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -104,7 +106,9 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
log.info("认证查询-查询首页合计信息耗时:{}",System.currentTimeMillis()-enter); log.info("认证查询-查询首页合计信息耗时:{}",System.currentTimeMillis()-enter);
List<String> gfshList1 = new ArrayList<>(); List<String> gfshList1 = new ArrayList<>();
List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(pramsMap); Map<String,Object> map = new HashMap<>();
map.put("gfsh",new ArrayList<>().add(gfsh));
List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(map);
log.info("认证查询列表-返回的所属期列表为:{}",curList); log.info("认证查询列表-返回的所属期列表为:{}",curList);
for (BaseTDxDkCount cur : curList) { for (BaseTDxDkCount cur : curList) {
String skssq = cur.getSkssq(); String skssq = cur.getSkssq();
@ -161,14 +165,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
pageList.get(i).setSelect(false); pageList.get(i).setSelect(false);
log.info("撤销认证状态设置false"); log.info("撤销认证状态设置false");
} }
String sign = (String) pramsMap.get("sign");
if (!"88".equals(sign)){ if (!gfshList1.contains(pageList.get(i).getGfsh())) {
if (!gfshList1.contains(pageList.get(i).getGfsh())) { log.info("税号一申请抵扣");
log.info("税号一申请抵扣"); pageList.get(i).setSelect(false);
pageList.get(i).setSelect(false);
}
} }
if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) { if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) {
pageList.get(i).setSelect(false); pageList.get(i).setSelect(false);
log.info("转出状态设置false"); log.info("转出状态设置false");

@ -13,6 +13,7 @@ import com.dxhy.base.dao.SysDeptAuthDao;
import com.dxhy.base.entity.SysDeptEntity; import com.dxhy.base.entity.SysDeptEntity;
import com.dxhy.common.constant.DictConstant; import com.dxhy.common.constant.DictConstant;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.HashedMap;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -79,7 +80,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
String qsflag = (String) pramsMap.get("qsflag"); String qsflag = (String) pramsMap.get("qsflag");
List<String> gfshList1 = new ArrayList<>(); List<String> gfshList1 = new ArrayList<>();
if (StringUtils.isNotBlank(gfsh)) { if (StringUtils.isNotBlank(gfsh)) {
List<BaseTDxDkCount> curList = super.baseMapper.selectDksh(pramsMap); Map<String,Object> map = new HashMap<>();
map.put("gfsh",new ArrayList<>().add(gfsh));
List<BaseTDxDkCount> curList = super.baseMapper.selectDksh(map);
for (BaseTDxDkCount cur : curList) { for (BaseTDxDkCount cur : curList) {
String skssq = cur.getSkssq(); String skssq = cur.getSkssq();
String year = skssq.substring(0, 4); String year = skssq.substring(0, 4);
@ -243,19 +246,19 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
|| pageList.get(i).getInvoiceAmount() != null && pageList.get(i).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0 || pageList.get(i).getInvoiceAmount() != null && pageList.get(i).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0
|| pageList.get(i).getTaxAmount() != null && pageList.get(i).getTaxAmount().compareTo(new BigDecimal(0)) < 0) { || pageList.get(i).getTaxAmount() != null && pageList.get(i).getTaxAmount().compareTo(new BigDecimal(0)) < 0) {
vo.setSelect(false); vo.setSelect(false);
vo.setBkgxts("该发票状态为"+pageList.get(i).getInvoiceStatus());
vo.setUpgradeStatus("0"); vo.setUpgradeStatus("0");
} }
String sign = (String) pramsMap.get("sign");
if (!"88".equals(sign)) { if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) {
if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) { vo.setSelect(false);
vo.setSelect(false); vo.setBkgxts("该发票税号已申请抵扣统计");
vo.setBkgxts("该发票税号已申请抵扣统计"); voList.add(vo);
voList.add(vo); continue;
continue;
}
} }
if ("1".equals(qsflag) && !"1".equals(pageList.get(i).getQsStatus())) { if ("1".equals(qsflag) && !"1".equals(pageList.get(i).getQsStatus())) {
vo.setSelect(false); vo.setSelect(false);
vo.setBkgxts("该发票未签收"); vo.setBkgxts("该发票未签收");

@ -79,7 +79,9 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
return super.responseResult(json); return super.responseResult(json);
} }
List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(pramsMap); Map<String,Object> map = new HashMap<>();
map.put("gfsh",new ArrayList<String>().add(taxno));
List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(map);
List<String> gfshList = new ArrayList<>(); List<String> gfshList = new ArrayList<>();
for (BaseTDxDkCount cur : curList) { for (BaseTDxDkCount cur : curList) {
String skssq = cur.getSkssq(); String skssq = cur.getSkssq();

Loading…
Cancel
Save