message

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