|
|
|
@ -150,7 +150,12 @@ public class DdlPreparedPack {
|
|
|
|
|
} else {
|
|
|
|
|
order[i] = "desc";
|
|
|
|
|
}
|
|
|
|
|
sqlStr += " model." + columnName[i] + " " + order[i].toString() + ",";
|
|
|
|
|
if(columnName[i].indexOf(" model.") == -1){
|
|
|
|
|
sqlStr += " model." + columnName[i];
|
|
|
|
|
}else{
|
|
|
|
|
sqlStr += columnName[i];
|
|
|
|
|
}
|
|
|
|
|
sqlStr += " " + order[i].toString() + ",";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -506,4 +511,23 @@ public class DdlPreparedPack {
|
|
|
|
|
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 转换排序列
|
|
|
|
|
* @param columnName
|
|
|
|
|
* @param basisType
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String orderColConvertType(String columnName,int basisType){
|
|
|
|
|
String name =" model." + columnName;
|
|
|
|
|
|
|
|
|
|
if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
|
|
|
|
|
name = " cast(" + name+ " as integer)";
|
|
|
|
|
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){
|
|
|
|
|
name = " cast(" + name+ " as double)";
|
|
|
|
|
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){
|
|
|
|
|
name = " cast(" + name+ " as long)";
|
|
|
|
|
}
|
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|