Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java

@@ -54,7 +54,6 @@
     */
    public static final String USER_TABLE_COMPATIBILITY_FIELD_SEP = "${vcicomplibitysep}";


    /**
     * 查询条件
     */
@@ -111,7 +110,7 @@
    private PageHelper pageHelper;

    /**
     * 所有的字段名称,key是对象属性中的字段，value是数据库里的字段
     * 所有的字段名称,key是数据库里的字段，value是对象属性中的字段
     */
    private Map<String,String> allFieldNameMap;

@@ -173,6 +172,39 @@
        put("firstr","isfirstr");
        put("lastv","islastv");
        put("firstv","isfirstv");
    }};

    /**
     * BaseModel和BusinessObject中的属性映射。
     * key：为BaseModel中的属性，value：为BusinessObject中的属性
     */
    public static final Map<String, String> BASEMODEL_CBO_FIELD_MAP = new HashMap(){{
        put("oid", "oid");
        put("revisionoid","revoid");
        put("nameoid","nameoid");
        put("btmname","btname");
        put("lastr","islastr");
        put("firstr","isfirstr");
        put("lastv","islastv");
        put("firstv","isfirstv");
        put("creator","creator");
        put("createtime","createtime");
        put("lastmodifier","modifier");
        put("lastmodifytime","modifytime");
        put("revisionrule","revisionrule");
        put("versionrule","versionrule");
        put("revisionseq","revisionseq");
        put("revisionvalue","revisionvalue");
        put("versionseq","versionseq");
        put("versionvalue","versionvalue");
        put("lctid","lctid");
        put("lcstatus","lcstatus");
        put("ts","ts");
        put("id","id");
        put("name","name");
        put("description","description");
        put("owner","owner");
        put("copyfromversion","fromversion");
    }};

    /**
@@ -1428,9 +1460,10 @@
    public Map<String,String> switchConditionMap(){
        Map<String,String> queryMap = new HashMap<>();
        if(!CollectionUtils.isEmpty(this.conditionMap)){
            this.conditionMap.forEach((key,value)->{
            //TODO: 转换前的字段和转换后的字段不应该同时存在，应该都统一使用转换后的字段做查询条件
            /*this.conditionMap.forEach((key,value)->{
                queryMap.put(key,value);
            });
            });*/
            //我们转换一下，直接set，如果还有重复的就只能自行解决
            this.allFieldNameMap.forEach((dbField,field)->{
                if(conditionMap.containsKey(field)){
@@ -1452,7 +1485,6 @@
    public void setLinkTableSql(String linkTableSql) {
        this.linkTableSql = linkTableSql;
    }



    /**