Ver Fonte

一事多报字段fcanalwayssubmit调整为fisnotlimittimes

沈静伟 há 4 anos atrás
pai
commit
5a1e582f85
19 ficheiros alterados com 36 adições e 36 exclusões
  1. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/agentclient/mainpage/submitedit/SQL/提报主界面查询.sql
  2. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/agentclient/mainpage/submitedit/SQL/提报列表查询.sql
  3. 2 2
      src/dsb/com/cnd3b/restcontroller/enterprise/agentclient/mainpage/submitedit/submitedit.java
  4. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/agentwebclient/mainpage/submitedit/SQL/提报主界面查询.sql
  5. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/agentwebclient/mainpage/submitedit/SQL/提报列表查询.sql
  6. 2 2
      src/dsb/com/cnd3b/restcontroller/enterprise/agentwebclient/mainpage/submitedit/submitedit.java
  7. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报主界面查询.sql
  8. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报列表查询.sql
  9. 2 2
      src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报管理主界面查询.sql
  10. 2 2
      src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/SQL/提报管理列表查询.sql
  11. 4 4
      src/dsb/com/cnd3b/restcontroller/enterprise/salerclient/mainpage/submitedit/submitedit.java
  12. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报主界面查询.sql
  13. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报列表查询.sql
  14. 2 2
      src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报管理主界面查询.sql
  15. 2 2
      src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/SQL/提报管理列表查询.sql
  16. 4 4
      src/dsb/com/cnd3b/restcontroller/enterprise/salerwebclient/mainpage/submitedit/submitedit.java
  17. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/webclient/submitedit/SQL/提报主界面查询.sql
  18. 1 1
      src/dsb/com/cnd3b/restcontroller/enterprise/webclient/submitedit/SQL/提报列表查询.sql
  19. 6 6
      src/dsb/com/cnd3b/restcontroller/enterprise/webclient/submitedit/submitedit.java

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

@@ -4,7 +4,7 @@ select t1.ftitle,
        t1.fnotes,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit,
+       t1.fisnotlimittimes,
        t1.tsubmiteditmodelid
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$

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

@@ -7,7 +7,7 @@ select t1.tsubmiteditmodelid,
        t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and $where$
 and exists(select * from tsubmitedit where siteid=$siteid$ and tsubmiteditmodelid=t1.tsubmiteditmodelid and tenterprise_userid=$tenterprise_userid$)

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

@@ -41,9 +41,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }

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

@@ -4,7 +4,7 @@ select t1.ftitle,
        t1.fnotes,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit,
+       t1.fisnotlimittimes,
        t1.tsubmiteditmodelid
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$

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

@@ -7,7 +7,7 @@ select t1.tsubmiteditmodelid,
        t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and $where$
 and exists(select * from tsubmitedit where siteid=$siteid$ and tsubmiteditmodelid=t1.tsubmiteditmodelid and tenterprise_userid=$tenterprise_userid$)

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

@@ -41,9 +41,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }

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

@@ -4,7 +4,7 @@ select t1.ftitle,
        t1.fnotes,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit,
+       t1.fisnotlimittimes,
        t1.tsubmiteditmodelid
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$

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

@@ -7,7 +7,7 @@ select t1.tsubmiteditmodelid,
        t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and $where$
 and exists(select * from tsubmitedit where siteid=$siteid$ and tsubmiteditmodelid=t1.tsubmiteditmodelid and tenterprise_userid=$tenterprise_userid$)

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

@@ -6,10 +6,10 @@ select t3.fsaleruserid,
        t1.fbegdate,
        t1.fenddate,
        t1.ftitle,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 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,t1.fcanalwayssubmit
+group by t3.fsaleruserid, t4.fname,t1.fnotes,t1.fbegdate,t1.fenddate,t1.ftitle,t1.fisnotlimittimes

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

@@ -5,7 +5,7 @@ select t1.tsubmiteditmodelid,
        t1.checkdate,
        count(t2.tsubmiteditid)                         as frequireqty,
        sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 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
@@ -13,4 +13,4 @@ where t1.fstatus = '
   and t1.siteid =$siteid$
   and (t3.fsaleruserid in $tenterprise_userid$
 ) and $where$
-group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate,t1.fcanalwayssubmit
+group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate,t1.fisnotlimittimes

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

@@ -42,9 +42,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }
@@ -209,9 +209,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }

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

@@ -4,7 +4,7 @@ select t1.ftitle,
        t1.fnotes,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit,
