增加已办的字段显示

yangys

2025-08-10 79175184a6b131cef9a318ffd34529f10373c331

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java

@@ -103,9 +103,10 @@
               //目录，才是程序包，
               //查询数据库，对应上才能确认时有效的程序包
               String packageName = StringUtils.removeEnd(entryName,"/");
               NcNode programPackageNode = ncNodeService.getLastEditionProgramPackage(packageName);
               //List<NcNode> pkgList = ncNodeService.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getName, packageName).eq(NcNode::getIsLastEdition,1).list();
               //if(!pkgList.isEmpty()) {
               NcNode programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
               NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(packageName);

               if(programPackageNode!=null && curedProgramPkg != null) {//无固化程序，才放入列表
                  //NcNode programPackageNode = pkgList.get(0);
                  progData.setId(programPackageNode.getId());
                  progData.setProgramName(packageName);
@@ -113,7 +114,8 @@
                  progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
                  progData.setProgramNo(programPackageNode.getProgramNo());
                  list.add(progData);
               //}
               }

            }
         }

@@ -180,7 +182,11 @@
         for(String dir : dirList){
            String programPackageName = StringUtils.removeEnd(dir,"/");

            NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
            NcNode oriProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
            NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
            if(curedProgramPkg != null){
               throw new ServiceException(programPackageName+"已经固化，请勿重复入库。");
            }
            if(oriProgramPkg == null){
               log.warn("文件夹未发现匹配的程序包名{}",dir);
               continue;
@@ -191,6 +197,11 @@
            if(active){
               throw new ServiceException(programPackageName+"正在审批中，请勿重复入库。");
            }
            /*
            if(oriProgramPkg.hasCured()){
               throw new ServiceException(programPackageName+"已经固化，请勿重复入库。");
            }*/

            if(!programPackageIdList.contains(oriProgramPkg.getId())){
               //不在勾选的范围内
               log.info("{}不在勾选范围内",programPackageName);