试车检查报告逻辑调整

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -225,22 +225,23 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             treeList.forEach(tree -> {
                     ZhcxCommissionCheckDetailTreeDo target = new ZhcxCommissionCheckDetailTreeDo();
                     BeanUtils.copyProperties(tree, target);
-                    target.setId(tree.getId()+"_"+machineno);
+                    target.setId(tree.getId()+"_"+check.getProjectcode()+machineno);
                     target.setRemark(tree.getId());
                     target.setBaseinfoid(newCheckId);
                     if(!target.getPid().equals("-1")){
-                        target.setPid(target.getPid()+"_"+machineno);
+                        target.setPid(target.getPid()+"_"+check.getProjectcode()+machineno);
                     }
                 // 判断是否为伪删状态
-                /*if (!checkDTO.getTreeNode().isEmpty()) {
+                if (!checkDTO.getTreeNode().isEmpty()) {
                     List<String> treeNode = checkDTO.getTreeNode();
                     if (treeNode.contains(tree.getId())) {
                         target.setDeleted("0");
-                    }else {
-                        target.setDeleted("1");
+                        targetList.add(target);
                     }
-                }*/
-                targetList.add(target);
+                    //else {target.setDeleted("1");}
+                }else {
+                    targetList.add(target);
+                }
             });
         }