特征历史模块/根据栏位名称添加栏位值方法

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

@@ -20,5 +20,5 @@ public class DomainFieldDTO {
 
     private String field;
 
-    private String value;
+    private Object value;
 }

src/main/java/cn/cslg/pas/common/dto/invalidDTO/AddEvidenceReasonDTO.java

@@ -8,4 +8,5 @@ import java.util.List;
 public class AddEvidenceReasonDTO {
     private Integer groupId;
     private List<AddEvidenceReasonsDTO> evidenceReasonList;
+    private Integer gen;
 }

src/main/java/cn/cslg/pas/common/dto/invalidDTO/AddEvidenceReasonsDTO.java

@@ -8,8 +8,10 @@ import java.util.List;
 public class AddEvidenceReasonsDTO {
     private Integer featureId;
     private Integer featureOrder;
+    private Integer featureGroupId;
     private String featureText;
     private List<Integer> literatureId;
+    private Integer evidenceReasonId;
     private String evidenceText;
     private String evidenceDescription;
 

src/main/java/cn/cslg/pas/common/dto/invalidDTO/GetProofGroupDTO.java

@@ -9,4 +9,5 @@ import lombok.Data;
 @Data
 public class GetProofGroupDTO {
     private Integer invalidStatutesId;
+    private Integer proofGroupId;
 }

src/main/java/cn/cslg/pas/common/dto/invalidDTO/QueryEvidenceReasonDTO.java

@@ -7,4 +7,5 @@ import java.util.List;
 @Data
 public class QueryEvidenceReasonDTO {
     private Integer groupId;
+    private Integer gen;
 }

src/main/java/cn/cslg/pas/common/vo/invalidVO/ProofGroupVO.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.common.vo.invalidVO;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -40,4 +41,52 @@ public class ProofGroupVO {
      * 证据组合说明
      */
     private String description;
+
+    /**
+     * 无效理由详情1
+     */
+    private String invalidReasonDetail1;
+
+    /**
+     * 无效理由详情2
+     */
+    private String invalidReasonDetail2;
+    /**
+     * 无效理由概述`1
+     */
+    private String common1;
+
+    /**
+     * 无效理由概述2
+     */
+    private String common2;
+    /**
+     * 陈述意见
+     */
+    private String presentOpinions1;
+
+
+    /**
+     * 第二次陈述意见
+     */
+    private String presentOpinions2;
+    /**
+     * 是否有第一次陈述意见
+     */
+    private Boolean ifPresentOpinions1;
+    /**
+     * 是否有第二次陈述意见
+     */
+    private Boolean ifPresentOpinions2;
+    /**
+     * 复审委意见
+     */
+    private String rbOpinions;
+
+    /**
+     * 复审委意见要点提炼
+     */
+    private String rbDecisionKey;
+
+
 }

src/main/java/cn/cslg/pas/controller/AssoGroupFeatureController.java

@@ -82,7 +82,12 @@ public class AssoGroupFeatureController {
     @Operation(summary = "更新信息")
     @PostMapping("/updateMessage")
     public Response updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
-        Records records =  new Records();
-        return Response.success(records);
+        try {
+            assoGroupFeatureService.updateMessage(updateMessageDTO);
+        }
+        catch (Exception e){
+            return  Response.error(e.getMessage());
+        }
+        return Response.success("更新成功");
     }
 }

src/main/java/cn/cslg/pas/controller/EvidenceReasonController.java

@@ -58,8 +58,13 @@ public class EvidenceReasonController {
     @Operation(summary = "更新信息")
     @PostMapping("/updateMessage")
     public Response updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
-        Records records =  new Records();
-        return Response.success(records);
+        try {
+            evidenceReasonService.updateMessage(updateMessageDTO);
+        }
+      catch (Exception e){
+            return  Response.error(e.getMessage());
+      }
+        return Response.success("更新成功");
     }
 
 }

src/main/java/cn/cslg/pas/controller/ProofGroupController.java

@@ -23,6 +23,7 @@ import java.util.List;
 
 /**
  * 证据组合的Controller层
+ *
  * @Author xiexiang
  * @Date 2023/12/22
  */
