|
|
@@ -38,6 +38,9 @@ public class warrantycard extends Controller {
|
|
|
if (whereObject.containsKey("bxjzenddate") && !"".equals(whereObject.getString("bxjzenddate"))) {
|
|
|
where.append(" and DATE_FORMAT(t1.enddate, '%Y-%m-%d') <='" + whereObject.getString("bxjzenddate")+"' ");
|
|
|
}
|
|
|
+ if (whereObject.containsKey("sys_enterpriseid") && !"".equals(whereObject.getString("sys_enterpriseid"))) {
|
|
|
+ where.append(" and t3.sys_enterpriseid ='" + whereObject.getString("sys_enterpriseid")+"' ");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
|
|
|
@@ -49,7 +52,7 @@ public class warrantycard extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t5", "t5.unitid = t4.unitid AND t5.siteid = t4.siteid","unitname");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t6", "t6.itemclassid = t4.marketingcategory AND t6.siteid = t4.siteid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t7.sa_customersid = t1.sa_customersid AND t7.siteid = t1.siteid","name","phonenumber","address");
|
|
|
- querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_tradefield ", "t8", "t8.sys_enterpriseid = t3.sys_enterpriseid AND t8.siteid = t3.siteid","sa_saleareaid");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.left, "(select sys_enterpriseid,siteid,max(sa_saleareaid) sa_saleareaid from sys_enterprise_tradefield group by sys_enterpriseid,siteid) ", "t8", "t8.sys_enterpriseid = t3.sys_enterpriseid AND t8.siteid = t3.siteid","sa_saleareaid");
|
|
|
|
|
|
querySQL.addQueryFields("topclassname","t6.itemclassname");
|
|
|
querySQL.setSiteid(siteid);
|