业务员提报管理列表及主界面应提报数及已提报数计算调整

src/dsb/com/cnd3b/restcontroller/enterprise/agentclient/mainpage/submitedit/SQL/提报列表查询.sql

@@ -4,7 +4,6 @@ select t1.tsubmiteditmodelid,
        t1.fenddate,
        t1.checkdate,
        t1.frequireqty,
-       t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
        t1.fisnotlimittimes

src/dsb/com/cnd3b/restcontroller/enterprise/agentclient/mainpage/submitedit/SQL/提报列表查询_提报人数查询.sql

@@ -0,0 +1,3 @@
+select t1.tsubmiteditmodelid,count(distinct t1.tenterprise_userid) as fsubmitqty from tsubmitedit t1
+where t1.siteid=$siteid$ and t1.tsubmiteditmodelid in $tsubmiteditmodelid$ and t1.fstatus='Ìá½»'
+group by t1.tsubmiteditmodelid

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

@@ -59,6 +59,11 @@ public class submitedit extends Controller {
         editstatuslist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
         RowsMap editstatusrowsMap = dbConnect.runSqlQuery(editstatuslist).toRowsMap("tsubmiteditmodelid");
 
+        SQLFactory editsubmitusercountlist = new SQLFactory(this, "提报列表查询_提报人数查询");
+        editsubmitusercountlist.addParameter("siteid", siteid);
+        editsubmitusercountlist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
+        RowsMap editsubmitusercountrowsMap = dbConnect.runSqlQuery(editsubmitusercountlist).toRowsMap("tsubmiteditmodelid");
+
         for (Row row : rows) {
             String tsubmiteditmodelid = row.getString("tsubmiteditmodelid");
             if (editstatusrowsMap.containsKey(tsubmiteditmodelid)) {
@@ -68,6 +73,11 @@ public class submitedit extends Controller {
                 row.put("fisread", 0);
                 row.put("fissubmit", 0);
             }
+            if (editsubmitusercountrowsMap.containsKey(tsubmiteditmodelid)) {
+                row.put("fsubmitqty", editsubmitusercountrowsMap.get(tsubmiteditmodelid).get(0).getInteger("fsubmitqty"));
+            } else {
+                row.put("fsubmitqty", 0);
+            }
         }
         return getSucReturnObject().setDataByPaging(rows, sortfield).setFinalDo(DataPool.defaultdatalife, 1);
     }

src/dsb/com/cnd3b/restcontroller/enterprise/agentwebclient/mainpage/submitedit/SQL/提报列表查询.sql

@@ -4,7 +4,6 @@ select t1.tsubmiteditmodelid,
        t1.fenddate,
        t1.checkdate,
        t1.frequireqty,
-       t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
        t1.fisnotlimittimes

src/dsb/com/cnd3b/restcontroller/enterprise/agentwebclient/mainpage/submitedit/SQL/提报列表查询_提报人数查询.sql

@@ -0,0 +1,3 @@
+select t1.tsubmiteditmodelid,count(distinct t1.tenterprise_userid) as fsubmitqty from tsubmitedit t1
+where t1.siteid=$siteid$ and t1.tsubmiteditmodelid in $tsubmiteditmodelid$ and t1.fstatus='Ìá½»'
+group by t1.tsubmiteditmodelid

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

@@ -59,6 +59,12 @@ public class submitedit extends Controller {
         editstatuslist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
         RowsMap editstatusrowsMap = dbConnect.runSqlQuery(editstatuslist).toRowsMap("tsubmiteditmodelid");
 
+        SQLFactory editsubmitusercountlist = new SQLFactory(this, "提报列表查询_提报人数查询");
+        editsubmitusercountlist.addParameter("siteid", siteid);
+        editsubmitusercountlist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
+        RowsMap editsubmitusercountrowsMap = dbConnect.runSqlQuery(editsubmitusercountlist).toRowsMap("tsubmiteditmodelid");
+
+
         for (Row row : rows) {
             String tsubmiteditmodelid = row.getString("tsubmiteditmodelid");
             if (editstatusrowsMap.containsKey(tsubmiteditmodelid)) {
@@ -68,6 +74,12 @@ public class submitedit extends Controller {
                 row.put("fisread", 0);
                 row.put("fissubmit", 0);
             }
+
+            if (editsubmitusercountrowsMap.containsKey(tsubmiteditmodelid)) {
+                row.put("fsubmitqty", editsubmitusercountrowsMap.get(tsubmiteditmodelid).get(0).getInteger("fsubmitqty"));
+            } else {
+                row.put("fsubmitqty", 0);
+            }
         }
         return getSucReturnObject().setDataByPaging(rows, sortfield).setFinalDo(DataPool.defaultdatalife, 1);
     }

src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报列表查询.sql

@@ -4,7 +4,6 @@ select t1.tsubmiteditmodelid,
        t1.fenddate,
        t1.checkdate,
        t1.frequireqty,
-       t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
        t1.fisnotlimittimes

src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报列表查询_提报人数查询.sql

@@ -0,0 +1,3 @@
+select t1.tsubmiteditmodelid,count(distinct t1.tenterprise_userid) as fsubmitqty from tsubmitedit t1
+where t1.siteid=$siteid$ and t1.tsubmiteditmodelid in $tsubmiteditmodelid$ and t1.fstatus='Ìá½»'
+group by t1.tsubmiteditmodelid

src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报管理主界面查询.sql

@@ -1,7 +1,7 @@
 select t3.fsaleruserid,
        t4.fname,
-       count(t2.tsubmiteditid)                              as frequireqty,
-       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
+       count(distinct t2.tenterprise_userid)                              as frequireqty,
+       count(distinct case when t2.fstatus = 'Ìá½»' then t2.tenterprise_userid  else null end) as fsubmitqty,
        t1.fnotes,
        t1.fbegdate,
        t1.fenddate,

src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报管理列表查询.sql

@@ -3,8 +3,8 @@ select t1.tsubmiteditmodelid,
        t1.fbegdate,
        t1.fenddate,
        t1.checkdate,
-       count(t2.tsubmiteditid)                         as frequireqty,
-       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
+       count(distinct t2.tenterprise_userid)                              as frequireqty,
+       count(distinct case when t2.fstatus = 'Ìá½»' then t2.tenterprise_userid  else null end) as fsubmitqty,
        t1.fisnotlimittimes
 from DSBCRM..tsubmiteditmodel t1
        inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid

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

@@ -60,6 +60,11 @@ public class submitedit extends Controller {
         editstatuslist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
         RowsMap editstatusrowsMap = dbConnect.runSqlQuery(editstatuslist).toRowsMap("tsubmiteditmodelid");
 
+        SQLFactory editsubmitusercountlist = new SQLFactory(this, "提报列表查询_提报人数查询");
+        editsubmitusercountlist.addParameter("siteid", siteid);
+        editsubmitusercountlist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
+        RowsMap editsubmitusercountrowsMap = dbConnect.runSqlQuery(editsubmitusercountlist).toRowsMap("tsubmiteditmodelid");
+
         for (Row row : rows) {
             String tsubmiteditmodelid = row.getString("tsubmiteditmodelid");
             if (editstatusrowsMap.containsKey(tsubmiteditmodelid)) {
@@ -69,6 +74,12 @@ public class submitedit extends Controller {
                 row.put("fisread", 0);
                 row.put("fissubmit", 0);
             }
+
+            if (editsubmitusercountrowsMap.containsKey(tsubmiteditmodelid)) {
+                row.put("fsubmitqty", editsubmitusercountrowsMap.get(tsubmiteditmodelid).get(0).getInteger("fsubmitqty"));
+            } else {
+                row.put("fsubmitqty", 0);
+            }
         }
         return getSucReturnObject().setDataByPaging(rows, sortfield).setFinalDo(DataPool.defaultdatalife, 1);
     }

src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报列表查询.sql

@@ -4,7 +4,6 @@ select t1.tsubmiteditmodelid,
        t1.fenddate,
        t1.checkdate,
        t1.frequireqty,
-       t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
        t1.fisnotlimittimes

src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报列表查询_提报人数查询.sql

@@ -0,0 +1,3 @@
+select t1.tsubmiteditmodelid,count(distinct t1.tenterprise_userid) as fsubmitqty from tsubmitedit t1
+where t1.siteid=$siteid$ and t1.tsubmiteditmodelid in $tsubmiteditmodelid$ and t1.fstatus='Ìá½»'
+group by t1.tsubmiteditmodelid

src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报管理主界面查询.sql

@@ -1,7 +1,7 @@
 select t3.fsaleruserid,
        t4.fname,
-       count(t2.tsubmiteditid)                              as frequireqty,
-       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
+       count(distinct t2.tenterprise_userid)                              as frequireqty,
+       count(distinct case when t2.fstatus = 'Ìá½»' then t2.tenterprise_userid  else null end) as fsubmitqty,
        t1.fnotes,
        t1.fbegdate,
        t1.fenddate,

src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报管理列表查询.sql

@@ -3,8 +3,8 @@ select t1.tsubmiteditmodelid,
        t1.fbegdate,
        t1.fenddate,
        t1.checkdate,
-       count(t2.tsubmiteditid)                         as frequireqty,
-       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
+       count(distinct t2.tenterprise_userid)                              as frequireqty,
+       count(distinct case when t2.fstatus = 'Ìá½»' then t2.tenterprise_userid  else null end) as fsubmitqty,
        t1.fisnotlimittimes
 from DSBCRM..tsubmiteditmodel t1
        inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid

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

@@ -60,6 +60,11 @@ public class submitedit extends Controller {
         editstatuslist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
         RowsMap editstatusrowsMap = dbConnect.runSqlQuery(editstatuslist).toRowsMap("tsubmiteditmodelid");
 
+        SQLFactory editsubmitusercountlist = new SQLFactory(this, "提报列表查询_提报人数查询");
+        editsubmitusercountlist.addParameter("siteid", siteid);
+        editsubmitusercountlist.addParameter_in("tsubmiteditmodelid", rows.toArray("tsubmiteditmodelid"));
+        RowsMap editsubmitusercountrowsMap = dbConnect.runSqlQuery(editsubmitusercountlist).toRowsMap("tsubmiteditmodelid");
+
         for (Row row : rows) {
             String tsubmiteditmodelid = row.getString("tsubmiteditmodelid");
             if (editstatusrowsMap.containsKey(tsubmiteditmodelid)) {
@@ -69,6 +74,12 @@ public class submitedit extends Controller {
                 row.put("fisread", 0);
                 row.put("fissubmit", 0);
             }
+
+            if (editsubmitusercountrowsMap.containsKey(tsubmiteditmodelid)) {
+                row.put("fsubmitqty", editsubmitusercountrowsMap.get(tsubmiteditmodelid).get(0).getInteger("fsubmitqty"));
+            } else {
+                row.put("fsubmitqty", 0);
+            }
         }
         return getSucReturnObject().setDataByPaging(rows, sortfield).setFinalDo(DataPool.defaultdatalife, 1);
     }