@@ -35,7 +36,7 @@ public class ProofGroupController {
 
     @Operation(summary = "添加证据组合")
     @PostMapping("/addProofGroup")
-    public Response addProofGroup(@RequestBody AddProofGroupDTO addProofGroupDTO){
+    public Response addProofGroup(@RequestBody AddProofGroupDTO addProofGroupDTO) {
         List<Integer> ids = proofGroupService.addProofGroup(addProofGroupDTO);
         Records records = new Records();
         records.setData(ids);
@@ -44,7 +45,7 @@ public class ProofGroupController {
 
     @Operation(summary = "查询证据组合")
     @PostMapping("/queryProofGroup")
-    public Response queryProofGroup(@RequestBody GetProofGroupDTO getProofGroupDTO){
+    public Response queryProofGroup(@RequestBody GetProofGroupDTO getProofGroupDTO) {
         Integer invalidStatutesId = getProofGroupDTO.getInvalidStatutesId();
         List<ProofGroupVO> proofGroupVOS = proofGroupService.queryProofGroup(invalidStatutesId);
         Records records = new Records();
@@ -54,9 +55,15 @@ public class ProofGroupController {
 
 
     @Operation(summary = "更新信息")
-    @PostMapping("/updateMessage")
-    public Response updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
-        Records records =  new Records();
-        return Response.success(records);
+    @PostMapping("/查询证据组合详情")
+    public Response queryProofGroupDetail(@RequestBody GetProofGroupDTO getProofGroupDTO) {
+        try {
+            proofGroupService.queryProofGroupDetail(getProofGroupDTO);
+        } catch (Exception e) {
+            return Response.error(e.getMessage());
+        }
+        return Response.success("更新成功");
     }
+
+
 }

src/main/java/cn/cslg/pas/domain/business/AssoFeatureReason.java

@@ -10,6 +10,8 @@ import lombok.Data;
 public class AssoFeatureReason extends BaseEntity<AssoFeatureReason> {
     @TableField(value = "reason_id")
     private Integer reasonId;
-    @TableField(value = "feature_id")
-    private Integer featureId;
+    @TableField(value = "g_feature_id")
+    private Integer GFeatureId;
+    @TableField(value = "gen")
+    private Integer gen;
 }

src/main/java/cn/cslg/pas/domain/business/AssoGroupFeature.java

@@ -21,20 +21,56 @@ public class AssoGroupFeature  extends BaseEntity<AssoGroupFeature> {
     private Integer featurePreId;
     @TableField(value = "group_id")
     private Integer groupId;
-    //陈述意见
-    @TableField(value = "present_opinions")
-    private String presentOpinions;
 
-    //特征修改说明
-    @TableField(value = "common")
-    private String common;
+    @TableField(value = "operate_mode")
+    private Integer operateMode;
+
+    /**
+     * 无效理由详情1
+     */
+    @TableField(value = "invalid_reason_detail1")
+    private String invalidReasonDetail1;
+
+    /**
+     * 无效理由详情2
+     */
+    @TableField(value = "invalid_reason_detail2")
+    private String invalidReasonDetail2;
+
+    /**
+     * 陈述意见
+     */
+    @TableField(value = "present_opinions1")
+    private String presentOpinions1;
 
-    @TableField(value = "rb_decision")
-    private String rbDecision;
+
+    /**
+     * 第二次陈述意见
+     */
+    @TableField(value = "present_opinions2")
+    private String presentOpinions2;
+    /**
+     * 是否有第一次陈述意见
+     */
+    @TableField(value = "if_present_opinion1")
+    private Boolean ifPresentOpinions1;
+    /**
+     * 是否有第二次陈述意见
+     */
+    @TableField(value = "if_present_opinion2")
+    private Boolean ifPresentOpinions2;
+    /**
+     * 复审委意见
+     */
+    @TableField(value = "rb_opinions")
+    private String rbOpinions;
+
+    /**
+     * 复审委意见要点提炼
+     */
     @TableField(value = "rb_decision_key")
     private String rbDecisionKey;
 
-    @TableField(value = "operate_mode")
-    private Integer operateMode;
+
 
 }

src/main/java/cn/cslg/pas/domain/business/EvidenceReason.java

@@ -22,14 +22,35 @@ public class EvidenceReason extends BaseEntity<EvidenceReason> {
     private String evidenceText;
     @TableField(value = "description")
     private String description;
-    @TableField(value = "present_options")
-    private String presentOptions;
-    @TableField(value = "rb_decision")
-    private String rbDecision;
-    @TableField(value = "rb_decision_key")
-    private String rbDecisionKey;
     @TableField(value = "create_id")
     private  String createId;
     @TableField(value = "create_time")
     private String createTime;
+
+    /**
+     * 陈述意见
+     */
+    @TableField(value = "present_opinions")
+    private String presentOpinions;
+
+
+    /**
+     * 是否有陈述意见
+     */
+    @TableField(value = "if_present_opinion1")
+    private Boolean ifPresentOpinions;
+
+
+    /**
+     * 复审委意见
+     */
+    @TableField(value = "rb_opinions")
+    private String rbOpinions;
+
+    /**
+     * 复审委意见要点提炼
+     */
+    @TableField(value = "rb_decision_key")
+    private String rbDecisionKey;
+
 }

src/main/java/cn/cslg/pas/domain/business/ProofGroup.java

@@ -26,34 +26,54 @@ public class ProofGroup extends BaseEntity<ProofGroup> {
     private String description;
 
     /**
-     * 无效理由详情
+     * 无效理由详情1
      */
-    @TableField(value = "invalid_reason_detail")
-    private String invalidReasonDetail;
+    @TableField(value = "invalid_reason_detail1")
+    private String invalidReasonDetail1;
 
     /**
-     * 无效理由概述
+     * 无效理由详情2
      */
-    @TableField(value = "common")
-    private String common;
+    @TableField(value = "invalid_reason_detail2")
+    private String invalidReasonDetail2;
+    /**
+     * 无效理由概述`1
+     */
+    @TableField(value = "common1")
+    private String common1;
 
     /**
+     * 无效理由概述2
+     */
+    @TableField(value = "common2")
+    private String common2;
+    /**
      * 陈述意见
      */
     @TableField(value = "present_opinions1")
     private String presentOpinions1;
 
+
     /**
      * 第二次陈述意见
      */
     @TableField(value = "present_opinions2")
     private String presentOpinions2;
-
     /**
-     * 复审委决定
+     * 是否有第一次陈述意见
+     */
+    @TableField(value = "if_present_opinion1")
+    private Boolean ifPresentOpinions1;
+    /**
+     * 是否有第二次陈述意见
+     */
+    @TableField(value = "if_present_opinion2")
+    private Boolean ifPresentOpinions2;
+    /**
+     * 复审委意见
      */
-    @TableField(value = "rb_decision")
-    private String rbDecision;
+    @TableField(value = "rb_opinions")
+    private String rbOpinions;
 
     /**
      * 复审委意见要点提炼

src/main/java/cn/cslg/pas/service/business/ProofGroupService.java

@@ -1,7 +1,12 @@
 package cn.cslg.pas.service.business;
 
+import cn.cslg.pas.common.dto.DomainFieldDTO;
 import cn.cslg.pas.common.dto.invalidDTO.AddProofGroupDTO;
+import cn.cslg.pas.common.dto.invalidDTO.GetProofGroupDTO;
+import cn.cslg.pas.common.dto.invalidDTO.UpdateMessageDTO;
+import cn.cslg.pas.common.utils.GenerateObjectUtil;
 import cn.cslg.pas.common.vo.invalidVO.ProofGroupVO;
+import cn.cslg.pas.domain.business.AssoGroupFeature;
 import cn.cslg.pas.domain.business.InvalidStatutes;
 import cn.cslg.pas.domain.business.ProofGroup;
 import cn.cslg.pas.exception.XiaoShiException;
@@ -9,6 +14,7 @@ import cn.cslg.pas.mapper.ProofGroupMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +25,7 @@ import java.util.stream.Collectors;
 
 /**
  * 无效证据Service
+ *
  * @Author xiexiang
  * @Date 2023/12/25
  */
@@ -30,10 +37,11 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
 
     /**
      * 添加or修改证据组合
+     *
      * @param addProofGroupDTO
      * @return
      */
-    public List<Integer> addProofGroup(AddProofGroupDTO addProofGroupDTO){
+    public List<Integer> addProofGroup(AddProofGroupDTO addProofGroupDTO) {
         List<Integer> proofGroupIds = new ArrayList<>();
         if (addProofGroupDTO != null) {
             Integer id = addProofGroupDTO.getId();
@@ -99,10 +107,11 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
 
     /**
      * 查询证据组合
+     *
      * @param invalidStatutesId
      * @return
      */
-    public List<ProofGroupVO> queryProofGroup(Integer invalidStatutesId){
+    public List<ProofGroupVO> queryProofGroup(Integer invalidStatutesId) {
         List<ProofGroupVO> proofGroupVOS = new ArrayList<>();
         if (invalidStatutesId == null) {
             throw new XiaoShiException("invalidStatutesId不能为空");
@@ -128,4 +137,57 @@ public class ProofGroupService extends ServiceImpl<ProofGroupMapper, ProofGroup>
         }
         return proofGroupVOS;
     }
+
+    /**
+     * 更新信息
+     *
+     * @param updateMessageDTO
+     * @return
+     */
+    public Boolean updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
+        Integer id = updateMessageDTO.getId();
+        List<DomainFieldDTO> domainFieldDTOS = updateMessageDTO.getFieldList();
+        ProofGroup proofGroup = this.getById(id);
+        if (proofGroup == null) {
+            throw new XiaoShiException("证据不存在");
+
+        }
+        if (domainFieldDTOS == null || domainFieldDTOS.size() == 0) {
+            throw new XiaoShiException("请输入值");
+        }
+        domainFieldDTOS.forEach(item -> {
+            try {
+                if (item.getValue() != null) {
+                    GenerateObjectUtil.setObjectProperty(proofGroup, item.getField(), item.getValue());
+                }
+            } catch (Exception e) {
+                throw new XiaoShiException("装载失败");
+            }
+        });
+        proofGroup.updateById();
+        return true;
+    }
+
+
+    /**
+     * 查询详情
+     *
+     * @param getProofGroupDTO
+     * @return
+     */
+    public ProofGroupVO queryProofGroupDetail(GetProofGroupDTO getProofGroupDTO) {
+        Integer proofId = getProofGroupDTO.getProofGroupId();
+        if (proofId == null) {
+            throw new XiaoShiException("请输入id");
+        }
+        ProofGroup proofGroup = this.getById(proofId);
+        if (proofGroup == null) {
+            throw new XiaoShiException("证据组合不存在");
+        }
+        ProofGroupVO proofGroupVO = new ProofGroupVO();
+        BeanUtils.copyProperties(proofGroup, proofGroupVO);
+
+        return proofGroupVO;
+
+    }
 }

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

@@ -1,20 +1,29 @@
 package cn.cslg.pas.service.business.invalidReport;
 
+import cn.cslg.pas.common.dto.DomainFieldDTO;
 import cn.cslg.pas.common.dto.QueryFeatureHistoryDTO;
 import cn.cslg.pas.common.dto.invalidDTO.QueryClaimSplitHistoryDTO;
 import cn.cslg.pas.common.dto.invalidDTO.RemoveGroupFeatureDTO;
 import cn.cslg.pas.common.dto.invalidDTO.UpdateGroupFeatureDTO;
+import cn.cslg.pas.common.dto.invalidDTO.UpdateMessageDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.utils.GenerateObjectUtil;
+import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.invalidVO.GroupFeatureHistoryVO;
 import cn.cslg.pas.domain.business.AssoGroupFeature;
+import cn.cslg.pas.domain.business.EvidenceReason;
 import cn.cslg.pas.domain.business.Feature;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.InvalidReport.AssoGroupFeatureMapper;
 import cn.cslg.pas.service.business.FeatureService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,6 +68,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         Integer featureId = updateGroupFeatureVO.getFeatureId();
         Boolean ifFirstEdit = updateGroupFeatureVO.getIfFirstEdit();
         String featureContent = updateGroupFeatureVO.getFeatureContent();
+        String common = updateGroupFeatureVO.getCommon();
         Integer featureGen = 1;
         if (ifFirstEdit != null && ifFirstEdit.equals(false)) {
             featureGen = 2;
@@ -97,6 +107,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
                     //设置世代
                     assoGroupFeature1.setFeatureGen(featureGen);
                     assoGroupFeature1.setOperateMode(0);
+                    assoGroupFeature1.setCommon(common);
                     assoGroupFeature1.insert();
                 }
                 //否则更新
@@ -110,6 +121,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
                     //设置世代
                     assoGroupFeature1.setFeatureGen(featureGen);
                     assoGroupFeature1.setOperateMode(0);
+                    assoGroupFeature1.setCommon(common);
                     assoGroupFeature1.updateById();
                 }
             }
@@ -301,14 +313,13 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         if (assoGroupFeatures == null || assoGroupFeatures.size() == 0) {
             return groupFeatureHistoryVOS;
         }
-        List<Integer> featureIds = assoGroupFeatures.stream().filter(item -> item.getFeatureId() != null).map(AssoGroupFeature::getFeatureId).collect(Collectors.toList());
+        List<Integer> featureIds = assoGroupFeatures.stream().map(AssoGroupFeature::getFeatureId).collect(Collectors.toList());
         //根据特征id查询特征
         List<Feature> features = new ArrayList<>();
         LambdaQueryWrapper<Feature> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(Feature::getId, featureIds);
         features = featureService.list(queryWrapper);
 
-
         for (AssoGroupFeature item : assoGroupFeatures) {
             Feature feature = features.stream().filter(i -> i.getId().equals(item.getFeatureId())).findFirst().orElse(null);
 
@@ -324,4 +335,34 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         }
         return groupFeatureHistoryVOS;
     }
+
+    /**
+     * 更新信息
+     *
+     * @param updateMessageDTO
+     * @return
+     */
+    public Boolean updateMessage(@RequestBody UpdateMessageDTO updateMessageDTO) {
+        Integer id = updateMessageDTO.getId();
+        List<DomainFieldDTO> domainFieldDTOS = updateMessageDTO.getFieldList();
+        AssoGroupFeature assoGroupFeature = this.getById(id);
+        if (assoGroupFeature == null) {
+            throw new XiaoShiException("证据不存在");
+
+        }
+        if (domainFieldDTOS == null || domainFieldDTOS.size() == 0) {
+            throw new XiaoShiException("请输入值");
+        }
+        domainFieldDTOS.forEach(item -> {
+            try {
+                if (item.getValue() != null) {
+                    GenerateObjectUtil.setObjectProperty(assoGroupFeature, item.getField(), item.getValue());
+                }
+            } catch (Exception e) {
+                throw new XiaoShiException("装载失败");
+            }
+        });
+        assoGroupFeature.updateById();
+        return true;
+    }
 }

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

@@ -1,18 +1,18 @@
 package cn.cslg.pas.service.business.invalidReport;
 
+import cn.cslg.pas.common.dto.DomainFieldDTO;
 import cn.cslg.pas.common.dto.QueryFeatureHistoryDTO;
-import cn.cslg.pas.common.dto.invalidDTO.AddEvidenceReasonDTO;
-import cn.cslg.pas.common.dto.invalidDTO.AddEvidenceReasonsDTO;
-import cn.cslg.pas.common.dto.invalidDTO.QueryEvidenceReasonDTO;
-import cn.cslg.pas.common.dto.invalidDTO.QueryInvalidHistoryDTO;
+import cn.cslg.pas.common.dto.invalidDTO.*;
 import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.GenerateObjectUtil;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.invalidVO.GroupFeatureHistoryVO;
 import cn.cslg.pas.common.vo.invalidVO.QueryEvidenceReasonVO;
 import cn.cslg.pas.common.vo.invalidVO.QueryInvalidHistoryVO;
 import cn.cslg.pas.domain.business.*;
+import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.InvalidReport.EvidenceReasonMapper;
 import cn.cslg.pas.service.business.CompareLiteratureService;
 import cn.cslg.pas.service.business.FeatureService;
@@ -54,119 +54,95 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
 
     @Transactional(rollbackFor = Exception.class)
     public Boolean addEvidenceReason(AddEvidenceReasonDTO addEvidenceReasonDTO) {
+
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO.setId("1");
         Integer groupId = addEvidenceReasonDTO.getGroupId();
+        Integer gen = addEvidenceReasonDTO.getGen();
         List<AddEvidenceReasonsDTO> addEvidenceReasonsDTOs = addEvidenceReasonDTO.getEvidenceReasonList();
-        // 遍历装载
+
         List<AddEvidenceReasonsDTO> addEvidenceReasonsDTOList = new ArrayList<>();
-        addEvidenceReasonsDTOs.forEach(item -> {
-            AddEvidenceReasonsDTO tem = addEvidenceReasonsDTOList.stream().filter(i -> i.getFeatureOrder().equals(item.getFeatureOrder())).findFirst().orElse(null);
-            if (tem == null) {
-                addEvidenceReasonsDTOList.add(item);
-            }
 
-        });
+        if (gen.equals(0)) {
+            // 遍历装载不同的特征
+            addEvidenceReasonsDTOs.forEach(item -> {
+                AddEvidenceReasonsDTO tem = addEvidenceReasonsDTOList.stream().filter(i -> i.getFeatureOrder().equals(item.getFeatureOrder())).findFirst().orElse(null);
+                if (tem == null) {
+                    addEvidenceReasonsDTOList.add(item);
+                }
 
-        //遍历插入无id特征
-        addEvidenceReasonsDTOList.forEach(item -> {
-            if (item.getFeatureId() == null) {
-                Feature feature = new Feature();
-                feature.setContent(item.getFeatureText());
-                feature.insert();
-                item.setFeatureId(feature.getId());
-            }
+            });
 
-        });
-        //获得所有的特征id
-        List<Integer> featureIds = addEvidenceReasonsDTOs.stream()
-                .filter(item -> item.getFeatureId() != null)
-                .map(AddEvidenceReasonsDTO::getFeatureId).collect(Collectors.toList());
-        this.deleteAssoByFeatureIds(featureIds, groupId);
+            //遍历插入无id特征
+            addEvidenceReasonsDTOList.forEach(item -> {
+                if (item.getFeatureId() == null) {
+                    Feature feature = new Feature();
+                    feature.setContent(item.getFeatureText());
+                    feature.insert();
+                    item.setFeatureId(feature.getId());
+                }
+            });
+
+        }
 
 
         for (AddEvidenceReasonsDTO addEvidenceReasonsDTO : addEvidenceReasonsDTOs) {
             //获得特征信息
             Integer featureId = addEvidenceReasonsDTO.getFeatureId();
             Integer featureOrder = addEvidenceReasonsDTO.getFeatureOrder();
-            //判断
-            AddEvidenceReasonsDTO tem = addEvidenceReasonsDTOList.stream()
-                    .filter(item -> addEvidenceReasonsDTO.getFeatureOrder().equals(item.getFeatureOrder())).findFirst().orElse(null);
-            if (tem == null) {
-                featureId = tem.getFeatureId();
-            }
-
+            Integer featureGroupId = addEvidenceReasonsDTO.getFeatureGroupId();
+            if(gen.equals(0)) {
+                //判断
+                AddEvidenceReasonsDTO tem = addEvidenceReasonsDTOList.stream()
+                        .filter(item -> addEvidenceReasonsDTO.getFeatureOrder().equals(item.getFeatureOrder())).findFirst().orElse(null);
+                if (tem == null) {
+                    featureId = tem.getFeatureId();
+                }
 
+                //当特征和证据组合关联id未存在时
+                if (featureGroupId == null) {
+                    AssoGroupFeature assoGroupFeature = new AssoGroupFeature();
+                    assoGroupFeature.setFeatureId(featureId);
+                    assoGroupFeature.setFeatureOrder(featureOrder);
+                    assoGroupFeature.setGroupId(groupId);
+                    assoGroupFeature.setFeatureGen(0);
+                    assoGroupFeature.insert();
+                    featureGroupId = assoGroupFeature.getId();
+                }
+            }
             //添加无效理由
             Integer reasonId = this.addEvidenceReason(addEvidenceReasonsDTO, personnelVO.getId());
-            //添加无效理由和特征关联
+            //根据特征证据组合关联id 删除和无效理由关联
+            LambdaQueryWrapper<AssoFeatureReason> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoFeatureReason::getGFeatureId, featureGroupId)
+                    .eq(AssoFeatureReason::getGen, gen);
+            assoFeatureReasonService.remove(queryWrapper);
+            //添加特征和证据组合关联
             AssoFeatureReason assoFeatureReason = new AssoFeatureReason();
             assoFeatureReason.setReasonId(reasonId);
-            assoFeatureReason.setFeatureId(featureId);
+            assoFeatureReason.setGFeatureId(featureGroupId);
+            assoFeatureReason.setGen(gen);
             assoFeatureReason.insert();
-
-            //添加特征和证据组合关联
-            AssoGroupFeature assoGroupFeature = new AssoGroupFeature();
-            assoGroupFeature.setFeatureId(featureId);
-            assoGroupFeature.setFeatureOrder(featureOrder);
-            assoGroupFeature.setGroupId(groupId);
-            assoGroupFeature.insert();
         }
         return true;
 
     }
 
 
-    public Boolean deleteAssoByFeatureIds(List<Integer> featureIds, Integer groupId) {
-        //根据groupId 删除特征和group关联
-        LambdaQueryWrapper<AssoGroupFeature> assoWrapper = new LambdaQueryWrapper<>();
-        assoWrapper.eq(AssoGroupFeature::getGroupId, groupId);
-        List<AssoGroupFeature> assoGroupFeatures = assoGroupFeatureService.list(assoWrapper);
-        List<Integer> inFeatureIds = assoGroupFeatures.stream().map(AssoGroupFeature::getFeatureId).collect(Collectors.toList());
-
-        if (inFeatureIds != null && inFeatureIds.size() > 0) {
-
-            //根据特征id 查询无效理由
-            LambdaQueryWrapper<AssoFeatureReason> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(AssoFeatureReason::getFeatureId, inFeatureIds);
-
-            List<AssoFeatureReason> assoFeatureReasons = assoFeatureReasonService.list(queryWrapper);
-            //获得无效理由id
-            if (assoFeatureReasons.size() > 0) {
-                //删除无效理由和证据文献关联
-                List<Integer> reasonIds = assoFeatureReasons.stream().map(AssoFeatureReason::getReasonId).collect(Collectors.toList());
-                //根据无效理由id删除和证据文献关联
-                LambdaQueryWrapper<AssoReasonLiterature> queryWrapper1 = new LambdaQueryWrapper<>();
-                queryWrapper1.in(AssoReasonLiterature::getReasonId, reasonIds);
-                assoReasonLiteratureService.remove(queryWrapper1);
-
-                //删除无效理由和特征关联
-                assoFeatureReasonService.remove(queryWrapper);
-
-                this.removeBatchByIds(reasonIds);
-
-            }
-
-            //删除证据组合和特征关联
-            LambdaQueryWrapper<AssoGroupFeature> queryWrapper3 = new LambdaQueryWrapper<>();
-            queryWrapper3.eq(AssoGroupFeature::getGroupId, groupId);
-            assoGroupFeatureService.remove(queryWrapper3);
-
-        }
-
-
-        return true;
-
-    }
-
     private Integer addEvidenceReason(AddEvidenceReasonsDTO addEvidenceReasonsDTO, String createId) {
+        Integer id = addEvidenceReasonsDTO.getEvidenceReasonId();
         //添加无效理由
-        EvidenceReason evidenceReason = new EvidenceReason();
-        evidenceReason.setEvidenceText(addEvidenceReasonsDTO.getEvidenceText());
-        evidenceReason.setCreateId(createId);
-        evidenceReason.setDescription(addEvidenceReasonsDTO.getEvidenceDescription());
-        evidenceReason.insert();
-        Integer id = evidenceReason.getId();
+        if (id == null) {
+            EvidenceReason evidenceReason = new EvidenceReason();
+            evidenceReason.setEvidenceText(addEvidenceReasonsDTO.getEvidenceText());
+            evidenceReason.setCreateId(createId);
+            evidenceReason.setDescription(addEvidenceReasonsDTO.getEvidenceDescription());
+            evidenceReason.insert();
+        } else {
+            EvidenceReason evidenceReason = this.getById(id);
+            evidenceReason.setEvidenceText(addEvidenceReasonsDTO.getEvidenceText());
+            evidenceReason.setDescription(addEvidenceReasonsDTO.getEvidenceDescription());
+        }
         //添加无效理由和证据关联
         this.addAssoReasonLiterature(addEvidenceReasonsDTO.getLiteratureId(), id);
         return id;
@@ -177,6 +153,10 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         if (literatureIds == null || literatureIds.size() == 0) {
             return;
         }
+        LambdaQueryWrapper<AssoReasonLiterature> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(AssoReasonLiterature::getReasonId, reasonId);
+        assoReasonLiteratureService.remove(queryWrapper1);
+
         literatureIds.forEach(item -> {
             AssoReasonLiterature assoReasonLiterature = new AssoReasonLiterature();
             assoReasonLiterature.setLiteratureId(item);
@@ -191,11 +171,11 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
     //查询无效理由
     public List<QueryEvidenceReasonVO> queryEvidenceReason(@RequestBody QueryEvidenceReasonDTO queryEvidenceReasonDTO) {
         Integer groupId = queryEvidenceReasonDTO.getGroupId();
+        Integer gen = queryEvidenceReasonDTO.getGen();
         //根据证据组合id 查询特征
-        LambdaQueryWrapper<AssoGroupFeature> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoGroupFeature::getGroupId, groupId);
-        queryWrapper.eq(AssoGroupFeature::getFeatureGen, 0);
-        List<AssoGroupFeature> assoGroupFeatures = assoGroupFeatureService.list(queryWrapper);
+
+        List<AssoGroupFeature> assoGroupFeatures = assoGroupFeatureService.getBaseMapper().selectLastGroupFeature(groupId, null, gen);
+
         List<QueryEvidenceReasonVO> queryEvidenceReasonVOS = new ArrayList<>();
         if (assoGroupFeatures != null && assoGroupFeatures.size() != 0) {
             assoGroupFeatures.forEach(item -> {
@@ -212,7 +192,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
 
                 //根据特征id 查询无效理由
                 LambdaQueryWrapper<AssoFeatureReason> queryWrapper1 = new LambdaQueryWrapper<>();
-                queryWrapper1.eq(AssoFeatureReason::getFeatureId, featureId);
+                queryWrapper1.eq(AssoFeatureReason::getGFeatureId, featureId);
                 List<AssoFeatureReason> assoFeatureReasons = assoFeatureReasonService.list(queryWrapper1);
 
                 if (assoFeatureReasons.size() != 0) {
@@ -277,7 +257,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         Long size = queryInvalidHistoryDTO.getSize();
         //根据featureId 查询无效理由
         LambdaQueryWrapper<AssoFeatureReason> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoFeatureReason::getFeatureId, featureId);
+        queryWrapper.eq(AssoFeatureReason::getGFeatureId, featureId);
         Page<AssoFeatureReason> page = assoFeatureReasonService.page(new Page<>(current, size), queryWrapper);
         Long total = page.getTotal();
         List<AssoFeatureReason> assoFeatureReasons = page.getRecords();
@@ -329,4 +309,30 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         return records;
 
     }
+
+    //更新信息
+    public Boolean updateMessage(UpdateMessageDTO updateMessageDTO) {
+        Integer id = updateMessageDTO.getId();
+        List<DomainFieldDTO> domainFieldDTOS = updateMessageDTO.getFieldList();
+        EvidenceReason evidenceReason = this.getById(id);
+        if (evidenceReason == null) {
+            throw new XiaoShiException("证据不存在");
+
+        }
+        if (domainFieldDTOS == null || domainFieldDTOS.size() == 0) {
+            throw new XiaoShiException("请输入值");
+        }
+        domainFieldDTOS.forEach(item -> {
+            try {
+                if (item.getValue() != null) {
+                    GenerateObjectUtil.setObjectProperty(evidenceReason, item.getField(), item.getValue());
+                }
+            } catch (Exception e) {
+                throw new XiaoShiException("装载失败");
+            }
+        });
+        evidenceReason.updateById();
+        return true;
+
+    }
 }

src/main/resources/mapper/AssoGroupFeatureMapper.xml

@@ -4,11 +4,17 @@
     <select id="selectLastGroupFeature" resultType="cn.cslg.pas.domain.business.AssoGroupFeature">
         select *
         from (select *
-              from asso_group_feature f
-              where f.group_id = #{groupId}
+        from asso_group_feature f
+        <where>
+            f.group_id = #{groupId}
+            <if test="order!=null">
                 and feature_order &gt; #{order}
-                and feature_gen &lt;= #{gen}
-              order by feature_gen desc limit 9999) a
+            </if>
+
+            and feature_gen &lt;= #{gen}
+        </where>
+
+        order by feature_gen desc limit 9999) a
         group by a.group_id, a.feature_pre_id
     </select>
 

src/test/java/cn/cslg/pas/service/AvoidDesignServiceTests.java

@@ -38,13 +38,13 @@ public class AvoidDesignServiceTests {
     @Test
     public void testUpdate() {
         List<DomainFieldDTO> domainFieldDTOs = new ArrayList<>();
-        DomainFieldDTO domainFieldDTO = new DomainFieldDTO();
-        domainFieldDTO.setField("description");
-        domainFieldDTO.setValue("1234");
-        domainFieldDTOs.add(domainFieldDTO);
+
         try {
             FollowUp followUp =new FollowUp();
-            GenerateObjectUtil.setObjectProperty(followUp,"description","1234");
+            DomainFieldDTO domainFieldDTO = new DomainFieldDTO();
+            domainFieldDTO.setField("description");
+            domainFieldDTO.setValue("1234");
+            GenerateObjectUtil.setObjectProperty(followUp,domainFieldDTO.getField(),domainFieldDTO.getValue());
             System.out.println(followUp);
         } catch (Exception e) {
             System.out.println(e);