业务员提报管理页面经销商已提报列表调整，将原提报列表调整为已提报经销商列表-经销商提报列表

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

@@ -0,0 +1,4 @@
+select t1.fcontent,
+       t1.tsubmiteditid,
+       t1.submitdate
+from tsubmitedit t1 where t1.siteid =$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$ and t1.tenterprise_userid in $tenterprise_userid$

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

@@ -1,13 +1,11 @@
-select t3.fsaleruserid,
+select distinct t3.fsaleruserid,
        t3.fprovince,
        t3.fcity,
        t3.fcounty,
        t3.fagentname,
        t4.fname,
        isnull(t4.fphonenumber,' ')as fphonenumber,
-       t2.fcontent,
-       t2.tsubmiteditid,
-       t2.submitdate
+       t2.tenterprise_userid
 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

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

@@ -237,33 +237,50 @@ public class submitedit extends Controller {
         Rows rows = dbConnect.runSqlQuery(costhead.getSQL());
         ArrayList<String> fsaleruseridlist = rows.toArrayList("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 unsubmitagentmx = new SQLFactory(this, "提报管理主界面未提报经销商明细查询");
+        unsubmitagentmx.addParameter("siteid", siteid);
+        unsubmitagentmx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        unsubmitagentmx.addParameter_in("fsaleruserid", fsaleruseridlist);
+        RowsMap unsubmitagentmap = dbConnect.runSqlQuery(unsubmitagentmx.getSQL()).toRowsMap("fsaleruserid");
+
+        SQLFactory submitagentmx = new SQLFactory(this, "提报管理主界面已提报经销商明细查询");
+        submitagentmx.addParameter("siteid", siteid);
+        submitagentmx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        submitagentmx.addParameter_in("fsaleruserid", fsaleruseridlist);
+        Rows submitagentRows_All = dbConnect.runSqlQuery(submitagentmx.getSQL());
+        RowsMap submitagentRowsmap = submitagentRows_All.toRowsMap("fsaleruserid");
+
+        SQLFactory submitagentsubmiteditmx = new SQLFactory(this, "提报管理主界面已提报经销商提报明细查询");
+        submitagentsubmiteditmx.addParameter("siteid", siteid);
+        submitagentsubmiteditmx.addParameter("tsubmiteditmodelid", tsubmiteditmodelid);
+        submitagentsubmiteditmx.addParameter_in("tenterprise_userid", submitagentRows_All.toArray("tenterprise_userid"));
+        Rows submitagentsubmiteditRows_All = dbConnect.runSqlQuery(submitagentsubmiteditmx.getSQL());
+        RowsMap submitagentsubmiteditRowsmap = submitagentsubmiteditRows_All.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"));
+        RowsMap attachmentRowsMap = getAttachmentUrl("tsubmitedit", submitagentRows_All.toArray("tsubmiteditid"));
+
         for (Row row : rows) {
             //未提报经销商列表
-            row.put("unsubmitagentlist", unsubmitmap.get(row.getString("fsaleruserid")));
+            row.put("unsubmitagentlist", unsubmitagentmap.get(row.getString("fsaleruserid")));
 
-            Rows submitRows = submitRowsmap.get(row.getString("fsaleruserid"));
-            //遍历提报列表
-            for (Row submitRow : submitRows) {
-                //根据提报ID获取提报附件
-                submitRow.put("docinfos", attachmentRowsMap.get(submitRow.getString("tsubmiteditid")));
+            //已提报经销商列表处理
+            Rows submitagentRows = submitagentRowsmap.get(row.getString("fsaleruserid"));
+            //遍历已提报经销商列表
+            for (Row submitagentRow : submitagentRows) {
+                //经销商提报明细
+                Rows submitagentsubmiteditRows = submitagentsubmiteditRowsmap.get(submitagentRow.getString("tenterprise_userid"));
+                //遍历经销商提报明细
+                for (Row submitagentsubmiteditRow : submitagentsubmiteditRows) {
+                    //根据提报ID获取提报附件
+                    submitagentsubmiteditRow.put("docinfos", attachmentRowsMap.get(submitagentsubmiteditRow.getString("tsubmiteditid")));
+                }
+                //将经销商提报明细放至经销商下
+                submitagentRow.put("submiteditlist", submitagentsubmiteditRows);
             }
-            row.put("submitagentlist", submitRows);
+            row.put("submitagentlist", submitagentRows);
         }
         return getSucReturnObject().setData(rows).saveToDataPool().toString();
     }