Merge remote-tracking branch 'origin/develop' into develop

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

@@ -333,6 +333,7 @@ public class itemclass extends Controller {
 				sqlFactory.addParameter("sa_brandid", row.getString("sa_brandid"));
 
 				sqlFactory.addParameter_SQL("where", where);
+				sqlFactory.addParameter_SQL("where2", " 1=1 ");
 				String sql = sqlFactory.getSQL();
 				Rows allrows = dbConnect.runSqlQuery(sql);
 				/*

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1054,13 +1054,14 @@ public class OrderItems extends Controller {
                 "areaname");
 //        querySQL.addJoinTable(JOINTYPE.left, t11, "t11", "t11.sa_orderitemsid = t1.sa_orderitemsid and t11.siteid = t1.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_accountclass", "t12", "t12.sa_accountclassid=t5.sa_accountclassid and t12.siteid=t5.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion", "t13", "t13.sa_promotionid=t5.sa_promotionid and t13.siteid=t5.siteid","promnum","promname");
         querySQL.addQueryFields("accountnames", "if(ifnull(replace(replace(replace(JSON_EXTRACT (t5.sa_accountclassinfos, '$**.accountname' ),'[',''),']',''),'\\\"',''),'')='',t12.accountname,replace(replace(replace(JSON_EXTRACT (t5.sa_accountclassinfos, '$**.accountname' ),'[',''),']',''),'\\\"',''))");
         querySQL.addQueryFields("orderremarks", "t5.remarks");
 //        querySQL.addQueryFields("outwarehouseqty", "ifnull(t11.outwarehouseqty,0)");
         //querySQL.addQueryFields("accountclassinfos", "REPLACE(SUBSTRING(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'), 2, CHAR_LENGTH(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'))-2),'\"','')");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
-        querySQL.setWhere("t5.status in ('审核', '关闭','手工关闭')");
+        querySQL.setWhere("t5.status !='新建'");
         return querySQL;
     }
 

src/custom/restcontroller/webmanage/sale/order/OrderItemsHelper.java

@@ -117,16 +117,17 @@ public class OrderItemsHelper extends BaseClass {
         sqlFactory.addParameter("siteid", controller.siteid);
         sqlFactory.addParameter_in("itemclassid", itemclsids);
         sqlFactory.addParameter_in("itemid", itemids);
+        System.err.println(sqlFactory.getSQL());
 
         Rows rows = controller.dbConnect.runSqlQuery(sqlFactory);
         BigDecimal saorderamount = BigDecimal.ZERO;
         for (Row row : rows) {
             saorderamount = saorderamount.add(row.getBigDecimal("amount"));
         }
-        //查询定制费用
-        sql = "SELECT ifnull(sum(costamount),0) costamount from sa_order_cost WHERE sa_orderid=" + sa_orderid;
-        BigDecimal costamount = dbConnect.runSqlQuery(0, sql).getBigDecimal("costamount");
-        saorderamount = saorderamount.add(costamount);
+//        //查询定制费用
+//        sql = "SELECT ifnull(sum(costamount),0) costamount from sa_order_cost WHERE sa_orderid=" + sa_orderid;
+//        BigDecimal costamount = dbConnect.runSqlQuery(0, sql).getBigDecimal("costamount");
+//        saorderamount = saorderamount.add(costamount);
 
 
         BigDecimal balance = agentdecorationtrebatRows.get(0).getBigDecimal("balance");

src/custom/restcontroller/webmanage/sale/paybill/Paybill.java

@@ -124,13 +124,15 @@ public class Paybill extends Controller {
     }
 
     public QuerySQL query(String where) throws YosException {
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_paybill");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_paybill",
+                "billno","status","payer","period","amount","sa_paybillid");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid"
                 , "agentnum");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t3", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t3.sys_enterpriseid"
                 , "enterprisename", "abbreviation");
         querySQL.setWhere(where);
+        querySQL.addQueryFields("paydate","DATE_FORMAT(t1.paydate,'%Y-%m-%d')");
         querySQL.setWhere("t1.siteid", siteid);
         return querySQL;
     }

src/custom/restcontroller/webmanage/sale/paybill/SQL/打款凭证详情.sql

@@ -2,7 +2,7 @@ select t1.sa_paybillid,
        t1.sys_enterpriseid,
        t1.billno,
        t1.payer,
-       t1.paydate,
+       DATE_FORMAT(t1.paydate,'%Y-%m-%d')  paydate,
        t1.period,
        t1.amount,
        t1.status,

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);

src/custom/restcontroller/webmanage/sale/salestarget/personnel.java

@@ -22,7 +22,6 @@ import java.util.HashMap;
 public class personnel extends Controller {
     /**
      * 构造函数
-     *
      * @param content
      */
     public personnel(JSONObject content) throws YosException {