From 4636fc6696e07dc15c5823497fcae9ede18e030a Mon Sep 17 00:00:00 2001 From: FCL Date: Fri, 10 Oct 2025 11:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E5=90=8D=EF=BC=9B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/qms/QmsServerApplication.java | 5 ++ .../BusinessAssayParameterDataMapper.xml | 0 .../mapper/BusinessAssayProjectDataMapper.xml | 0 .../mapper/BusinessAssayReportDataMapper.xml | 12 ++++ .../mapper/BusinessAssayTaskDataMapper.xml | 56 +++++++++++++++++++ .../dal/mapper/BusinessAssayTaskMapper.xml | 0 .../dal/mapper/BusinessBaseSampleMapper.xml | 0 .../dal/mapper/BusinessDocumentDataMapper.xml | 12 ++++ .../dal/mapper/BusinessDocumentMainMapper.xml | 12 ++++ ...inessQualityControlSampleProjectMapper.xml | 12 ++++ .../BusinessSampleEntrustDetailMapper.xml | 0 .../BusinessSampleEntrustProjectMapper.xml | 0 .../BusinessSampleHandoverDetailMapper.xml | 0 .../mapper/BusinessSampleHandoverMapper.xml | 0 .../mapper/BusinessStandardSampleMapper.xml | 12 ++++ .../BusinessStandardSampleProjectMapper.xml | 12 ++++ .../BusinessSubSampleAnalysisGroupMapper.xml | 12 ++++ .../BusinessSubSampleAssessmentMapper.xml | 0 .../dal/mapper/BusinessSubSampleMapper.xml | 0 .../mapper/BusinessTeamAssessmentMapper.xml | 12 ++++ .../config/dal/mapper/BaseSampleMapper.xml | 2 +- .../dal/mapper/ConfigAssayMethodMapper.xml | 0 .../mapper/ConfigAssayMethodProjectMapper.xml | 0 ...onfigAssayMethodProjectParameterMapper.xml | 0 .../ConfigAssayMethodProjectRangeMapper.xml | 12 ++++ .../dal/mapper/ConfigBaseSampleMapper.xml | 0 .../dal/mapper/ConfigDocumentTypeMapper.xml | 0 .../dal/mapper/ConfigEntrustSourceMapper.xml | 0 .../config/dal/mapper/ConfigProjectMapper.xml | 0 .../dal/mapper/ConfigReportFieldMapper.xml | 0 .../dal/mapper/ConfigReportTemplateMapper.xml | 0 .../dal/mapper/ConfigReportTypeMapper.xml | 0 .../dal/mapper/ConfigSampleFlowMapper.xml | 0 .../dal/mapper/ConfigSampleHandoverMapper.xml | 0 .../dal/mapper/ConfigSampleReportMapper.xml | 0 .../dal/mapper/ConfigSimpleFlowCodeMapper.xml | 0 .../dal/mapper/ConfigSimpleFlowRuleMapper.xml | 0 .../ConfigStandardSampleProjectMapper.xml | 0 .../mapper/ConfigStandardSampleTypeMapper.xml | 0 .../dal/mapper/ConfigSubSampleMapper.xml | 0 .../mapper/ConfigSubSampleMethodMapper.xml | 0 .../mapper/ConfigSubSampleParentMapper.xml | 0 ...onfigWarehouseLocationInfomationMapper.xml | 0 .../MaterialAssayStandardDetailMapper.xml | 5 +- ...rialAssayStandardForecastProjectMapper.xml | 12 ++++ .../mapper/MaterialAssayStandardMapper.xml | 2 +- .../MaterialAssayStandardMethodMapper.xml | 0 .../dal/mapper/DictionaryParameterMapper.xml | 0 .../dal/mapper/DictionaryProjectMapper.xml | 0 .../mapper/DictionarySampleFlowNodeMapper.xml | 0 .../dal/mapper/DictionarySampleTypeMapper.xml | 0 .../com/zt/plat/module/qms/manage/deleteme | 0 .../com/zt/plat/module/qms/office/deleteme | 0 .../dal/mapper/DeviceInfomationMapper.xml | 12 ++++ .../data/dal/mapper/DeviceProductMapper.xml | 12 ++++ .../dal/mapper/MaterialInfomationMapper.xml | 12 ++++ .../data/dal/mapper/MaterialProductMapper.xml | 12 ++++ .../mapper/BusinessAssayTaskDataMapper.xml | 30 ---------- .../resources/{ => 删}/application-dev.yml | 2 +- .../application-local1.yml} | 2 +- .../main/resources/{ => 删}/application.yml | 2 +- 61 files changed, 237 insertions(+), 37 deletions(-) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml (100%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessAssayTaskMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessBaseSampleMapper.xml (100%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml (100%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/bus/dal/mapper/BusinessSubSampleMapper.xml (100%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/BaseSampleMapper.xml (93%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigAssayMethodMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigAssayMethodProjectMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigAssayMethodProjectParameterMapper.xml (100%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectRangeMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigBaseSampleMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigDocumentTypeMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigEntrustSourceMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigProjectMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigReportFieldMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigReportTemplateMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigReportTypeMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSampleFlowMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSampleHandoverMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSampleReportMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSimpleFlowCodeMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSimpleFlowRuleMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigStandardSampleProjectMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigStandardSampleTypeMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSubSampleMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSubSampleMethodMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigSubSampleParentMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/ConfigWarehouseLocationInfomationMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/MaterialAssayStandardDetailMapper.xml (85%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/MaterialAssayStandardForecastProjectMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/MaterialAssayStandardMapper.xml (98%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/config/dal/mapper/MaterialAssayStandardMethodMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/dic/dal/mapper/DictionaryParameterMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/dic/dal/mapper/DictionaryProjectMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/dic/dal/mapper/DictionarySampleFlowNodeMapper.xml (100%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/{qms1 => qms}/business/dic/dal/mapper/DictionarySampleTypeMapper.xml (100%) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/manage/deleteme create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/office/deleteme create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/data/dal/mapper/DeviceInfomationMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/data/dal/mapper/DeviceProductMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/data/dal/mapper/MaterialInfomationMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/data/dal/mapper/MaterialProductMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml rename zt-module-qms/zt-module-qms-server/src/main/resources/{ => 删}/application-dev.yml (99%) rename zt-module-qms/zt-module-qms-server/src/main/resources/{application-local.yml => 删/application-local1.yml} (99%) rename zt-module-qms/zt-module-qms-server/src/main/resources/{ => 删}/application.yml (98%) diff --git a/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java b/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java index e283ad3..d0ea2a0 100644 --- a/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java +++ b/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java @@ -2,6 +2,9 @@ package com.zt.plat.qms; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; +import tech.zzjc.tio.starter.TioServerAutoConfiguration; +import tech.zzjc.tio.starter.annotation.EnableTioServerServer; /** * Qms 服务器的启动类 @@ -11,6 +14,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${zt.info.base-package} @SpringBootApplication(scanBasePackages = {"${zt.info.base-package}.qms", "${zt.info.base-package}.module"}, excludeName = {}) +@EnableTioServerServer +@Import(TioServerAutoConfiguration.class) public class QmsServerApplication { public static void main(String[] args) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml new file mode 100644 index 0000000..9c0eeba --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml new file mode 100644 index 0000000..2bd2314 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessBaseSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessBaseSampleMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessBaseSampleMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessBaseSampleMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml new file mode 100644 index 0000000..bd79160 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml new file mode 100644 index 0000000..bb8a1f8 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml new file mode 100644 index 0000000..77eca10 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml new file mode 100644 index 0000000..b1ab992 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml new file mode 100644 index 0000000..d11cf77 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml new file mode 100644 index 0000000..f99c39a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml new file mode 100644 index 0000000..ffab495 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml similarity index 93% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml index 669888b..4e290a0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml @@ -10,7 +10,7 @@ --> - SELECT - tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId, - tcam.NAME AS configAssayMethodName, - COUNT(tbatd.ID) AS sampleTaskCount - FROM - T_BSN_ASY_TSK_DAT tbatd - LEFT JOIN T_CFG_ASY_MTHD tcam ON - tbatd.CFG_ASY_MTHD_ID = tcam.ID - WHERE - tbatd.IS_TSKD = 0 - AND tbatd.IS_RPOD = 0 - AND tbatd.DELETED = 0 - GROUP BY - tbatd.CFG_ASY_MTHD_ID, - tcam.NAME - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/application-dev.yml b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-dev.yml similarity index 99% rename from zt-module-qms/zt-module-qms-server/src/main/resources/application-dev.yml rename to zt-module-qms/zt-module-qms-server/src/main/resources/删/application-dev.yml index 499327f..86eef9b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/application-dev.yml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-dev.yml @@ -49,7 +49,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: - host: 172.16.46.63 # 地址 + host: 172.16.46.163 # 地址 port: 30379 # 端口 database: 0 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/application-local.yml b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-local1.yml similarity index 99% rename from zt-module-qms/zt-module-qms-server/src/main/resources/application-local.yml rename to zt-module-qms/zt-module-qms-server/src/main/resources/删/application-local1.yml index 033b8fb..8a402b1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/application-local.yml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-local1.yml @@ -51,7 +51,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: - host: 172.16.46.63 # 地址 + host: 172.16.46.163 # 地址 port: 30379 # 端口 database: 0 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/application.yml b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application.yml similarity index 98% rename from zt-module-qms/zt-module-qms-server/src/main/resources/application.yml rename to zt-module-qms/zt-module-qms-server/src/main/resources/删/application.yml index 455139c..1fbd64b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/application.yml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application.yml @@ -24,7 +24,7 @@ spring: config: import: - - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 +# - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 # Servlet 配置