xiejun
2023-08-28 a793053d12edf75e1f239747d80b10988c2c686e
统一接口更改接口bug修复
已修改2个文件
25 ■■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/edit.xml
@@ -4,12 +4,12 @@
    <classifys>
        <classify classCode="020101" library="wupin" fullclsfNamePath="物品##VCI##标准件##VCI##螺栓">
            <objects>
                <object code="02010100039"  id="0023401" status="Editing" operate="create" editor="weidy" >
                <object code="02010100039"  id="0023401" status="Released" operate="update" 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">
                <object  code="02010100040" id="0023402" status="Released" operate="update" editor="weidy">
                    <prop key="partname" text="所属结构" value="温度调节器2"/>
                    <prop key="use" text="主要功能" value="导电连接2"/>
                    <prop key="xinghaoguige" text="主要功能" value="GGXH-003274"/>
@@ -18,12 +18,12 @@
        </classify>
        <classify classCode="020102" library="wupin" fullclsfNamePath="物品##VCI##标准件##VCI##螺母">
            <objects>
                <object code="02010200033" id="0023401" status="Editing" operate="create" editor="weidy">
                <object code="02010200033" id="0023401" status="Released" operate="update" 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">
                <object code="02010200034" id="0023402" status="Released" operate="update" editor="weidy">
                    <prop key="partname" text="所属结构" value="温度调节器2"/>
                    <prop key="use" text="主要功能" value="导电连接2"/>
                    <prop key="xinghaoguige" text="主要功能" value="GGXH-003274"/>
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -2404,7 +2404,7 @@
                List<CodeAllCode>newCodeAllCodeList= codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCreateCodeOid, cbo.getOid()));
                if (!CollectionUtils.isEmpty(newCodeAllCodeList)) {
                    CodeAllCode codeCbo = codeAllCodeList.get(0);
                    CodeAllCode codeCbo = newCodeAllCodeList.get(0);
                    log.info("codeCbos code:" + codeCbo.getId());
                    codeCbo.setLcStatus(status);
                    codeAllCodeList.add(codeCbo);
@@ -2481,7 +2481,7 @@
            //存储数据
            try {
                engineService.updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId(),updateList);
                codeAllCodeService.saveBatch(codeAllCodeList);
                codeAllCodeService.saveOrUpdateBatch(codeAllCodeList);
                if(deleteList.size()>0) {
                    commonsMapper.deleteByTaleAndOid(tableName, VciBaseUtil.array2String(deleteList.toArray(new String[]{})));
                }
@@ -2615,17 +2615,22 @@
        //没有限制分类,但是一个模板只可能在一个业务类型里面,所以直接查询这个业务类型即可
        if (!CollectionUtils.isEmpty(conditionMap)) {
            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmTypeId()) + " where 1 = 1 "};
            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmTypeId()) + " t where 1 = 1 "};
            conditionMap.forEach((key, value) -> {
                if(StringUtils.isBlank(value)||value.equals(QueryOptionConstant.ISNULL)){
                    sql[0] += " and " + key + " is null ";
                }else{
                sql[0] += " and " + key + " = " + value;
                }
            });
            if (StringUtils.isNotBlank(orderDTO.getOid())) {
                //修改的时候,需要排除自己
                sql[0] += " and oid != '" + orderDTO.getOid() + "'";
                sql[0] += " and t.oid != '" + orderDTO.getOid() + "'";
            } else if (StringUtils.isNotBlank(orderDTO.getCopyFromVersion())) {
                sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
                sql[0] += " and t.oid != '" + orderDTO.getCopyFromVersion() + "'";
            }
            sql[0] += " and lastR = '1' and lastV = '1' ";
            sql[0] += " and t.lastR = '1' and t.lastV = '1' ";
            if (commonsMapper.queryCountBySql(sql[0]) > 0) {
                String ruleInfoMsg = keyRuleVO == null ? "" : "查询规则:去除空格--{0},忽略大小写--{1},忽略全半角--{2},忽略全部空格--{3}";
                String[] objs = new String[]{trim ? "是" : "否", ignoreCase ? "是" : "否", ignoreWidth ? "是" : "否", trimAll ? "是" : "否"};