代码提交

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java

@@ -14,8 +14,10 @@
 */
public interface CodeClassifyValueMapper extends BaseMapper<CodeClassifyValue> {

     List<String> selectAllLevelChildOid(@Param("oid") String oid);
    List<String> selectAllLevelChildOid(@Param("oid") String oid);

    Long countAllLevelChildOid(@Param("oid") String oid);

    String getClassifyValueStr(@Param("oid") String oid);

}

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

@@ -123,6 +123,13 @@
    List<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid);

    /**
     * 根据主键获取码值字符串
     * @param oid
     * @return
     */
    String getClassifyValueStr(String oid);

    /**
     * 数据对象转换为显示对象
     * @param  codeClassifyValueDO 数据对象
     * @return 显示对象

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

@@ -25,6 +25,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.ResponseEntity;
@@ -393,6 +394,20 @@
    }

    /**
     * 根据主键获取码值字符串
     * @param oid
     * @return
     */
    @Override
    public String getClassifyValueStr(String oid){
        if(Func.isEmpty(oid)){
            return "";
        }
        String classifyValueStr = this.codeClassifyValueMapper.getClassifyValueStr(oid);
        return Func.isEmpty(classifyValueStr) ? "":classifyValueStr;
    }

    /**
     * 批量数据对象转换为显示对象
     * @param codeClassifyValueDOs 数据对象列表
     * @return 显示对象

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

@@ -564,7 +564,9 @@
                        break;
                    // 分类码段比对按升序排序码值
                    case "codeclassifysec":
                        if(!releasedBasicSec.getReferCodeClassifyOid().equals(releaseBasicSec.getReferCodeClassifyOid())){
                        String classifyValueStr = this.iCodeClassifyValueService.getClassifyValueStr(releasedBasicSec.getOid());
                        String classifyValueStr1 = this.iCodeClassifyValueService.getClassifyValueStr(releaseBasicSec.getOid());
                        if(classifyValueStr.equals(classifyValueStr1)){
                            flag = false;
                        }
                        break;
@@ -596,7 +598,7 @@
                        }
                        break;
                }
                if (flag) {
                if (!flag) {
                    break;
                }
            }

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyValueMapper.xml

@@ -18,4 +18,14 @@
    </select>


    <select id="getClassifyValueStr" resultType="java.lang.String">
        SELECT
            listagg(PCC.ID,'-') WITHIN GROUP(ORDER BY PCC.ORDERNUM ASC)
        FROM
            PL_CODE_CLASSIFYVALUE PCC
        WHERE
            PCC.CODECLASSIFYSECOID = #{oid}
    </select>


</mapper>