Revert "质检-自动获取数据"

This reverts commit 9c54b87faaffb5084882d4c6e00a579f84d66afb.

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -138,7 +138,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     private final IExctabCellService exctabCellService;
     private final WbsTreeContractOldHtmlService wbsTreeContractOldHtmlService;
 
-    private final IParameterElementService parameterElementService;
 
     @Autowired
     StringRedisTemplate RedisTemplate;
@@ -1132,13 +1131,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     public void setAutomatic(Long pkeyId, String nodeId, Document doc) {
         //自动获取数据查询
         try {
-            WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(new QueryWrapper<WbsTreeContract>().eq("p_key_id", pkeyId));
-            List<ParameterElement> nodeBaseInfo = parameterElementService.list(Wrappers.<ParameterElement>lambdaQuery().eq(ParameterElement::getProjectId, wbsTreeContract.getProjectId())
-                    .eq(ParameterElement::getContractId, wbsTreeContract.getContractId()).eq(ParameterElement::getType, 3)
-                    .eq(ParameterElement::getNodeId, wbsTreeContract.getCopyPkId()));
-
-            nodeBaseInfo.forEach(key -> {
-                Elements select = doc.select("table").first().select("[keyname=" + key.getElementName() + "]");
+            Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, Long.valueOf(nodeId));
+            nodeBaseInfo.keySet().forEach(key -> {
+                Elements select = doc.select("table").first().select("[keyname=" + key + "]");
                 select.stream().filter(Objects::nonNull).forEach(element -> element.attr("clearAutomatic", "1"));
             });
         } catch (Exception e) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/NodeBaseInfoServiceImpl.java

@@ -491,12 +491,9 @@ public class NodeBaseInfoServiceImpl extends BaseServiceImpl<NodeBaseInfoMapper,
         ParameterElement element = parameterElementService.getOne(Wrappers.<ParameterElement>lambdaQuery().eq(ParameterElement::getProjectId, wbsTreeContract.getProjectId())
                 .eq(ParameterElement::getContractId, wbsTreeContract.getContractId()).eq(ParameterElement::getType, 3)
                 .eq(ParameterElement::getElementName, paramName).eq(ParameterElement::getNodeId, wbsTreeContract.getCopyPkId()));
-        if(element != null){
-            //软删除
-            return parameterElementService.update(Wrappers.<ParameterElement>update().lambda()
-                    .set(ParameterElement::getIsDeleted, 1)
-                    .eq(ParameterElement::getId, element.getId()));
-        }
-        return true;
+        //软删除
+        return parameterElementService.update(Wrappers.<ParameterElement>update().lambda()
+                .set(ParameterElement::getIsDeleted, 1)
+                .eq(ParameterElement::getId, element.getId()));
     }
 }