Merge remote-tracking branch 'origin/dev' into dev

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<QualFilingChangeCO> page(@Validated QualFilingChangePageQuery query) {
         return qualFilingChangeApi.page(query);
     }
 
+    @ApiOperation("分页查询备案变更-机构端")
+    @GetMapping("/org/page")
+    public PageResponse<QualFilingChangeCO> orgPage(@Validated QualFilingChangePageQuery query) {
+        Long orgId = ThreadLocalUserInfoAdapter.get();
+        query.setOrgId(orgId);
+        return qualFilingChangeApi.page(query);
+    }
+
 
     @ApiOperation("备案变更历史")
     @GetMapping("/history")

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;
 
 /**

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<QualFilingChangeEntity> pageResult = qualFilingChangeDomainService.page(domainQuery);

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());

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;
 

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;
-    }
-}
+//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;
+//    }
+//}