diff --git a/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptDao.java b/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java similarity index 97% rename from dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptDao.java rename to dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java index afb546ed..c53a2d1a 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptDao.java +++ b/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java @@ -13,7 +13,7 @@ import java.util.List; * @author jiaohongyang */ @Mapper -public interface SysDeptDao extends BaseMapper { +public interface SysDeptAuthDao extends BaseMapper { /** * 根据集团编码查询税号 * diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index 3174ef5b..5b4ee606 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import com.dxhy.base.dao.SysDeptDao; +import com.dxhy.base.dao.SysDeptAuthDao; import com.dxhy.base.entity.SysDeptEntity; import com.dxhy.common.constant.DictConstant; import lombok.extern.slf4j.Slf4j; @@ -56,7 +56,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl getGfshList(List gfshList, List companyCodes) { DynamicContextHolder.push(DbConstant.BASICS_READ); - List taxnoList = sysDeptDao.queryTaxnoList(); - List parentIdList = sysDeptDao.queryParentIdList(); + List taxnoList = sysDeptAuthDao.queryTaxnoList(); + List parentIdList = sysDeptAuthDao.queryParentIdList(); Map taxnoMap = taxnoList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, SysDeptEntity::getTaxno)); Map parentIdMap = parentIdList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, SysDeptEntity::getParentId)); + log.info("taxnoMap={},parentIdMap={}",taxnoMap,parentIdMap); + String gfsh = ""; for(String companyCode : companyCodes){ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("org_code",companyCode); - SysDeptEntity sysDeptEntity = sysDeptDao.selectOne(wrapper); + SysDeptEntity sysDeptEntity = sysDeptAuthDao.selectOne(wrapper); String dId = sysDeptEntity.getDeptId(); gfsh = getGfsh(dId,taxnoMap,parentIdMap); diff --git a/dxhy-base/src/main/resources/mapper/SysDeptDao.xml b/dxhy-base/src/main/resources/mapper/SysDeptAuthDao.xml similarity index 98% rename from dxhy-base/src/main/resources/mapper/SysDeptDao.xml rename to dxhy-base/src/main/resources/mapper/SysDeptAuthDao.xml index d06d0653..cb6c323c 100644 --- a/dxhy-base/src/main/resources/mapper/SysDeptDao.xml +++ b/dxhy-base/src/main/resources/mapper/SysDeptAuthDao.xml @@ -1,7 +1,7 @@ - +