I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新加NotNumBiggerPackContainsZero方法

Browse Source
yun-zuoyi
许心洁 6 years ago
parent ccd04804c0
commit 84a96a22fa
2 changed files with 78 additions and 63 deletions
Show Stats Download Patch File Download Diff File

126
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@ -47,8 +48,8 @@ public class DdlPreparedPack {
endDate += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate);
}
/**
@ -94,9 +95,9 @@ public class DdlPreparedPack {
String[] time = date.split(",");
if (time.length == 1) {
//只有开始日期，没有结束日期
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
} else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
|| (time[1] != null & time[1].trim().length() > 0))) {
|| (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
time[0] = "1900-01-01";
} else {
@ -113,16 +114,16 @@ public class DdlPreparedPack {
if (isShowTime && time[1].trim().length() <= 11) {
time[1] += " 23:59:59";
}
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, time[0]);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, time[1]);
} else {
if (showTaday) {
if (isShowTime) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59");
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today + " 23:59:59");
} else {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today);
}
}
}
@ -147,14 +148,14 @@ public class DdlPreparedPack {
}
if (!isShowTime) {
date = date.substring(0, 10);
packBean.addColumnQuery(null," and '" + date + "' between substring(model." + startColumnName
+ ",1,10) and substring(model." + endColumnName + ",1,10)", null);
packBean.addColumnQuery(null, " and '" + date + "' between substring(model." + startColumnName
+ ",1,10) and substring(model." + endColumnName + ",1,10)", null);
return;
} else if (date.trim().length() <= 11) {
date += " 00:00:00";
}
packBean.addColumnQuery(null," and '" + date + "' between model." + startColumnName
+ " and model." + endColumnName, null);
packBean.addColumnQuery(null, " and '" + date + "' between model." + startColumnName
+ " and model." + endColumnName, null);
}
/**
@ -173,9 +174,9 @@ public class DdlPreparedPack {
} else {
order[i] = "desc";
}
if(columnName[i].indexOf(" model.") == -1){
if (columnName[i].indexOf(" model.") == -1) {
sqlStr += " model." + columnName[i];
}else{
} else {
sqlStr += columnName[i];
}
sqlStr += " " + order[i].toString() + ",";
@ -209,7 +210,7 @@ public class DdlPreparedPack {
*/
public static void getStringLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val + "%");
}
}
@ -222,7 +223,7 @@ public class DdlPreparedPack {
*/
public static void getStringLikerPackOr(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " like :m_" + columnName, "%" + val + "%");
packBean.addColumnQuery(columnName, " or model." + columnName + " like :m_" + columnName, "%" + val + "%");
}
}
@ -235,7 +236,7 @@ public class DdlPreparedPack {
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, val + "%");
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
}
}
@ -248,7 +249,7 @@ public class DdlPreparedPack {
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val);
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
}
}
@ -260,7 +261,7 @@ public class DdlPreparedPack {
*/
public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, val);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
}
}
@ -272,7 +273,7 @@ public class DdlPreparedPack {
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val);
packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, val);
}
}
@ -283,7 +284,7 @@ public class DdlPreparedPack {
* @param packBean
*/
public static void getStringNotNullPack(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(null," and model." + columnName + " is not null", null);
packBean.addColumnQuery(null, " and model." + columnName + " is not null", null);
}
/**
@ -294,7 +295,7 @@ public class DdlPreparedPack {
*/
public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val);
packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val);
}
}
@ -306,7 +307,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -318,7 +319,7 @@ public class DdlPreparedPack {
*/
public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -330,7 +331,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPackOr(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, data);
}
}
@ -342,7 +343,7 @@ public class DdlPreparedPack {
*/
public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -354,7 +355,7 @@ public class DdlPreparedPack {
*/
public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) >= 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data);
}
}
@ -366,7 +367,7 @@ public class DdlPreparedPack {
*/
public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
@ -390,7 +391,7 @@ public class DdlPreparedPack {
*/
public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, data);
}
}
@ -402,7 +403,7 @@ public class DdlPreparedPack {
*/
public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, data);
}
}
@ -414,9 +415,22 @@ public class DdlPreparedPack {
*/
public static void getNumberBiggerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装double对象成大于等于语句
*
@ -425,7 +439,7 @@ public class DdlPreparedPack {
*/
public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
}
}
@ -437,9 +451,10 @@ public class DdlPreparedPack {
*/
public static void getNumberSmallerPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
}
}
/**
* 封装double对象成小于等于语句
*
@ -448,7 +463,7 @@ public class DdlPreparedPack {
*/
public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
}
}
@ -460,7 +475,7 @@ public class DdlPreparedPack {
*/
public static void getNumNOEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, data);
packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, data);
}
}
@ -473,7 +488,7 @@ public class DdlPreparedPack {
*/
public static void getInPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -486,7 +501,7 @@ public class DdlPreparedPack {
*/
public static void getOrInPack(String data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -499,7 +514,7 @@ public class DdlPreparedPack {
*/
public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
}
}
@ -512,7 +527,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
}
}
@ -525,7 +540,7 @@ public class DdlPreparedPack {
*/
public static void getInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -538,7 +553,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data);
}
}
@ -564,7 +579,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data);
}
}
@ -590,7 +605,7 @@ public class DdlPreparedPack {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
@ -603,26 +618,27 @@ public class DdlPreparedPack {
*/
public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null) {
packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data);
}
}
/**
* 转换排序列
*
* @param columnName 列名
* @param basisType 基本类型
* @see CommonEnumUtil.BASIS_TYPE
* @param basisType 基本类型
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(String columnName,int basisType){
String name =" model." + columnName;
public static String getOrderColConvertType(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)";
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;
}

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -2273,7 +2273,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
//数量大于0
DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "qty", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@ -2372,8 +2372,7 @@ public class WmsHqlPack {
}
/**
/**
* 业务：库存查询封装
*
* @param wmsStockQuan
@ -2382,23 +2381,23 @@ public class WmsHqlPack {
public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRouting, result);
return result;
}
public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRoutingRule, result);

Write Preview
Loading…
Cancel
Save