沈静伟：提报增加一事多报的形式

1：企业端新增提报接口增加是否允许多次提报字段fcanalwayssubmit
2：企业端、业务员web端、业务员手机端、经销商web端、经销商手机端查询提报模版接口新增多次提报字段fcanalwayssubmit

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

@@ -6,7 +6,8 @@ select t1.ftitle,
        t2.tsubmiteditid,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 inner join tsubmitedit t2
                  on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$

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

@@ -8,7 +8,8 @@ select t1.tsubmiteditmodelid,
        t2.fisread,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 inner join tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$

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

@@ -6,7 +6,8 @@ select t1.ftitle,
        t2.tsubmiteditid,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 inner join tsubmitedit t2
                  on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$

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

@@ -8,7 +8,8 @@ select t1.tsubmiteditmodelid,
        t2.fisread,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 inner join tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$

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

@@ -6,7 +6,8 @@ select t1.ftitle,
        t2.tsubmiteditid,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 inner join tsubmitedit t2
                  on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$

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

@@ -8,7 +8,8 @@ select t1.tsubmiteditmodelid,
        t2.fisread,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
        inner join tsubmitedit t2
                  on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$

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

@@ -5,10 +5,11 @@ select t3.fsaleruserid,
        t1.fnotes,
        t1.fbegdate,
        t1.fenddate,
-       t1.ftitle
+       t1.ftitle,
+       t1.fcanalwayssubmit
 from DSBCRM..tsubmiteditmodel t1
        inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid
        inner join DSBCRM..tagents t3 on t2.siteid = t3.siteid and t2.tagentsid = t3.tagentsid
        inner join DSBCRM..tenterprise_users t4 on t3.siteid = t4.siteid and t3.fsaleruserid = t4.tenterprise_userid
 where t1.siteid =$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$ and t3.fsaleruserid in $fsaleruserid$
-group by t3.fsaleruserid, t4.fname,t1.fnotes,t1.fbegdate,t1.fenddate,t1.ftitle
+group by t3.fsaleruserid, t4.fname,t1.fnotes,t1.fbegdate,t1.fenddate,t1.ftitle,t1.fcanalwayssubmit

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

@@ -4,7 +4,8 @@ select t1.tsubmiteditmodelid,
        t1.fenddate,
        t1.checkdate,
        count(t2.tsubmiteditid)                         as frequireqty,
-       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty
+       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
+       t1.fcanalwayssubmit
 from DSBCRM..tsubmiteditmodel t1
        inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid
        inner join DSBCRM..tagents t3 on t2.siteid=t3.siteid and t2.tagentsid=t3.tagentsid
@@ -12,4 +13,4 @@ where t1.fstatus = '
   and t1.siteid =$siteid$
   and (t3.fsaleruserid in $tenterprise_userid$
 )
-group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate
+group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate,t1.fcanalwayssubmit

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

@@ -6,7 +6,8 @@ select t1.ftitle,
        t2.tsubmiteditid,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 inner join tsubmitedit t2
                  on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$

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

@@ -8,7 +8,8 @@ select t1.tsubmiteditmodelid,
        t2.fisread,
        case when t2.fstatus = 'Ìá½»' then 1 else 0 end        as fissubmit,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
        inner join tsubmitedit t2
                  on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid and t2.tenterprise_userid =$tenterprise_userid$

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

@@ -5,10 +5,11 @@ select t3.fsaleruserid,
        t1.fnotes,
        t1.fbegdate,
        t1.fenddate,
-       t1.ftitle
+       t1.ftitle,
+       t1.fcanalwayssubmit
 from DSBCRM..tsubmiteditmodel t1
        inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid
        inner join DSBCRM..tagents t3 on t2.siteid = t3.siteid and t2.tagentsid = t3.tagentsid
        inner join DSBCRM..tenterprise_users t4 on t3.siteid = t4.siteid and t3.fsaleruserid = t4.tenterprise_userid
 where t1.siteid =$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$ and t3.fsaleruserid in $fsaleruserid$
-group by t3.fsaleruserid, t4.fname,t1.fnotes,t1.fbegdate,t1.fenddate,t1.ftitle
+group by t3.fsaleruserid, t4.fname,t1.fnotes,t1.fbegdate,t1.fenddate,t1.ftitle,t1.fcanalwayssubmit

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

@@ -4,7 +4,8 @@ select t1.tsubmiteditmodelid,
        t1.fenddate,
        t1.checkdate,
        count(t2.tsubmiteditid)                         as frequireqty,
-       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty
+       sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
+       t1.fcanalwayssubmit
 from DSBCRM..tsubmiteditmodel t1
        inner join DSBCRM..tsubmitedit t2 on t1.siteid = t2.siteid and t1.tsubmiteditmodelid = t2.tsubmiteditmodelid
        inner join DSBCRM..tagents t3 on t2.siteid=t3.siteid and t2.tagentsid=t3.tagentsid
@@ -12,4 +13,4 @@ where t1.fstatus = '
   and t1.siteid =$siteid$
   and (t3.fsaleruserid in $tenterprise_userid$
 )
-group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate
+group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate,t1.fcanalwayssubmit

src/dsb/com/cnd3b/restcontroller/enterprise/webclient/submitedit/SQL/提报主界面查询.sql

@@ -13,6 +13,7 @@ select t1.tsubmiteditmodelid,
        t1.changeby,
        t1.changedate,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 where t1.siteid =$siteid$ and tsubmiteditmodelid=$tsubmiteditmodelid$

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

@@ -13,6 +13,7 @@ select t1.tsubmiteditmodelid,
        t1.changeby,
        t1.changedate,
        t1.fisattrequired,
-       t1.fistextrequired
+       t1.fistextrequired,
+       t1.fcanalwayssubmit
 from tsubmiteditmodel t1
 where t1.siteid=$siteid$ and $where$

src/dsb/com/cnd3b/restcontroller/enterprise/webclient/submitedit/submitedit.java

@@ -35,6 +35,7 @@ public class submitedit extends Controller {
         String fnotes = content.getString("fnotes", "tsubmiteditmodel.fnotes", "提报要求");//提报要求
         boolean fisattrequired = content.getBoolean("fisattrequired");//附件必填
         boolean fistextrequired = content.getBoolean("fistextrequired");//文字必填
+        boolean fcanalwayssubmit = content.getBooleanValue("fcanalwayssubmit");//是否允许一事多报
 
         PaoSetRemote tsubmiteditmodelSet = getP2ServerSystemPaoSet("tsubmiteditmodel", "siteid='" + siteid + "' and tsubmiteditmodelid='" + tsubmiteditmodelid + "'");
         PaoRemote tsubmiteditmodel = null;
@@ -47,6 +48,7 @@ public class submitedit extends Controller {
         } else {
             tsubmiteditmodel = tsubmiteditmodelSet.getPao(0);
         }
+        tsubmiteditmodel.setValue("fcanalwayssubmit", fcanalwayssubmit, 11L);//是否允许一事多报
         tsubmiteditmodel.setValue("ftitle", ftitle, 11L);//标题
         tsubmiteditmodel.setValue("fbegdate", fbegdate, 11L);//开始时间
         tsubmiteditmodel.setValue("fenddate", fenddate, 11L);//结束时间