From 9f87da0e7fc307c58d38e653fa60df3730b15374 Mon Sep 17 00:00:00 2001 From: yefei Date: Fri, 8 Sep 2023 14:29:10 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BA=8B=E5=8A=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java | 1 - .../com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java | 3 --- .../core/job/service/impl/DataPlatformCollectServiceImpl.java | 3 --- .../dxhy/core/job/service/impl/InvoiceDownServiceImpl.java | 4 ---- .../core/job/service/impl/InvoiceInterfaceServiceImpl.java | 3 +-- .../core/service/invoicedetail/InvoiceDetailServiceImpl.java | 2 -- .../singletable/impl/CoreSaveInvoiceInfoServiceImpl.java | 1 - .../dxhy/core/service/singletable/impl/InvoiceDetailImpl.java | 1 - .../service/impl/CustomsCustomsJkszhcxServiceImpl.java | 1 - .../com/dxhy/erp/controller/SDNYMainProcessController.java | 4 ---- .../src/main/java/com/dxhy/erp/service/SignedService.java | 2 -- .../com/dxhy/erp/service/impl/AllTaxesSaleServiceImpl.java | 1 - .../main/java/com/dxhy/erp/service/impl/FEServiceImpl.java | 1 - .../java/com/dxhy/erp/service/impl/GatherServiceImpl.java | 2 -- .../com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 2 -- .../com/dxhy/erp/service/impl/MryxInterfaceServiceImpl.java | 1 - .../com/dxhy/erp/service/impl/QsCheckTaskServiceImpl.java | 2 -- .../java/com/dxhy/erp/service/impl/SignDataServiceImpl.java | 1 - .../dxhy/erp/service/impl/SignInvoiceDetailServiceImpl.java | 2 -- .../dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java | 1 - .../dxhy/erp/service/impl/TDxInvoiceReimburseServiceImpl.java | 1 - dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java | 1 - .../dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java | 1 - .../service/impl/PassengerReimbursementSystemServiceImpl.java | 2 -- .../portrait/business/service/impl/InvoiceDetailImpl.java | 2 -- .../business/service/impl/SaveInvoiceInfoServiceImpl.java | 1 - .../com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java | 1 - .../singletable/impl/SignInvoiceDetailServiceImpl.java | 2 -- .../singletable/impl/SignSaveInvoiceInfoServiceImpl.java | 1 - 29 files changed, 1 insertion(+), 49 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java index f1264991..c19de787 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpcj/BaseFpcjmxServiceImpl.java @@ -238,7 +238,6 @@ public class BaseFpcjmxServiceImpl extends MpBaseServiceImpl invoiceDetailList = new ArrayList<>(detailArray.size()); for (int i = 0; i < detailArray.size(); i++) { JSONObject invoiceDetailJson = detailArray.getJSONObject(i); diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index 0f8da411..956bc69e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -208,20 +208,17 @@ public class CheckTaskServiceImpl implements CheckTaskService { } private int getDetailCount(InvoiceCollectionInfo invoiceCollectionInfo, String db) { - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); return tDxRecordInvoiceDetailDao .getDetailCount(invoiceCollectionInfo.getUuid()); } private void insertDetail(String db, List invoiceDetailInfoList) { if (invoiceDetailInfoList != null && invoiceDetailInfoList.size() > 0) { - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); tDxRecordInvoiceDetailJobService.saveBatch(invoiceDetailInfoList); } } private void deleteDetail(InvoiceDetailInfo invoiceDetail, String db) { - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); checkTaskDao.deleteDetail(invoiceDetail); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/DataPlatformCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/DataPlatformCollectServiceImpl.java index 3bd44e25..ba303c0b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/DataPlatformCollectServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/DataPlatformCollectServiceImpl.java @@ -551,7 +551,6 @@ public class DataPlatformCollectServiceImpl implements DataPlatformCollectServic String invoiceCode = dataPlatformInvoiceInfo.getInvoiceCode(); String invoiceNo = dataPlatformInvoiceInfo.getInvoiceNo(); dataPlatformInvoiceInfo.setUuid(invoiceCode + invoiceNo); - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); // 插入明细 List detailList = dataPlatformInvoiceInfo.getDetailList(); // 进项发票入库 @@ -643,7 +642,6 @@ public class DataPlatformCollectServiceImpl implements DataPlatformCollectServic String uuid = invoiceCode + invoiceNo; List detailList = invoice.getDetailList(); if (detailList != null && detailList.size() > 0) { - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); if ("1".equals(tDxHttpLog.getSubject())) { dataPlatformDao.delDetailIncome(invoiceCode + invoiceNo); for (DataPlatformInvoiceDetailInfo invoiceDetailInfo : detailList) { @@ -663,7 +661,6 @@ public class DataPlatformCollectServiceImpl implements DataPlatformCollectServic dataPlatformDao.insertDetailSales(invoiceDetailInfo); } } - DynamicContextHolder.push(db + DbConstant.DETAIL_READ); int countDetail = dataPlatformDao.getDetailCount(invoiceCode + invoiceNo); if (countDetail > 0) { invoice.setDetailYesorno("1"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java index 341d96b1..17f95e75 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceDownServiceImpl.java @@ -790,7 +790,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { String uuid = invoiceCode + invoiceNo; List detailList = invoice.getDetailList(); if (detailList != null && detailList.size() > 0) { - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); if ("1".equals(tDxHttpLog.getDataType())) { invoiceDownDao.delDetailIncome(invoiceCode + invoiceNo); for (RecordInvoiceDetailModel invoiceDetailInfo : detailList) { @@ -813,7 +812,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { } if ("1".equals(tDxHttpLog.getDataType())) { - DynamicContextHolder.push(db + DbConstant.DETAIL_READ); int countDetail = invoiceDownDao.getDetailCount(invoiceCode + invoiceNo, "t_dx_record_invoice_detail"); if (countDetail > 0) { invoice.setDetailYesorno("1"); @@ -824,7 +822,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { invoiceDownDao.updateRecordInvoice(invoice); } if ("2".equals(tDxHttpLog.getDataType())) { - DynamicContextHolder.push(db + DbConstant.DETAIL_READ); int countDetail = invoiceDownDao.getDetailCount(invoiceCode + invoiceNo, "t_dx_record_invoice_detail_sales"); if (countDetail > 0) { @@ -878,7 +875,6 @@ public class InvoiceDownServiceImpl implements InvoiceDownService { String invoiceCode = dataPlatformInvoiceInfo.getInvoiceCode(); String invoiceNo = dataPlatformInvoiceInfo.getInvoiceNo(); dataPlatformInvoiceInfo.setUuid(invoiceCode + invoiceNo); - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); // 插入明细 List detailList = dataPlatformInvoiceInfo.getDetailList(); // 进项发票入库 diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java index 841e44f5..e87163a3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java @@ -1205,10 +1205,9 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService { invoiceDetailInfo.setSpecificationModel(null); invoiceDetailInfo.setTaxCodeName(null); } - DynamicContextHolder.push(db + DbConstant.DETAIL_WRITE); + tDxRecordInvoiceDetailDao.delDetail(uuid); tDxRecordInvoiceDetailJobService.saveBatch(detailList); - DynamicContextHolder.push(db + DbConstant.DETAIL_READ); int countDetail = tDxRecordInvoiceDetailDao.getDetailCount(uuid); if (countDetail > 0) { recordInvoices.setDetailYesorno("1"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java index f44518fc..0162a933 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java @@ -71,7 +71,6 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl selectInvoiceDetails(String invoiceNo, String invoiceCode, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); Map map = new HashMap<>(3); map.put("invoiceNo", invoiceNo); map.put("invoiceCode", invoiceCode); @@ -123,7 +122,6 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("uuid", uuid); queryWrapper.orderByAsc("detail_no"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java index 42bc0a50..5125a1fe 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/CoreSaveInvoiceInfoServiceImpl.java @@ -86,7 +86,6 @@ public class CoreSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl 0) { // 保存底账明细表数据 - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); // 删除已存在的数据，防止数据重复 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("uuid", uuid); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/InvoiceDetailImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/InvoiceDetailImpl.java index d29022ba..735262be 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/InvoiceDetailImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/singletable/impl/InvoiceDetailImpl.java @@ -23,7 +23,6 @@ public class InvoiceDetailImpl extends MpBaseServiceImpl getSalesInvoiceDetail(String dbName, String uuid) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); return baseMapper.getSalesInvoiceDetail(uuid); } diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index 76a0b2d7..08114e43 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -194,7 +194,6 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl detailList = null; - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("customs_code", record.getCustomsCode()); detailList = customsCustomsDetailDao.selectList(queryWrapper); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 9eafc439..5c9476c9 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -272,7 +272,6 @@ public class SDNYMainProcessController extends AbstractController { if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { vehicleList = snPushCheckRecordService.vihicleList(uuid); } else { - DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); } DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); @@ -297,7 +296,6 @@ public class SDNYMainProcessController extends AbstractController { if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { vehicleList = snPushCheckRecordService.vihicleList(uuid); } else { - DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); } @@ -357,7 +355,6 @@ public class SDNYMainProcessController extends AbstractController { String invoiceNo = tdxSaleRecordInvoice.getInvoiceNo(); QueryWrapper saleDetailWrapper = new QueryWrapper<>(); saleDetailWrapper.eq("invoice_no", invoiceNo); - DynamicContextHolder.push(DbConstant.DETAIL_READ); List recordInvoiceSaleDetailModel = invoiceDownDetaiSaleInsertDao.selectList(saleDetailWrapper); DynamicContextHolder.push(DbConstant.BUSINESS_READ); @@ -1304,7 +1301,6 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(snInvoice.getInvoiceCode())) { uuid = snInvoice.getInvoiceNumber(); } - DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); List detailInfo = mryxInterfaceService.getDetailInfo(uuid); if (invoiceLineList != null && invoiceLineList.size() > 0) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java index 8462a2bf..da6ebfc3 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SignedService.java @@ -297,7 +297,6 @@ public class SignedService { log.debug("-------------------" + invoiceInfo); if ("01".equals(record.getInvoiceType()) || "08".equals(record.getInvoiceType())) { try { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); detailList = signedDao.selectDetails(record.getInvoiceCode() + record.getInvoiceNo()); log.debug("============" + detailList); if (detailList.size() > 0) { @@ -489,7 +488,6 @@ public class SignedService { if (record != null) { invoiceInfo = getInvoiceInfo(record); try { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); details = signedDao.selectDetails(data.getInvoiceCode() + data.getInvoiceNo()); log.info("----------" + details); if (details.size() > 0) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/AllTaxesSaleServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/AllTaxesSaleServiceImpl.java index cee41400..d86e9cff 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/AllTaxesSaleServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/AllTaxesSaleServiceImpl.java @@ -352,7 +352,6 @@ public class AllTaxesSaleServiceImpl implements AllTaxesSaleService { boolean isAdd = false; // 遍历明细-判断明细行 String uuid = po.getUuid(); - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); List detailListByDb = allTaxesSaleDao.getInvoiceDetailByUuid(uuid); List detailListByDbLast = new ArrayList<>(detailListByDb); Map map = new HashMap<>(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/FEServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/FEServiceImpl.java index 58104cb9..c4e788a5 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/FEServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/FEServiceImpl.java @@ -104,7 +104,6 @@ public class FEServiceImpl implements IFEService { // 如果签收成功的 加入到SuccessList 并查询明细表 String invoiceCode =StringUtils.isEmpty(info.getInvoiceCode())?"":info.getInvoiceCode(); String uuid = invoiceCode+ info.getInvoiceNo(); - DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); String goodsName = tdxInvoiceDao.findDetailByUUid(uuid); SuccessInvoice success = new SuccessInvoice(); success.setInvoiceCode( diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java index 62ce4fd5..94690a2d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java @@ -165,7 +165,6 @@ public class GatherServiceImpl extends MpBaseServiceImpl listInfo = new ArrayList<>(); if (detailList != null && detailList.size() > 0) { @@ -419,7 +418,6 @@ public class GatherServiceImpl extends MpBaseServiceImpl listInfo = new ArrayList<>(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index 90ee88b4..a21e2a9e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -610,7 +610,6 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { } } } else { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_READ); detailList = invoicePoolDao.listInvoiceDetail(data.getDataType(), uuid); List listInfo = new ArrayList<>(); if (detailList != null) { @@ -1698,7 +1697,6 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { vehicle.setUuid(invoiceCode + invoiceNo); vehicleSaleInvoiceDao.insert(vehicle); } else { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); salesInvoiceDetailDao .delete(new UpdateWrapper().eq("uuid", invoiceCode + invoiceNo)); List details = infos.getDetailList(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/MryxInterfaceServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/MryxInterfaceServiceImpl.java index 880e4092..4a3f0c90 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/MryxInterfaceServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/MryxInterfaceServiceImpl.java @@ -113,7 +113,6 @@ public class MryxInterfaceServiceImpl extends MpBaseServiceImpl listInfo = new ArrayList<>(); if (detailList != null && detailList.size() > 0) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/QsCheckTaskServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/QsCheckTaskServiceImpl.java index e8162960..0566ddbf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/QsCheckTaskServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/QsCheckTaskServiceImpl.java @@ -210,8 +210,6 @@ public class QsCheckTaskServiceImpl extends MpBaseServiceImpl detailList, String dbName) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); - for (RecordInvoiceDetail recordInvoiceDetail : detailList) { recordInvoiceDetail.setUuid(invoiceCode + invoiceNo); recordInvoiceDetail.setInvoiceCode(invoiceCode); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignDataServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignDataServiceImpl.java index 6fe2ab21..4e550d9e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignDataServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignDataServiceImpl.java @@ -633,7 +633,6 @@ public class SignDataServiceImpl extends MpBaseServiceImpl 0) { List detailList = getRecordInvoiceDetail(checkResult); - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); invoiceDetailDao .delete(new QueryWrapper().eq("uuid", uuid)); for (RecordInvoiceDetail detailInfo : detailList) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignInvoiceDetailServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignInvoiceDetailServiceImpl.java index 25ad0416..4a96d412 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignInvoiceDetailServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignInvoiceDetailServiceImpl.java @@ -30,7 +30,6 @@ public class SignInvoiceDetailServiceImpl extends MpBaseServiceImpl details, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); this.insertDetail(details); } @@ -46,7 +45,6 @@ public class SignInvoiceDetailServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("uuid", uuid); queryWrapper.orderByAsc("detail_no"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TDxInvoiceReimburseServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TDxInvoiceReimburseServiceImpl.java index 7a29e728..d6498d65 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TDxInvoiceReimburseServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TDxInvoiceReimburseServiceImpl.java @@ -803,7 +803,6 @@ public class TDxInvoiceReimburseServiceImpl extends ServiceImpl 0) { for (RecordInvoiceDetail detail : recordInvoiceDetails) { - DynamicContextHolder.push(deptEntity.getDbName() + DbConstant.DETAIL_WRITE); if(StringUtils.isNotBlank(detail.getTaxRate())){ if(detail.getTaxRate().contains("%")){ detail.setTaxRate(detail.getTaxRate().replace("%","")); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java b/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java index 4899b662..ffcbd9bf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java @@ -544,7 +544,6 @@ public class MyThread extends Thread { public void insertInvoiceDetail(String invoiceCode, String invoiceNo, List detailList) throws Exception { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); invoiceDetailDao.delete(new QueryWrapper().eq("uuid", invoiceCode + invoiceNo)); for (RecordInvoiceDetail recordInvoiceDetail : detailList) { recordInvoiceDetail.setUuid(invoiceCode + invoiceNo); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 51535f07..2c2d324d 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -547,7 +547,6 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl incentiveFlagList = super.baseMapper.listIncentiveFlag(); json.put("incentiveFlagList", incentiveFlagList); return super.responseResult(json); diff --git a/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerReimbursementSystemServiceImpl.java b/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerReimbursementSystemServiceImpl.java index 0ee3f9da..d0c5a129 100644 --- a/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerReimbursementSystemServiceImpl.java +++ b/dxhy-passengerTicket/src/main/java/com/dxhy/passengerticket/service/impl/PassengerReimbursementSystemServiceImpl.java @@ -130,7 +130,6 @@ public class PassengerReimbursementSystemServiceImpl @Override public void addInvoiceDetails(List tdxRecordInvoiceDetailList, String uuid, String dbName, String invoiceCode, String incoiceNo) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); for (TdxRecordInvoiceDetail invoiceDetail : tdxRecordInvoiceDetailList) { invoiceDetail.setUuid(uuid); invoiceDetail.setInvoiceCode(invoiceCode); @@ -186,7 +185,6 @@ public class PassengerReimbursementSystemServiceImpl @Override public void deleteInvoiceDetails(String uuid, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); passengerReimbursementSystemDao.deleteInvoiceDetails(uuid); } diff --git a/dxhy-portrait/src/main/java/com/dxhy/portrait/business/service/impl/InvoiceDetailImpl.java b/dxhy-portrait/src/main/java/com/dxhy/portrait/business/service/impl/InvoiceDetailImpl.java index 99b691bd..311017c6 100644 --- a/dxhy-portrait/src/main/java/com/dxhy/portrait/business/service/impl/InvoiceDetailImpl.java +++ b/dxhy-portrait/src/main/java/com/dxhy/portrait/business/service/impl/InvoiceDetailImpl.java @@ -31,7 +31,6 @@ public class InvoiceDetailImpl extends MpBaseServiceImpl details, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); this.insertDetail(details); } @@ -43,7 +42,6 @@ public class InvoiceDetailImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("uuid", uuid); queryWrapper.orderByAsc("detail_no"); diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java index 224c2d4e..961d6fce 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java @@ -3150,7 +3150,6 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl().eq("uuid", invoice.getUuid())); diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/singletable/impl/SignInvoiceDetailServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/singletable/impl/SignInvoiceDetailServiceImpl.java index c9408ac8..52fd730c 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/singletable/impl/SignInvoiceDetailServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/singletable/impl/SignInvoiceDetailServiceImpl.java @@ -32,7 +32,6 @@ public class SignInvoiceDetailServiceImpl extends MpBaseServiceImpl details, String dbName) { - DynamicContextHolder.push(dbName + DbConstant.DETAIL_WRITE); this.insertDetail(details); } @@ -48,7 +47,6 @@ public class SignInvoiceDetailServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("uuid", uuid); queryWrapper.orderByAsc("detail_no");