企业财务信息新增有效期enddate字段进行过滤控制

src/custom/restcontroller/webmanage/sale/enterprisefinance/EnterpriseFinance.java

@@ -11,6 +11,7 @@ import common.data.QuerySQL;
 import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
+import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
 import java.util.ArrayList;
@@ -41,6 +42,7 @@ public class EnterpriseFinance extends Controller {
         String phonenumber = content.getStringValue("phonenumber");
         String remarks = content.getStringValue("remarks");
         String invoicetype = content.getStringValue("invoicetype");
+        String enddate = content.getStringValue("enddate");
         boolean isdefault = content.getBooleanValue("isdefault");
 
         ArrayList<String> sqlList = new ArrayList<>();
@@ -67,6 +69,11 @@ public class EnterpriseFinance extends Controller {
         sqlFactory.addParameter("remarks", remarks);
         sqlFactory.addParameter("isdefault", isdefault);
         sqlFactory.addParameter("invoicetype", invoicetype);
+        if(StringUtils.isBlank("enddate")){
+            sqlFactory.addParameter("enddate", "null");
+        }else{
+            sqlFactory.addParameter("enddate", enddate);
+        }
 
         sqlList.add(sqlFactory.getSQL());
 
@@ -159,6 +166,11 @@ public class EnterpriseFinance extends Controller {
                 where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.getBooleanValue("iseffective")) {
+                where.append(" and(");
+                where.append("(ifnull(enddate,'')='' or enddate >=CURRENT_DATE)");
+                where.append(")");
+            }
 
         }
 

src/custom/restcontroller/webmanage/sale/enterprisefinance/SQL/财务信息新增.sql

@@ -1,4 +1,4 @@
 insert into sys_enterprise_finance (siteid, sys_enterprise_financeid, changeuserid, sys_enterpriseid, enterprisename,
-                                    taxno, bank, bankcardno, address, phonenumber, remarks, isdefault,invoicetype)
+                                    taxno, bank, bankcardno, address, phonenumber, remarks, isdefault,invoicetype,enddate)
 values ($siteid$, $sys_enterprise_financeid$, $userid$, $sys_enterpriseid$, $enterprisename$, $taxno$, $bank$,
-        $bankcardno$, $address$, $phonenumber$, $remarks$, $isdefault$,$invoicetype$);
+        $bankcardno$, $address$, $phonenumber$, $remarks$, $isdefault$,$invoicetype$,$enddate$);

src/custom/restcontroller/webmanage/sale/enterprisefinance/SQL/财务信息更新.sql

@@ -9,7 +9,8 @@ SET changeuserid=$userid$,
     phonenumber = $phonenumber$,
     remarks = $remarks$,
     isdefault = $isdefault$,
-    invoicetype=$invoicetype$
+    invoicetype=$invoicetype$,
+    enddae=$enddae$
 WHERE sys_enterprise_financeid = $sys_enterprise_financeid$
   and siteid = $siteid$