优化促销方案时间范围查询条件及底层jar包更新

src/custom/restcontroller/webmanage/sale/promotion/promotion.java

@@ -239,6 +239,8 @@ public class promotion extends Controller {
     @CACHEING
     public String querypromotionList() throws YosException {
         StringBuffer where = new StringBuffer(" 1=1 ");
+        StringBuffer wherebegindate = new StringBuffer(" 1=1 ");
+        StringBuffer whereenddate = new StringBuffer(" 1=1 ");
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
@@ -252,12 +254,15 @@ public class promotion extends Controller {
                 where.append(" and t1.status ='").append(whereObject.getString("status")).append("' ");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and DATE_FORMAT(t1.begdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
+                wherebegindate.append(" and DATE_FORMAT(t1.begdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
+                whereenddate.append(" and DATE_FORMAT(t1.enddate, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and DATE_FORMAT(t1.enddate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
+                wherebegindate.append(" and DATE_FORMAT(t1.begdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
+                whereenddate.append(" and DATE_FORMAT(t1.enddate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
         }
+        where.append("and ((").append(wherebegindate).append(") or (").append(whereenddate).append("))");
 //        SQLFactory sqlFactory = new SQLFactory(this, "促销方案列表查询", pageSize, pageNumber, pageSorting);
 //        sqlFactory.addParameter("siteid", siteid);
 //        sqlFactory.addParameter_SQL("where", where);