标准申请bug修改

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java

@@ -844,7 +844,7 @@
     */
    @GetMapping("/exportGroupCodeExcel")
    @VciBusinessLog(operateName = "导出集团码")
    public R exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response){
    public void exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response) throws IOException {
        try {
            String excelName = mdmIOService.exportGroupCodeExcel(codeClassifyOid);
            ControllerUtil.writeFileToResponse(response,excelName);
@@ -855,17 +855,11 @@
                msg = "未知错误";
            }
            String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "错误.txt";
            LocalFileUtil.writeContentToFile(LangBaseUtil.getErrorMsg(e),errorFile);
            try {
                ControllerUtil.writeFileToResponse(response,errorFile);
            } catch (IOException ex) {
                ex.printStackTrace();
            }
            String uuid=ControllerUtil.putErrorFile(errorFile);
            return R.fail(msg);
        //    ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
            LocalFileUtil.writeContentToFile(msg,errorFile);
            ControllerUtil.writeFileToResponse(response,errorFile);
        //    return R.fail(msg);
        }
        return R.status(true);
    //    return R.status(true);
    }

    /***

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java

@@ -1191,10 +1191,12 @@
            switchSecValueBZ(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
            //分段存储流水依赖
            if(secVO.getSecType().equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())){
                int finalI = i;
                final int[] index = {0};
                List<String> newSerialUnitList= serialUnitList.stream().filter(secValueStr -> {
                    return  !secValueStr.equals("${"+secVO.getOid()+"}");
                    return index[0]++< finalI;//除去流水的
                }).collect(Collectors.toList());
                String serialUnitString = serialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : newSerialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
                String serialUnitString = newSerialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : newSerialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
                secOdserialUnitMap.put(secVO.getOid(),serialUnitString);
            }
        }
@@ -1231,7 +1233,7 @@
            AtomicReference<String> serialUnitString= new AtomicReference<>("");
            for (int j = 0; j < serialSecVOList.size(); j++) {
                CodeBasicSecVO secVO = serialSecVOList.get(j);
                if(lastMaxSerialValueMap.containsKey(secVO.getOid())){
                if(lastMaxSerialValueMap.containsKey(secVO.getOid())){//此为最后需要存入流水依赖的最大流水
                    Map<String/**流水依据**/, String> serialValueMap=    lastMaxSerialValueMap.get(secVO.getOid());
                    serialValueMap.forEach((maxSerialUnitString,serialValue)->{
                        if(StringUtils.isNotBlank(serialValue)){
@@ -1239,6 +1241,11 @@
                            sb.append(serialValue).append(SERIAL_VALUE_SPACE);
                        }
                    });
                }else{
                    if(secValueMap.containsKey(secVO.getOid())) {//企业标准处理修订顺序号已经存在的数据则不需要动流水依赖表的数据
                        serialUnitString.set(secOdserialUnitMap.get(secVO.getOid()));
                        sb.append(secValueMap.get(secVO.getOid())).append(SERIAL_VALUE_SPACE);
                    }
                }
            }
            String codeDelimiter=thisSecValueList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE));