Merge branch 'develop' into develop-green

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -451,6 +451,12 @@ public class cashbill extends Controller {
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 where = where + " and DATE_FORMAT(t1.createdate, '%Y-%m-%d') <='" + whereObject.getString("enddate") + "'";
             }
+            if (whereObject.containsKey("beginperiod") && !"".equals(whereObject.getString("beginperiod"))) {
+                where = where + " and t1.period >='" + whereObject.getString("beginperiod") + "' ";
+            }
+            if (whereObject.containsKey("endperiod") && !"".equals(whereObject.getString("endperiod"))) {
+                where = where + " and t1.period <='" + whereObject.getString("endperiod") + "' ";
+            }
             if (whereObject.containsKey("billno") && !"".equals(whereObject.getString("billno"))) {
                 where = where + " and t1.billno ='" + whereObject.getString("billno") + "'";
             }
@@ -567,6 +573,12 @@ public class cashbill extends Controller {
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 where = where + " and DATE_FORMAT(t1.createdate, '%Y-%m-%d') <='" + whereObject.getString("enddate") + "'";
             }
+            if (whereObject.containsKey("beginperiod") && !"".equals(whereObject.getString("beginperiod"))) {
+                where = where + " and t1.period >='" + whereObject.getString("beginperiod") + "' ";
+            }
+            if (whereObject.containsKey("endperiod") && !"".equals(whereObject.getString("endperiod"))) {
+                where = where + " and t1.period <='" + whereObject.getString("endperiod") + "' ";
+            }
             if (whereObject.containsKey("billno") && !"".equals(whereObject.getString("billno"))) {
                 where = where + " and t1.billno ='" + whereObject.getString("billno") + "'";
             }

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -508,9 +508,12 @@ public class Item extends Controller {
             } else {
                 row.put("attinfos", attRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             }
-            row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
+            String[] tradefield = tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()).toArray("tradefield");
+            row.put("tradefield", StringUtils.join(tradefield, ","));
             row.put("brand", brandRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
-            row.put("itemclass", itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
+
+            String[] itemclass = itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows()).toArray("itemclassname");
+            row.put("itemclass",  StringUtils.join(itemclass, ","));
         }