diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 3af7891..5fdefdd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -215,7 +215,7 @@ public interface BaseRepository extends JpaReposito List findByProperty(String propertyName, Object value); - List> findByWasProperty(String[] propertyNames, Object[] values); + List findByProperty(String[] propertyNames, Object[] values); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7a0e832..6544d05 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -411,44 +411,11 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return query.setFirstResult(offset).setMaxResults(pageSize).getResultList(); } - @Override public List findByProperty(String propertyName, Object value) { String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); } - - @Override - public List> findByWasProperty(String[] propertyNames, Object[] values) { - if (propertyNames.length != values.length) { - throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); - } - StringBuffer queryString = new StringBuffer(); - queryString.append(" SELECT \n" + - " a.sn_status AS snStatus,\n" + - " a.wh_no AS whNo,\n" + - " a.locate_no AS locateNo,\n" + - " a.part_no AS partNo,\n" + - " a.part_name_rdd AS partNameRdd,\n" + - " a.lot_no AS lotNo,\n" + - " CAST(IFNULL(SUM(a.qty), 0) AS DOUBLE) AS qty \n" + - "FROM\n" + - " `wms_stock_sn` a "); - int size = propertyNames.length; - if (size > 0) { - queryString.append("where 1=1 and a.sn_status in ('"+ WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue()+"', '"+WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue()+"') "); - } - - for (int i = 0; i < size; i++) { - if (values[i] != null) { - queryString.append(" and a." + StringCastUtils.upperCharToUnderLine(propertyNames[i]) + "= '" + values[i]+"'"); - } - } - queryString.append(" group by a.lot_no,a.date_code"); - return entityManager.createNativeQuery(queryString.toString()).unwrap(SQLQuery.class).setResultTransformer( - Transformers.ALIAS_TO_ENTITY_MAP).getResultList(); - } - @Override public List findByProperty(String[] propertyNames, Object[] values) { if(propertyNames.length != values.length){