fixed 官方无效

src/main/java/cn/cslg/pas/common/dto/QueryFeatureHistoryDTO.java

@@ -9,5 +9,10 @@ import lombok.Data;
  */
 @Data
 public class QueryFeatureHistoryDTO {
+
     private Integer featureGroupId;
+
+    private Integer featureId;
+
+    private Integer groupId;
 }

src/main/java/cn/cslg/pas/service/business/invalidReport/AssoGroupFeatureService.java

@@ -199,8 +199,17 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
     public List<AssoGroupFeature> getHistory(QueryFeatureHistoryDTO queryFeatureHistoryDTO) {
         List<AssoGroupFeature> assoGroupFeatures = new ArrayList<>();
         Integer featureGroupId = queryFeatureHistoryDTO.getFeatureGroupId();
-        //根据特征id查询证据组合和特征关联
-        AssoGroupFeature assoGroupFeature = this.getById(featureGroupId);
+        Integer featureId1 = queryFeatureHistoryDTO.getFeatureId();
+        Integer groupId1 = queryFeatureHistoryDTO.getGroupId();
+        AssoGroupFeature assoGroupFeature = new AssoGroupFeature();
+        if (featureId1 != null && groupId1 != null) {
+            assoGroupFeature = this.getOne(new LambdaQueryWrapper<AssoGroupFeature>()
+                    .eq(AssoGroupFeature::getFeatureId, featureId1)
+                    .eq(AssoGroupFeature::getGroupId, groupId1));
+        } else {
+            //根据特征id查询证据组合和特征关联
+            assoGroupFeature = this.getById(featureGroupId);
+        }
         assoGroupFeatures.add(assoGroupFeature);
         Integer groupId = assoGroupFeature.getGroupId();
         Integer featureId = assoGroupFeature.getFeatureId();

src/main/java/cn/cslg/pas/service/business/invalidReport/EvidenceReasonService.java

@@ -248,7 +248,12 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         if (assoGroupFeatures != null && assoGroupFeatures.size() != 0) {
             assoGroupFeatures.forEach(assoGroupFeature -> {
                 //查询特征
-                Integer featureId = assoGroupFeature.getFeatureId();
+                Integer featureId = null;
+                if (gen.equals(1) && assoGroupFeature.getFeaturePreId() != null) {
+                    featureId = assoGroupFeature.getFeaturePreId();
+                } else {
+                    featureId = assoGroupFeature.getFeatureId();
+                }
                 Integer featureGen =assoGroupFeature.getFeatureGen();
                 Integer operateMode =assoGroupFeature.getOperateMode();
                 //根据特征id查询特征
@@ -258,6 +263,8 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                 //查询特征历史
                 QueryFeatureHistoryDTO queryFeatureHistoryDTO = new QueryFeatureHistoryDTO();
                 queryFeatureHistoryDTO.setFeatureGroupId(featureGroupId);
+                queryFeatureHistoryDTO.setFeatureId(featureId);
+                queryFeatureHistoryDTO.setGroupId(groupId);
                 List<AssoGroupFeature> queryFeatureHistories = assoGroupFeatureService.getHistory(queryFeatureHistoryDTO);
 
                 //装载特征历史特征