From b9fc60214cd2ca6570a1fca7e27ae2f5bdaa0ca7 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 3 Jul 2026 11:12:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/MybatisPlusConfig.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/config/MybatisPlusConfig.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/config/MybatisPlusConfig.java index 3e8d206..249a053 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/config/MybatisPlusConfig.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/config/MybatisPlusConfig.java @@ -1,29 +1,29 @@ -package org.qinan.safetyeval.infrastructure.config; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.jjb.saas.framework.auth.properties.ServerProperties; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * MyBatis Plus配置 - * - * @author safety-eval - */ -@Configuration -@MapperScan({"org.qinan.safetyeval.infrastructure.mapper" -, "org.qinan.safetyeval.infrastructure.persistence.mapper"}) -@EnableConfigurationProperties(ServerProperties.class) -public class MybatisPlusConfig { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); - return interceptor; - } -} \ No newline at end of file +//package org.qinan.safetyeval.infrastructure.config; +// +//import com.baomidou.mybatisplus.annotation.DbType; +//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +//import com.jjb.saas.framework.auth.properties.ServerProperties; +//import org.mybatis.spring.annotation.MapperScan; +//import org.springframework.boot.context.properties.EnableConfigurationProperties; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +///** +// * MyBatis Plus配置 +// * +// * @author safety-eval +// */ +//@Configuration +//@MapperScan({"org.qinan.safetyeval.infrastructure.mapper" +//, "org.qinan.safetyeval.infrastructure.persistence.mapper"}) +//@EnableConfigurationProperties(ServerProperties.class) +//public class MybatisPlusConfig { +// +// @Bean +// public MybatisPlusInterceptor mybatisPlusInterceptor() { +// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); +// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); +// return interceptor; +// } +//} \ No newline at end of file From 69b85768d0c8e941f77465d6d1166f7c6755c22c Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 3 Jul 2026 11:24:59 +0800 Subject: [PATCH 2/4] message --- .../adapter/web/QualFilingChangeController.java | 12 +++++++++++- .../app/executor/QualFilingChangeExecutor.java | 1 - .../client/dto/QualFilingChangePageQuery.java | 3 --- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index bd0cd22..3899b2a 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.adapter.web; +import com.jjb.saas.secure.context.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -8,6 +9,7 @@ import org.qinan.safetyeval.client.co.QualFilingChangeAggregationCO; import org.qinan.safetyeval.client.co.QualFilingChangeCO; import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,12 +36,20 @@ public class QualFilingChangeController { return qualFilingChangeApi.delete(id); } - @ApiOperation("分页查询备案变更") + @ApiOperation("分页查询备案变更-监管端") @GetMapping("/page") public PageResponse page(@Validated QualFilingChangePageQuery query) { return qualFilingChangeApi.page(query); } + @ApiOperation("分页查询备案变更-机构端") + @GetMapping("/org/page") + public PageResponse orgPage(@Validated QualFilingChangePageQuery query) { + Long orgId = ThreadLocalUserInfoAdapter.get(); + query.setOrgId(orgId); + return qualFilingChangeApi.page(query); + } + @ApiOperation("备案变更历史") @GetMapping("/history") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index f286b4c..a571ef5 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -166,7 +166,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setOrgId(query.getOrgId()); - domainQuery.setFilingId(query.getFilingId()); domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); PageResult pageResult = qualFilingChangeDomainService.page(domainQuery); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java index 2c01813..4eca299 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java @@ -16,9 +16,6 @@ public class QualFilingChangePageQuery extends BasePageQuery { @ApiModelProperty(value = "单位id") private Long orgId; - @ApiModelProperty(value = "备案申请id") - private Long filingId; - @ApiModelProperty(value = "备案编号") private String filingNo; From 6da266064264185f596b7a10de80b0fff61e0891 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 3 Jul 2026 11:26:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyeval/app/orchestrator/QualFilingOrchestrator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index bbfb1a1..fffb941 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -2,10 +2,8 @@ package org.qinan.safetyeval.app.orchestrator; import org.qinan.safetyeval.app.support.*; import org.qinan.safetyeval.client.co.*; -import org.qinan.safetyeval.client.dto.AggregationSaveOrEditQualFilingCmd; import org.qinan.safetyeval.client.dto.QualFilingModifyCmd; import org.qinan.safetyeval.client.dto.QualFilingPageQuery; -import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.domain.change.gateway.QualFilingCommitmentChangeGateway; import org.qinan.safetyeval.domain.change.gateway.QualFilingMaterialChangeGateway; import org.qinan.safetyeval.domain.change.gateway.QualFilingPersonnelChangeGateway; @@ -205,7 +203,9 @@ public class QualFilingOrchestrator { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(query.getOrgId() != null ? query.getOrgId() : resolveOrgId()); + if (!query.getSupervision()) { + domainQuery.setOrgId(query.getOrgId() != null ? query.getOrgId() : resolveOrgId()); + } domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); From c6277cc52dde95c8492e95aea530e2d62a634dbb Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 3 Jul 2026 11:37:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/qinan/safetyeval/adapter/web/QualFilingController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java index d4a8497..697fb37 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java @@ -8,13 +8,10 @@ import org.qinan.safetyeval.client.co.QualFilingCO; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingDetailCO; import org.qinan.safetyeval.client.dto.*; -import org.qinan.safetyeval.domain.constant.QualFilingApplyTypeEnum; -import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Arrays; import java.util.List; /**