统一接口配置保存bug修复

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<data systemId="MPM">
    <user userName="weidy" trueName="魏大勇" ip="127.0.0.1"/>
    <classifys>
        <classify classCode="020101" library="wupin" fullclsfNamePath="物品##VCI##标准件##VCI##螺栓">
            <objects>
                <object code="02010100039"  id="0023401" status="Editing" operate="create" editor="weidy" >
                    <prop  key="partname" text="名称" value="温度调节器1"/>
                    <prop key="use" text="主要功能" value="导电连接1"/>
                    <prop key="xinghaoguige" text="主要功能" value="TH-003274"/>
                </object>
                <object  code="02010100040" id="0023402" status="Editing" operate="create" editor="weidy">
                    <prop key="partname" text="所属结构" value="温度调节器2"/>
                    <prop key="use" text="主要功能" value="导电连接2"/>
                    <prop key="xinghaoguige" text="主要功能" value="GGXH-003274"/>
                </object>
            </objects>
        </classify>
        <classify classCode="020102" library="wupin" fullclsfNamePath="物品##VCI##标准件##VCI##螺母">
            <objects>
                <object code="02010200033" id="0023401" status="Editing" operate="create" editor="weidy">
                    <prop  key="partname" text="名称" value="温度调节器1"/>
                    <prop key="use" text="主要功能" value="导电连接1"/>
                    <prop key="xinghaoguige" text="主要功能" value="GGXH-003274"/>
                </object>
                <object code="02010200034" id="0023402" status="Editing" operate="create" editor="weidy">
                    <prop key="partname" text="所属结构" value="温度调节器2"/>
                    <prop key="use" text="主要功能" value="导电连接2"/>
                    <prop key="xinghaoguige" text="主要功能" value="GGXH-003274"/>
                </object>
            </objects>
        </classify>
    </classifys>
</data>

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

@@ -367,7 +367,10 @@

    @Override
    public boolean deleteDataById(String oids) {
        return false;
        VciBaseUtil.alertNotNull(oids, "数据主键为空");
        List<String> oidList=VciBaseUtil.str2List(oids);
        int i=dockingSystemConfigMapper.deleteBatchIds(oidList);
        return i>0?true:false;
    }

    /**

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

@@ -2090,6 +2090,7 @@
                            XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
                            if(isCodeOrGroupCode) {
                                if(StringUtils.isBlank(groupCode)){
                                    errorid="1";
                                    mes+="；申请的编码类型为集团码，等待集团编码赋值";
                                }
                                resultDataObjectDetailDO.setCode(groupCode);
@@ -2157,14 +2158,16 @@
                    }
                    if(isCodeOrGroupCode) {
                        if(StringUtils.isBlank(groupCode)){
                            resultDataObjectDetailDO.setErrorid("1");
                            msg="申请的编码类型为集团码，等待集团编码赋值";
                        }
                        resultDataObjectDetailDO.setCode(groupCode);
                    }else{
                        resultDataObjectDetailDO.setCode(code);
                        resultDataObjectDetailDO.setErrorid("0");
                    }
                    resultDataObjectDetailDO.setId(sourceOid);
                    resultDataObjectDetailDO.setErrorid("0");

                    resultDataObjectDetailDO.setMsg(msg);
                    resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
                    //处理传送的数据中关键属性重复的，直接拿到已经申请到编码的数据编码直接将赋给关键属性重复的数据
@@ -2325,9 +2328,9 @@
        sb.append(tableName);
        sb.append(" where 1=1 ");
        if(isCodeOrGroupCode) {
            sb.append(" groupcode in (");
            sb.append(" and groupcode in (");
        }else{
            sb.append(" id in (");
            sb.append(" and id in (");
        }
        sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
        sb.append(")");
@@ -2359,7 +2362,7 @@
            RowDatas rowData=codeDataMap.get(code);
            String status=rowData.getStatus();
            String operation=rowData.getOperation();
            if (cbo.getTs().compareTo(orderDTO.getTs())==0?true:false) {
            if (cbo.getTs().compareTo(orderDTO.getTs())==0?false:true) {
                // throw new VciBaseException("数据不是最新的，可能他人已经修改，请刷新后再试");
                errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";数据不是最新的，可能他人已经修改，请刷新后再试");
            }
@@ -4013,7 +4016,7 @@
            DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
            for (String key:dataMap.keySet()){
                Object value= dataMap.getOrDefault(key,"");
                clientBusinessObject.setAttributeValue(key,value.toString());
                clientBusinessObject.setAttributeValue(key,value==null?"":value.toString());
            }
            clientBusinessObjectList.add(clientBusinessObject);
        });