+       t1.fisnotlimittimes,
        t1.tsubmiteditmodelid
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and t1.tsubmiteditmodelid=$tsubmiteditmodelid$

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

@@ -7,7 +7,7 @@ select t1.tsubmiteditmodelid,
        t1.fsubmitqty,
        t1.fisattrequired,
        t1.fistextrequired,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 from tsubmiteditmodel t1
 where t1.fstatus='·¢²¼' and t1.siteid=$siteid$ and $where$
 and exists(select * from tsubmitedit where siteid=$siteid$ and tsubmiteditmodelid=t1.tsubmiteditmodelid and tenterprise_userid=$tenterprise_userid$)

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

@@ -6,10 +6,10 @@ select t3.fsaleruserid,
        t1.fbegdate,
        t1.fenddate,
        t1.ftitle,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 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,t1.fcanalwayssubmit
+group by t3.fsaleruserid, t4.fname,t1.fnotes,t1.fbegdate,t1.fenddate,t1.ftitle,t1.fisnotlimittimes

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

@@ -5,7 +5,7 @@ select t1.tsubmiteditmodelid,
        t1.checkdate,
        count(t2.tsubmiteditid)                         as frequireqty,
        sum(case when t2.fstatus = 'Ìá½»' then 1 else 0 end) as fsubmitqty,
-       t1.fcanalwayssubmit
+       t1.fisnotlimittimes
 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
@@ -13,4 +13,4 @@ where t1.fstatus = '
   and t1.siteid =$siteid$
   and (t3.fsaleruserid in $tenterprise_userid$
 ) and $where$
-group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate,t1.fcanalwayssubmit
+group by t1.tsubmiteditmodelid, t1.ftitle, t1.fbegdate, t1.fenddate, t1.checkdate,t1.fisnotlimittimes

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

@@ -42,9 +42,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }
@@ -209,9 +209,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }

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

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

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

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

+ 6 - 6
src/dsb/com/cnd3b/restcontroller/enterprise/webclient/submitedit/submitedit.java

@@ -33,9 +33,9 @@ public class submitedit extends Controller {
         Date fbegdate = content.getDate("fbegdate");//开始时间
         Date fenddate = content.getDate("fenddate");//结束时间
         String fnotes = content.getString("fnotes", "tsubmiteditmodel.fnotes", "提报要求");//提报要求
-        boolean fisattrequired = content.getBoolean("fisattrequired");//附件必填
-        boolean fistextrequired = content.getBoolean("fistextrequired");//文字必填
-        boolean fcanalwayssubmit = content.getBooleanValue("fcanalwayssubmit");//是否允许一事多报
+        boolean fisattrequired = content.getBooleanValue("fisattrequired");//附件必填
+        boolean fistextrequired = content.getBooleanValue("fistextrequired");//文字必填
+        boolean fisnotlimittimes = content.getBooleanValue("fisnotlimittimes");//是否允许一事多报
 
         PaoSetRemote tsubmiteditmodelSet = getP2ServerSystemPaoSet("tsubmiteditmodel", "siteid='" + siteid + "' and tsubmiteditmodelid='" + tsubmiteditmodelid + "'");
         PaoRemote tsubmiteditmodel = null;
@@ -48,7 +48,7 @@ public class submitedit extends Controller {
         } else {
             tsubmiteditmodel = tsubmiteditmodelSet.getPao(0);
         }
-        tsubmiteditmodel.setValue("fcanalwayssubmit", fcanalwayssubmit, 11L);//是否允许一事多报
+        tsubmiteditmodel.setValue("fisnotlimittimes", fisnotlimittimes, 11L);//是否允许一事多报
         tsubmiteditmodel.setValue("ftitle", ftitle, 11L);//标题
         tsubmiteditmodel.setValue("fbegdate", fbegdate, 11L);//开始时间
         tsubmiteditmodel.setValue("fenddate", fenddate, 11L);//结束时间
@@ -120,9 +120,9 @@ public class submitedit extends Controller {
                 where.append("t1.ftitle like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("fcanalwayssubmit") && !"".equals(whereObject.getString("fcanalwayssubmit"))) {
+            if (whereObject.containsKey("fisnotlimittimes") && !"".equals(whereObject.getString("fisnotlimittimes"))) {
                 where.append(" and(");
-                where.append("t1.fcanalwayssubmit ='").append(whereObject.getString("fcanalwayssubmit")).append("' ");
+                where.append("t1.fisnotlimittimes ='").append(whereObject.getString("fisnotlimittimes")).append("' ");
                 where.append(")");
             }
         }