业务员手机端及web端管理提报页面新增已提报内容查询列表

src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报管理主界面已提报经销商明细查询.sql

@@ -0,0 +1,15 @@
+select t3.fsaleruserid,
+       t3.fprovince,
+       t3.fcity,
+       t3.fcounty,
+       t3.fagentname,
+       t4.fname,
+       isnull(t4.fphonenumber,' ')as fphonenumber,
+       t2.fcontent,
+       t2.tsubmiteditid,
+       t2.submitdate
+from DSBCRM..tsubmiteditmodel t1
+       inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.fstatus='Ìá½»'
+       inner join DSBCRM..tagents t3 on t2.siteid = t3.siteid and t2.tagentsid = t3.tagentsid
+       inner join DSBCRM..tenterprise_users t4 on t2.siteid = t4.siteid and t2.tenterprise_userid = t4.tenterprise_userid
+where t1.siteid =$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$ and t3.fsaleruserid in $fsaleruserid$

src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/submitedit.java

@@ -237,14 +237,33 @@ public class submitedit extends Controller {
         Rows rows = dbConnect.runSqlQuery(costhead.getSQL());
         ArrayList<String> fsaleruseridlist = rows.toArrayList("fsaleruserid");
 
-        SQLFactory mx = new SQLFactory(this, "提报管理主界面经销商明细查询");
-        mx.addParameter("siteid", siteid);
-        mx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
-        mx.addParameter_in("fsaleruserid", fsaleruseridlist);
-        RowsMap map = dbConnect.runSqlQuery(mx.getSQL()).toRowsMap("fsaleruserid");
+        SQLFactory unsubmitmx = new SQLFactory(this, "提报管理主界面未提报经销商明细查询");
+        unsubmitmx.addParameter("siteid", siteid);
+        unsubmitmx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        unsubmitmx.addParameter_in("fsaleruserid", fsaleruseridlist);
+        RowsMap unsubmitmap = dbConnect.runSqlQuery(unsubmitmx.getSQL()).toRowsMap("fsaleruserid");
 
+        SQLFactory submitmx = new SQLFactory(this, "提报管理主界面已提报经销商明细查询");
+        submitmx.addParameter("siteid", siteid);
+        submitmx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        submitmx.addParameter_in("fsaleruserid", fsaleruseridlist);
+        Rows submitRows_All = dbConnect.runSqlQuery(submitmx.getSQL());
+        RowsMap submitRowsmap = submitRows_All.toRowsMap("fsaleruserid");
+        /**
+         * 附件查询
+         */
+        RowsMap attachmentRowsMap = getAttachmentUrl("tsubmitedit", submitRows_All.toArray("tsubmiteditid"));
         for (Row row : rows) {
-            row.put("agentlist", map.get(row.getString("fsaleruserid")));
+            //未提报经销商列表
+            row.put("unsubmitagentlist", unsubmitmap.get(row.getString("fsaleruserid")));
+
+            Rows submitRows = submitRowsmap.get(row.getString("fsaleruserid"));
+            //遍历提报列表
+            for (Row submitRow : submitRows) {
+                //根据提报ID获取提报附件
+                submitRow.put("docinfos", attachmentRowsMap.get(submitRow.getString("tsubmiteditid")));
+            }
+            row.put("submitagentlist", submitRows);
         }
         return getSucReturnObject().setData(rows).saveToDataPool().toString();
     }

src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报管理主界面已提报经销商明细查询.sql

@@ -0,0 +1,15 @@
+select t3.fsaleruserid,
+       t3.fprovince,
+       t3.fcity,
+       t3.fcounty,
+       t3.fagentname,
+       t4.fname,
+       isnull(t4.fphonenumber,' ')as fphonenumber,
+       t2.fcontent,
+       t2.tsubmiteditid,
+       t2.submitdate
+from DSBCRM..tsubmiteditmodel t1
+       inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.fstatus='Ìá½»'
+       inner join DSBCRM..tagents t3 on t2.siteid = t3.siteid and t2.tagentsid = t3.tagentsid
+       inner join DSBCRM..tenterprise_users t4 on t2.siteid = t4.siteid and t2.tenterprise_userid = t4.tenterprise_userid
+where t1.siteid =$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$ and t3.fsaleruserid in $fsaleruserid$

src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/submitedit.java

@@ -237,14 +237,33 @@ public class submitedit extends Controller {
         Rows rows = dbConnect.runSqlQuery(costhead.getSQL());
         ArrayList<String> fsaleruseridlist = rows.toArrayList("fsaleruserid");
 
-        SQLFactory mx = new SQLFactory(this, "提报管理主界面经销商明细查询");
-        mx.addParameter("siteid", siteid);
-        mx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
-        mx.addParameter_in("fsaleruserid", fsaleruseridlist);
-        RowsMap map = dbConnect.runSqlQuery(mx.getSQL()).toRowsMap("fsaleruserid");
+        SQLFactory unsubmitagentsql = new SQLFactory(this, "提报管理主界面未提报经销商明细查询");
+        unsubmitagentsql.addParameter("siteid", siteid);
+        unsubmitagentsql.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        unsubmitagentsql.addParameter_in("fsaleruserid", fsaleruseridlist);
+        RowsMap unsubmitagentmap = dbConnect.runSqlQuery(unsubmitagentsql.getSQL()).toRowsMap("fsaleruserid");
 
+        SQLFactory submiteditsql = new SQLFactory(this, "提报管理主界面已提报经销商明细查询");
+        submiteditsql.addParameter("siteid", siteid);
+        submiteditsql.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        submiteditsql.addParameter_in("fsaleruserid", fsaleruseridlist);
+        Rows submiteditRows_All = dbConnect.runSqlQuery(submiteditsql.getSQL());
+        RowsMap submiteditRowsmap = submiteditRows_All.toRowsMap("fsaleruserid");
+        /**
+         * 附件查询
+         */
+        RowsMap attachmentRowsMap = getAttachmentUrl("tsubmitedit", submiteditRows_All.toArray("tsubmiteditid"));
         for (Row row : rows) {
-            row.put("agentlist", map.get(row.getString("fsaleruserid")));
+            //未提报经销商列表
+            row.put("unsubmitagentlist", unsubmitagentmap.get(row.getString("fsaleruserid")));
+
+            Rows submiteditRows = submiteditRowsmap.get(row.getString("fsaleruserid"));
+            //遍历提报列表
+            for (Row submiteditRow : submiteditRows) {
+                //根据提报ID获取提报附件
+                submiteditRow.put("docinfos", attachmentRowsMap.get(submiteditRow.getString("tsubmiteditid")));
+            }
+            row.put("submiteditlist", submiteditRows);
         }
         return getSucReturnObject().setData(rows).saveToDataPool().toString();
     }