隐藏的表单不显示日期提示符号

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1816,6 +1816,47 @@ public class ExcelTabController extends BladeController {
         excelTabService.getBussPdfInfo(pkeyId);
         //重新生成PDF修改queryInfo
         excelTabService.getBussPdfs(nodeId, classify, wbsTreeContract.getContractId(), wbsTreeContract.getProjectId());
+
+        //如果操作的的是没填写日期的表单
+        if(wbsTreeContract.getDateIsComplete()!=null&&wbsTreeContract.getDateIsComplete()==2){
+            List<WbsTreeContract> wbsTreeContracts = wbsTreeContractService.getBaseMapper().selectList(new LambdaQueryWrapper<>(WbsTreeContract.class).eq(WbsTreeContract::getPId, wbsTreeContract.getPId()).ne(WbsTreeContract::getPKeyId,wbsTreeContract.getPKeyId()));
+            if(!wbsTreeContracts.isEmpty()){
+                List<WbsTreeContract> list = wbsTreeContracts.stream().filter(w -> Objects.equals(2, w.getDateIsComplete())).collect(Collectors.toList());
+                //除了操作的表单外 不存在没填的日期
+                if(list.isEmpty()){
+                    //放开隐藏 设置祖级节点为2
+                    if(status==1){
+                        String ancestorsPId = wbsTreeContract.getAncestorsPId();
+                        if (ancestorsPId.startsWith("0,")) {
+                            ancestorsPId = ancestorsPId.substring(2);
+                        }
+                        ancestorsPId=ancestorsPId+","+wbsTreeContract.getPKeyId();
+                        List<Long> longList = Arrays.stream(ancestorsPId.split(","))
+                                .map(Long::valueOf)
+                                .collect(Collectors.toList());
+                        UpdateWrapper<WbsTreeContract> updateWrapper1 = new UpdateWrapper<>();
+                        updateWrapper1.in("p_key_id", longList);
+                        updateWrapper1.set("date_is_complete",2);
+                        wbsTreeContractService.update(updateWrapper1);
+                    //隐藏表单  设置祖级节点为1
+                    }if(status==2){
+                        String ancestorsPId = wbsTreeContract.getAncestorsPId();
+                        if (ancestorsPId.startsWith("0,")) {
+                            ancestorsPId = ancestorsPId.substring(2);
+                        }
+                        ancestorsPId=ancestorsPId+","+wbsTreeContract.getPKeyId();
+                        List<Long> longList = Arrays.stream(ancestorsPId.split(","))
+                                .map(Long::valueOf)
+                                .collect(Collectors.toList());
+                        UpdateWrapper<WbsTreeContract> updateWrapper1 = new UpdateWrapper<>();
+                        updateWrapper1.in("p_key_id", longList);
+                        updateWrapper1.set("date_is_complete",1);
+                        wbsTreeContractService.update(updateWrapper1);
+                    }
+                }
+            }
+
+        }
         return R.data("成功");
     }
 

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

@@ -2511,25 +2511,27 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         List<WbsTreeContract> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
         if(!query.isEmpty()){
             WbsTreeContract contract = query.get(0);
-            contract.setDateIsComplete(dateFlag?1:2);
-            String ancestorsPId = contract.getAncestorsPId();
-            if (ancestorsPId.startsWith("0,")) {
-                ancestorsPId = ancestorsPId.substring(2);
-            }
-            ancestorsPId=ancestorsPId+","+contract.getPKeyId();
-            List<Long> longList = Arrays.stream(ancestorsPId.split(","))
-                    .map(Long::valueOf)
-                    .collect(Collectors.toList());
-            UpdateWrapper<WbsTreeContract> updateWrapper1 = new UpdateWrapper<>();
-            updateWrapper1.in("p_key_id", longList);
-            updateWrapper1.set("date_is_complete",contract.getDateIsComplete());
-            wbsTreeContractService.update(updateWrapper1);
-            if(StringUtils.isNotEmpty(firstDate)){
-                Integer classify =
-                        Arrays.asList("1", "2", "3").contains(contract.getTableOwner()) ? 1 :
-                                Arrays.asList("4", "5", "6").contains(contract.getTableOwner()) ? 2 : 1;
-                String updateQuery="update u_information_query set business_time= '"+firstDate+"' where wbs_id="+contract.getPKeyId()+" and classify="+classify;
-                jdbcTemplate.update(updateQuery);
+            if(contract.getIsBussShow()!=2&&contract.getIsDeleted()==0){
+                contract.setDateIsComplete(dateFlag?1:2);
+                String ancestorsPId = contract.getAncestorsPId();
+                if (ancestorsPId.startsWith("0,")) {
+                    ancestorsPId = ancestorsPId.substring(2);
+                }
+                ancestorsPId=ancestorsPId+","+contract.getPKeyId();
+                List<Long> longList = Arrays.stream(ancestorsPId.split(","))
+                        .map(Long::valueOf)
+                        .collect(Collectors.toList());
+                UpdateWrapper<WbsTreeContract> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.in("p_key_id", longList);
+                updateWrapper1.set("date_is_complete",contract.getDateIsComplete());
+                wbsTreeContractService.update(updateWrapper1);
+                if(StringUtils.isNotEmpty(firstDate)){
+                    Integer classify =
+                            Arrays.asList("1", "2", "3").contains(contract.getTableOwner()) ? 1 :
+                                    Arrays.asList("4", "5", "6").contains(contract.getTableOwner()) ? 2 : 1;
+                    String updateQuery="update u_information_query set business_time= '"+firstDate+"' where wbs_id="+contract.getPKeyId()+" and classify="+classify;
+                    jdbcTemplate.update(updateQuery);
+                }
             }
         }
 
@@ -4976,12 +4978,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
         chart(reData, wbsTreePrivate);
         if(ObjectUtil.isNotEmpty(jsonObject)){
-//            if(isCancel){
-//                if(isCancelList.size()>0){
-//                    List<String> finalIsCancelList = isCancelList;
-//                    jsonObject.entrySet().removeIf(entry -> finalIsCancelList.contains(entry.getKey()));
-//                }
-//            }
+            if(isCancel){
+                if(isCancelList.size()>0){
+                    List<String> finalIsCancelList = isCancelList;
+                    jsonObject.entrySet().removeIf(entry -> finalIsCancelList.contains(entry.getKey()));
+                }
+            }
             for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
                 if(entry.getKey().contains("key")){
                     if(!reData.containsKey(entry.getKey())){