Merge branch 'dev' of adair.song/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        LOGGER.info("ptl_pcn数据清除查询");
         StringBuffer queryString = new StringBuffer();
-        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " ");
+        queryString.append("select model from " + persistentClass.getSimpleName()
+                + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " ");
 
         if (packBean != null) {
             queryString.append(packBean.getWhereAppend());
         }
 
-        return entityManager.createQuery(queryString.toString()).getResultList();
+        Query query = entityManager.createQuery(queryString.toString());
+        for (String key : packBean.getHqlPreparedMap().keySet()) {
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        }
+
+        return query.getResultList();
     }
 }