质检必填项区分质检监理

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractLazyVO.java

@@ -144,4 +144,22 @@ public class WbsTreeContractLazyVO implements Serializable {
 
     @ApiModelProperty(value = "是否收藏")
     private Integer isCollect;
+
+    public void updateDateIsComplete(String tableOwner){
+        if (this.getDateIsComplete() != null && this.getDateIsComplete() > 1 && tableOwner != null) {
+            if (tableOwner.contains("1")) {
+                if (this.getDateIsComplete() == 2 || this.getDateIsComplete() == 4) {
+                    this.setDateIsComplete(2);
+                } else {
+                    this.setDateIsComplete(1);
+                }
+            } else if (tableOwner.contains("2")) {
+                if (this.getDateIsComplete() == 3 || this.getDateIsComplete() == 4) {
+                    this.setDateIsComplete(2);
+                } else {
+                    this.setDateIsComplete(1);
+                }
+            }
+        }
+    }
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractTreeAllVO.java

@@ -74,4 +74,22 @@ public class WbsTreeContractTreeAllVO implements INode<WbsTreeContractTreeAllVO>
     public Boolean getHasChildren() {
         return hasChildren;
     }
+
+    public void updateDateIsComplete(String tableOwner){
+        if (this.getDateIsComplete() != null && this.getDateIsComplete() > 1 && tableOwner != null) {
+            if (tableOwner.contains("1")) {
+                if (this.getDateIsComplete() == 2 || this.getDateIsComplete() == 4) {
+                    this.setDateIsComplete(2);
+                } else {
+                    this.setDateIsComplete(1);
+                }
+            } else if (tableOwner.contains("2")) {
+                if (this.getDateIsComplete() == 3 || this.getDateIsComplete() == 4) {
+                    this.setDateIsComplete(2);
+                } else {
+                    this.setDateIsComplete(1);
+                }
+            }
+        }
+    }
 }

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

@@ -556,6 +556,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                                             } else {
                                                 vo.setIsCollect(0);
                                             }
+                                            vo.updateDateIsComplete(tableOwner);
                                         }
                                         return vo;
                                     }).collect(Collectors.toList());
@@ -731,6 +732,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
                                                 } else {
                                                     vo.setIsCollect(0);
                                                 }
+                                                vo.updateDateIsComplete(tableOwner);
                                             }
                                             return vo;
                                         }).collect(Collectors.toList());

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

@@ -3583,7 +3583,23 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
             updateWrapper.in("p_key_id", longList);
             if (b) {
-                updateWrapper.set("date_is_complete", 2);
+                List<Integer> collect = list.stream().filter(item -> item.getDateIsComplete() != null && item.getDateIsComplete() > 1 && (item.getStatus() == null || item.getStatus() == 1)).map(item -> {
+                    String tableOwner = item.getTableOwner();
+                    if (tableOwner != null && (tableOwner.contains("1") || tableOwner.contains("2") || tableOwner.contains("3"))) {
+                        return 1;
+                    }
+                    if (tableOwner != null && (tableOwner.contains("4") || tableOwner.contains("5") || tableOwner.contains("6"))) {
+                        return 2;
+                    }
+                    return 0;
+                }).collect(Collectors.toList());
+                if (collect.contains(1) && collect.contains(2)) {
+                    updateWrapper.set("date_is_complete", 4);
+                } else if (collect.contains(2)) {
+                    updateWrapper.set("date_is_complete", 3);
+                } else {
+                    updateWrapper.set("date_is_complete", 2);
+                }
             } else {
                 updateWrapper.set("date_is_complete", 1);
             }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -944,24 +944,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                                 } else {
                                     lazyNodeVO.setIsCollect(0);
                                 }
-//                                lazyNodeVO.setSubmitCounts(cn.hutool.core.util.ObjectUtil.isNotEmpty(countMap.get(lazyNodeVO.getPKeyId())) ? countMap.get(lazyNodeVO.getPKeyId()) : (cn.hutool.core.util.ObjectUtil.isNotEmpty(queryInfoMaps.get(lazyNodeVO.getPKeyId())) ? 1 : 0));
-
-//                                if (lazyNodeVO.getSubmitCounts().equals(0)) {
-//                                    lazyNodeVO.setColorStatus(1);
-//                                    continue;
-//                                }
-//
-//                                Integer parentColorStatus = nodeColorStatusMap.get(lazyNodeVO.getPKeyId());
-//                                if (parentColorStatus != null) {
-//                                    lazyNodeVO.setColorStatus(parentColorStatus);
-//                                } else {
-//                                    WbsTreeContractLazyVO lowestNode = lowestNodesMap.get(lazyNodeVO.getPKeyId());
-//                                    if (lowestNode != null) {
-//                                        lazyNodeVO.setColorStatus(lowestNode.getColorStatus());
-//                                    }
-//                                }
-
-//                            }
+                            lazyNodeVO.updateDateIsComplete(tableOwner);
                         }
                         if(CollectionUtil.isNotEmpty(ids)){
                             lazyNodes.forEach(f -> f.setIsSync(ids.contains(f.getPKeyId().toString()) ? 1 : 0));
@@ -1090,23 +1073,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                                         } else {
                                             lazyNodeVO.setIsCollect(0);
                                         }
-//                                        lazyNodeVO.setSubmitCounts(cn.hutool.core.util.ObjectUtil.isNotEmpty(countMap.get(lazyNodeVO.getPKeyId())) ? countMap.get(lazyNodeVO.getPKeyId()) : (cn.hutool.core.util.ObjectUtil.isNotEmpty(queryInfoMaps.get(lazyNodeVO.getPKeyId())) ? 1 : 0));
-//                                        if (lazyNodeVO.getSubmitCounts().equals(0)) {
-//                                            lazyNodeVO.setColorStatus(1);
-//                                            continue;
-//                                        }
-//
-//                                        Integer parentColorStatus = nodeColorStatusMap.get(lazyNodeVO.getPKeyId());
-//                                        if (parentColorStatus != null) {
-//                                            lazyNodeVO.setColorStatus(parentColorStatus);
-//                                        } else {
-//                                            WbsTreeContractLazyVO lowestNode = lowestNodesMap.get(lazyNodeVO.getPKeyId());
-//                                            if (lowestNode != null) {
-//                                                lazyNodeVO.setColorStatus(lowestNode.getColorStatus());
-//                                            }
-//                                        }
-
-//                                    }
+                                        lazyNodeVO.updateDateIsComplete(tableOwner);
                                 }
                                 lazyNodesAll.addAll(lazyNodes);
                             }