diff --git a/src/main/java/com/zzjee/wmapi/controller/WvGiController.java b/src/main/java/com/zzjee/wmapi/controller/WvGiController.java index adaf1d91..1dba1c19 100644 --- a/src/main/java/com/zzjee/wmapi/controller/WvGiController.java +++ b/src/main/java/com/zzjee/wmapi/controller/WvGiController.java @@ -355,7 +355,7 @@ public class WvGiController extends BaseController { String hql = " from WvGiEntity where downSta is null "; D0.setOK(true); if (!StringUtil.isEmpty(searchstr)) { - hql = hql + " and orderId = '" + searchstr + "'"; + hql = hql + " and orderId = '" + searchstr + "'" + " or imCusCode like '%" + searchstr + "%'"; } if (!StringUtil.isEmpty(searchstr2)) { try { diff --git a/src/main/java/com/zzjee/wmapi/entity/WvGiEntity.java b/src/main/java/com/zzjee/wmapi/entity/WvGiEntity.java index 3ce66419..8d796b53 100644 --- a/src/main/java/com/zzjee/wmapi/entity/WvGiEntity.java +++ b/src/main/java/com/zzjee/wmapi/entity/WvGiEntity.java @@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator; import javax.persistence.SequenceGenerator; import org.jeecgframework.poi.excel.annotation.Excel; -/** +/** * @Title: Entity * @Description: wv_gi * @author erzhongxmu * @date 2018-05-30 20:21:50 - * @version V1.0 + * @version V1.0 * */ @Entity @@ -68,7 +68,9 @@ public class WvGiEntity implements java.io.Serializable { /**状态*/ @Excel(name="状态") private String downSta; - + /**客户订单号*/ + @Excel(name="客户订单号") + private java.lang.String imCusCode; /** *方法: 取得java.lang.String *@return: java.lang.String 主键 @@ -280,4 +282,19 @@ public class WvGiEntity implements java.io.Serializable { public void setDownSta(String downSta){ this.downSta = downSta; } + + + + @Column(name ="IM_CUS_CODE",nullable=true,length=32) + public java.lang.String getImCusCode(){ + return this.imCusCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 客户订单号 + */ + public void setImCusCode(java.lang.String imCusCode){ + this.imCusCode = imCusCode; + } }