|
|
@@ -50,7 +50,11 @@ public class supplyanddemand extends Controller {
|
|
|
where.append(" and t1.fissupply =").append(whereObject.getBooleanValue("fissupply") ? 1 : 0);
|
|
|
}
|
|
|
if (whereObject.containsKey("fstatus") && !"".equals(whereObject.getString("fstatus"))) {
|
|
|
- where.append(" and t1.fstatus ='").append(whereObject.getString("fstatus")).append("' ");
|
|
|
+ if ("对接中".equals(whereObject.getString("fstatus"))) {
|
|
|
+ where.append(" and t1.fstatus ='").append(whereObject.getString("fstatus")).append("' and tenterprise_userid!=" + userid);
|
|
|
+ } else {
|
|
|
+ where.append(" and t1.fstatus ='").append(whereObject.getString("fstatus")).append("'");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
SQLFactory sqlFactory = new SQLFactory(this, "供需列表查询", pageSize, pageNumber, sort);
|
|
|
@@ -58,15 +62,13 @@ public class supplyanddemand extends Controller {
|
|
|
sqlFactory.addParameter_SQL("where", where);
|
|
|
|
|
|
|
|
|
-
|
|
|
Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
|
|
|
RowsMap attinfoRowsMap = getAttachmentUrl("tsupplyanddemand", rows.toArrayList("tsupplyanddemandid"));
|
|
|
|
|
|
|
|
|
-
|
|
|
SQLFactory dialoglistSQL = new SQLFactory(this, "供需详情查询_对话框列表");
|
|
|
dialoglistSQL.addParameter("siteid", siteid);
|
|
|
- dialoglistSQL.addParameter("userid",userid);
|
|
|
+ dialoglistSQL.addParameter("userid", userid);
|
|
|
dialoglistSQL.addParameter_in("tsupplyanddemandid", rows.toArrayList("tsupplyanddemandid"));
|
|
|
System.err.println(dialoglistSQL.getSQL());
|
|
|
|
|
|
@@ -74,9 +76,10 @@ public class supplyanddemand extends Controller {
|
|
|
|
|
|
SQLFactory timnewmsgSQL = new SQLFactory(this, "即时通讯群最新消息查询");
|
|
|
timnewmsgSQL.addParameter("siteid", siteid);
|
|
|
- timnewmsgSQL.addParameter("userid",userid);
|
|
|
+ timnewmsgSQL.addParameter("userid", userid);
|
|
|
timnewmsgSQL.addParameter_in("timdialogid", dialogrows.toArrayList("timdialogid"));
|
|
|
- System.err.println(timnewmsgSQL.getSQL());
|
|
|
+ System.err.println(dialogrows.toArrayList("timdialogid"));
|
|
|
+ // System.err.println(timnewmsgSQL.getSQL());
|
|
|
RowsMap newmsgmap = timnewmsgSQL.runSqlQuery().toRowsMap("timdialogid");
|
|
|
for (Row drow : dialogrows) {
|
|
|
Rows newmsgrows = newmsgmap.get(drow.getString("timdialogid"));
|
|
|
@@ -86,7 +89,7 @@ public class supplyanddemand extends Controller {
|
|
|
}
|
|
|
drow.put("latestnews", newmsgrows);//最新消息
|
|
|
}
|
|
|
- RowsMap map= dialogrows.toRowsMap("tsupplyanddemandid");
|
|
|
+ RowsMap map = dialogrows.toRowsMap("tsupplyanddemandid");
|
|
|
|
|
|
for (Row row : rows) {
|
|
|
|
|
|
@@ -241,7 +244,7 @@ public class supplyanddemand extends Controller {
|
|
|
|
|
|
SQLFactory timnewmsgSQL = new SQLFactory(this, "即时通讯群最新消息查询");
|
|
|
timnewmsgSQL.addParameter("siteid", siteid);
|
|
|
- timnewmsgSQL.addParameter("userid",userid);
|
|
|
+ timnewmsgSQL.addParameter("userid", userid);
|
|
|
timnewmsgSQL.addParameter_in("timdialogid", dialogrows.toArrayList("timdialogid"));
|
|
|
RowsMap newmsgmap = timnewmsgSQL.runSqlQuery().toRowsMap("timdialogid");
|
|
|
for (Row row : dialogrows) {
|