From 02e833445a9cf218cf88edbe0905e4af90d10a8f Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 18 Apr 2024 16:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B4=A8=E9=87=8F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/controller/QcCheckTaskIncomeController.java | 8 ++++---- .../controller/QcCheckTaskInventoryController.java | 4 ++-- .../quality/controller/QcCheckTaskMarketController.java | 4 ++-- .../controller/QcCheckTaskWarehousingController.java | 8 ++++---- .../op/system/service/impl/SysDatasourceServiceImpl.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index abd919ba..ca699691 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -82,14 +82,14 @@ public class QcCheckTaskIncomeController extends BaseController { public TableDataInfo list(QcCheckTaskIncome qcCheckTaskIncome) { //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) { + /*if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) { qcCheckTaskIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; qcCheckTaskIncome.setIncomeTimeEnd(dateEndStr);//end - } + }*/ // if(StringUtils.isEmpty(qcCheckTaskIncome.getCheckTimeStart())){ // qcCheckTaskIncome.setCheckTimeStart(qcCheckTaskIncome.getIncomeTimeStart());//start @@ -110,14 +110,14 @@ public class QcCheckTaskIncomeController extends BaseController { public void export(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) { //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) { + /*if (StringUtils.isEmpty(qcCheckTaskIncome.getIncomeTimeStart())) { qcCheckTaskIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; qcCheckTaskIncome.setIncomeTimeEnd(dateEndStr);//end - } + }*/ // if(StringUtils.isEmpty(qcCheckTaskIncome.getCheckTimeStart())){ // qcCheckTaskIncome.setCheckTimeStart(qcCheckTaskIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java index 23a33600..3fd27733 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java @@ -46,14 +46,14 @@ public class QcCheckTaskInventoryController extends BaseController { public TableDataInfo list(QcCheckTaskInventory qcCheckTaskInventory) { //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckTaskInventory.getIncomeTimeStart())) { + /*if (StringUtils.isEmpty(qcCheckTaskInventory.getIncomeTimeStart())) { qcCheckTaskInventory.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; qcCheckTaskInventory.setIncomeTimeEnd(dateEndStr);//end - } + }*/ startPage(); List list = qcCheckTaskInventoryService.selectQcCheckTaskInventoryList(qcCheckTaskInventory); return getDataTable(list); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskMarketController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskMarketController.java index 0d8c37f7..0aab53da 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskMarketController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskMarketController.java @@ -39,14 +39,14 @@ public class QcCheckTaskMarketController extends BaseController { public TableDataInfo list(QcCheckTaskMarket qcCheckTaskMarket) { //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckTaskMarket.getIncomeTimeStart())) { + /*if (StringUtils.isEmpty(qcCheckTaskMarket.getIncomeTimeStart())) { qcCheckTaskMarket.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; qcCheckTaskMarket.setIncomeTimeEnd(dateEndStr);//end - } + }*/ startPage(); List list = qcCheckTaskMarketService.selectQcCheckTaskMarketList(qcCheckTaskMarket); return getDataTable(list); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java index 45e41efd..f2bcff53 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java @@ -54,14 +54,14 @@ public class QcCheckTaskWarehousingController extends BaseController { public TableDataInfo list(QcCheckTaskWarehousing qcCheckTaskWarehousing) { startPage(); //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){ + /*if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){ qcCheckTaskWarehousing.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; qcCheckTaskWarehousing.setIncomeTimeEnd(dateEndStr);//end - } + }*/ List list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing); return getDataTable(list); } @@ -74,14 +74,14 @@ public class QcCheckTaskWarehousingController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckTaskWarehousing qcCheckTaskWarehousing) { //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){ + /*if(StringUtils.isEmpty(qcCheckTaskWarehousing.getIncomeTimeStart())){ qcCheckTaskWarehousing.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; qcCheckTaskWarehousing.setIncomeTimeEnd(dateEndStr);//end - } + }*/ List list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing); ExcelUtil util = new ExcelUtil(QcCheckTaskWarehousing.class); util.exportExcel(response, list, "成品入库检验任务数据"); diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java index 455cbe89..704a92f0 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java @@ -103,7 +103,7 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService { sysDatasource.setUrl(mysqlPrev + sysDatasource.getIpPort().split("/")[0] + mysqlAffter + sysDatasource.getIpPort().split("/")[1]); } - if (sysDatasource.getDeptId() != null) { + if (sysDatasource.getDeptId() != null && StringUtils.isEmpty(sysDatasource.getPoolName())) { sysDatasource.setPoolName(poolNamePrev + "_" + sysDatasource.getDeptId());