修复添加特征bug

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

@@ -5,7 +5,9 @@ import cn.cslg.pas.common.dto.QueryFeatureHistoryDTO;
 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.utils.Response;
 import cn.cslg.pas.common.vo.PatentRightVo;
 import cn.cslg.pas.common.vo.business.SplitVO;
@@ -46,6 +48,10 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
     private InvalidStatutesService invalidStatutesService;
     @Autowired
     private ProofGroupService proofGroupService;
+    @Autowired
+    private CacheUtils cacheUtils;
+    @Autowired
+    private LoginUtils loginUtils;
 
     //根据证据组合id查询特征id
     public List<Integer> getFeatureIdsByGroupId(Integer groupId) {
@@ -147,9 +153,9 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         Integer featureId = removeGroupFeatureDTO.getFeatureId();
 
         //根据特征id 查询世代及排序
-        LambdaQueryWrapper<AssoGroupFeature> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoGroupFeature::getFeatureId,featureId);
-        AssoGroupFeature assoGroupFeature =this.getOne(queryWrapper,false);
+        LambdaQueryWrapper<AssoGroupFeature> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoGroupFeature::getFeatureId, featureId);
+        AssoGroupFeature assoGroupFeature = this.getOne(queryWrapper, false);
         Integer featureOrder = assoGroupFeature.getFeatureOrder();
 
         Boolean ifFirstEdit = removeGroupFeatureDTO.getIfFirstEdit();
@@ -160,26 +166,26 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
 
 
         //根据特征id查询证据组合和特征关联
-                Integer genFeatureId = removeGroupFeatureDTO.getFeatureId();
-                Integer genGroupId = assoGroupFeature.getGroupId();
-                AssoGroupFeature assoGroupFeature1 = this.getGenGroupFeature(genGroupId, genFeatureId, featureGen);
-                if (assoGroupFeature1 == null) {
-                    assoGroupFeature1 = new AssoGroupFeature();
-                    assoGroupFeature1.setGroupId(genGroupId);
-                    assoGroupFeature1.setFeatureGen(featureGen);
-                    assoGroupFeature1.setOperateMode(1);
-                    assoGroupFeature1.setFeaturePreId(genFeatureId);
-                    assoGroupFeature1.setFeatureOrder(featureOrder);
-                    assoGroupFeature1.insert();
-                } else {
-                    assoGroupFeature1.setGroupId(genGroupId);
-                    assoGroupFeature1.setFeatureGen(featureGen);
-                    assoGroupFeature1.setOperateMode(1);
-                    assoGroupFeature1.setFeaturePreId(genFeatureId);
-                    featureOrder=assoGroupFeature1.getFeatureOrder();
-                    assoGroupFeature1.updateById();
-                }
-                this.updateGroupFeatureOrder(genGroupId, featureOrder, featureGen);
+        Integer genFeatureId = removeGroupFeatureDTO.getFeatureId();
+        Integer genGroupId = assoGroupFeature.getGroupId();
+        AssoGroupFeature assoGroupFeature1 = this.getGenGroupFeature(genGroupId, genFeatureId, featureGen);
+        if (assoGroupFeature1 == null) {
+            assoGroupFeature1 = new AssoGroupFeature();
+            assoGroupFeature1.setGroupId(genGroupId);
+            assoGroupFeature1.setFeatureGen(featureGen);
+            assoGroupFeature1.setOperateMode(1);
+            assoGroupFeature1.setFeaturePreId(genFeatureId);
+            assoGroupFeature1.setFeatureOrder(featureOrder);
+            assoGroupFeature1.insert();
+        } else {
+            assoGroupFeature1.setGroupId(genGroupId);
+            assoGroupFeature1.setFeatureGen(featureGen);
+            assoGroupFeature1.setOperateMode(1);
+            assoGroupFeature1.setFeaturePreId(genFeatureId);
+            featureOrder = assoGroupFeature1.getFeatureOrder();
+            assoGroupFeature1.updateById();
+        }
+        this.updateGroupFeatureOrder(genGroupId, featureOrder, featureGen);
 
         return true;
     }
@@ -406,8 +412,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
     @Transactional(rollbackFor = Exception.class)
     public Boolean addFeatureGroupBatch(AddFeatureGroupBatchDTO addFeatureGroupBatchDTO) {
 
-        PersonnelVO personnelVO = new PersonnelVO();
-        personnelVO.setId("1");
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
 
         Integer claimId = addFeatureGroupBatchDTO.getClaimId();
         Integer gen = addFeatureGroupBatchDTO.getGen();
@@ -421,7 +426,8 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
         Integer featureId = feature.getId();
         //根据权要id 查询 无效法条
         LambdaQueryWrapper<InvalidStatutes> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(InvalidStatutes::getClaimId, claimId);
+        queryWrapper.eq(InvalidStatutes::getClaimId, claimId)
+                .and(wrapper->wrapper.eq(InvalidStatutes::getStatutesId, 2).or().eq(InvalidStatutes::getStatutesId,3));
         List<InvalidStatutes> invalidStatutes = invalidStatutesService.list(queryWrapper);
         if (invalidStatutes != null && invalidStatutes.size() != 0) {
             List<Integer> statutesIds = invalidStatutes.stream().map(InvalidStatutes::getId).collect(Collectors.toList());
@@ -447,6 +453,7 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
                         assoGroupFeature.setFeatureGen(gen);
                         assoGroupFeature.setFeatureOrder(order);
                         assoGroupFeature.setCommon(common);
+                        assoGroupFeature.setOperateMode(2);
                         assoGroupFeature.insert();
                     }
                 }