safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java

@@ -9,7 +9,6 @@ import org.qinan.safetyeval.client.co.QualFilingChangeCO;
 import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO;
 import org.qinan.safetyeval.client.co.QualFilingChangeOrgCO;
 import org.qinan.safetyeval.client.dto.*;
-import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum;
 import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
 import org.qinan.safetyeval.infrastructure.dataobject.base.Req;
 import org.springframework.validation.annotation.Validated;
@@ -64,7 +63,6 @@ public class QualFilingChangeController {
     @ApiOperation("聚合新增or编辑资质备案变更申请")
     @PostMapping("/aggregationSaveOrEdit")
     public SingleResponse<QualFilingChangeCO> aggregationSaveOrEdit(@RequestBody AggregationSaveOrEditQualFilingChangeCmd cmd) {
-        cmd.getQualFilingChangeAddCmd().setFilingStatusCode(QualFilingStatusEnum.CHANGE_REVIEWING.getCode());
         return qualFilingChangeApi.aggregationSaveOrEdit(cmd);
     }
 

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java

@@ -23,7 +23,6 @@ import org.qinan.safetyeval.domain.service.QualFilingDomainService;
 import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService;
 import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
 import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
-import org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeCountDO;
 import org.qinan.safetyeval.infrastructure.mapper.QualFilingChangeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -35,7 +34,6 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -191,26 +189,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
         // 直连 infrastructure 层 Mapper，跳过 domain，由 XML 直接返回 CO，无需转换
         Page<QualFilingChangeOrgCO> page = new Page<>(domainQuery.getPageNum(), domainQuery.getPageSize());
         IPage<QualFilingChangeOrgCO> result = qualFilingChangeMapper.orgPage(page, domainQuery);
-
+        return PageResponse.of(result.getRecords(), result.getTotal());
-        // 存在数据时，一次批量统计每个 filingId 在 qual_filing_change 表中的变更次数
-        List<QualFilingChangeOrgCO> records = result.getRecords();
-        if (!CollectionUtils.isEmpty(records)) {
-            List<Long> filingIds = records.stream()
-                    .map(QualFilingChangeOrgCO::getFilingId)
-                    .filter(Objects::nonNull)
-                    .distinct()
-                    .collect(Collectors.toList());
-            if (!filingIds.isEmpty()) {
-                List<QualFilingChangeCountDO> countList = qualFilingChangeMapper.countByFilingIds(filingIds);
-                Map<Long, Long> countMap = countList.stream()
-                        .collect(Collectors.toMap(
-                                QualFilingChangeCountDO::getFilingId,
-                                QualFilingChangeCountDO::getChangeCount));
-                records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1));
-            }
-        }
-
-        return PageResponse.of(records, result.getTotal());
     }
 
     @Override

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java

@@ -113,7 +113,4 @@ public class QualFilingChangeOrgCO {
 
     @ApiModelProperty(value = "租户ID")
     private Long tenantId;
-
-    @ApiModelProperty(value = "变更次数")
-    private Long changeCount;
 }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeCountDO.java

@@ -1,16 +0,0 @@
-package org.qinan.safetyeval.infrastructure.dataobject;
-
-import lombok.Data;
-
-/**
- * 备案变更次数统计结果
- *
- * @author safety-eval
- */
-@Data
-public class QualFilingChangeCountDO {
-
-    private Long filingId;
-
-    private Long changeCount;
-}

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingChangeMapper.java

@@ -6,12 +6,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.qinan.safetyeval.client.co.QualFilingChangeOrgCO;
 import org.qinan.safetyeval.domain.query.QualFilingChangeQuery;
-import org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeCountDO;
 import org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeDO;
 
-import java.util.Collection;
-import java.util.List;
-
 @Mapper
 public interface QualFilingChangeMapper extends BaseMapper<QualFilingChangeDO> {
 
@@ -19,9 +15,4 @@ public interface QualFilingChangeMapper extends BaseMapper<QualFilingChangeDO> {
      * 机构端分页查询：每个filing_id只取最新一条变更记录，直接返回CO
      */
     IPage<QualFilingChangeOrgCO> orgPage(IPage<QualFilingChangeOrgCO> page, @Param("query") QualFilingChangeQuery query);
-
-    /**
-     * 按 filing_id 批量统计变更次数
-     */
-    List<QualFilingChangeCountDO> countByFilingIds(@Param("filingIds") Collection<Long> filingIds);
 }

safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml

@@ -108,16 +108,4 @@
         WHERE temp.rn = 1
     </select>
 
-    <!-- 按filing_id批量统计变更次数 -->
-    <select id="countByFilingIds" resultType="org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeCountDO">
-        SELECT filing_id AS filingId, COUNT(*) AS changeCount
-        FROM qual_filing_change
-        WHERE delete_enum = 'false'
-        AND filing_id IN
-        <foreach collection="filingIds" item="filingId" open="(" separator="," close=")">
-            #{filingId}
-        </foreach>
-        GROUP BY filing_id
-    </select>
-
 </mapper>