Merge remote-tracking branch 'origin/develop' into develop

src/custom/beans/accountbalance/Accountbalance.java

@@ -152,6 +152,12 @@ public class Accountbalance extends BaseClass {
                 balance = newbalance;
             }
             sqlFactory.addParameter("balance", balance);
+            Rows accountclassrows =controller.dbConnect.runSqlQuery("select * from sa_accountclass where siteid='"+controller.siteid+"' and  sa_accountclassid="+sa_accountclassid);
+            if(!accountclassrows.isEmpty()){
+                String content = "您的"+accountclassrows.get(0).getString("accountname")+"已收入【"+cashbillEntity.getAmount()+"】元";
+                new Accountbalance().sendMsg(controller, content, cashbillEntity.getOwnerid(), sys_enterpriseid);
+            }
+
         } else {
             sqlFactory.addParameter("status", "新建");
             sqlFactory.addParameter("checkby", "null");
@@ -159,8 +165,7 @@ public class Accountbalance extends BaseClass {
             sqlFactory.addParameter("balance", 0);
         }
         sqlList.add(sqlFactory.getSQL());
-        String content = "您有一项来自【" + cashbillEntity.getSource() + "】金额为" + cashbillEntity.getAmount() + "的【收入】凭证";
-        new Accountbalance().sendMsg(controller, content, cashbillEntity.getOwnerid(), sys_enterpriseid);
+
         return sqlList;
     }
 
@@ -229,6 +234,11 @@ public class Accountbalance extends BaseClass {
                 balance = newbalance;
             }
             sqlFactory.addParameter("balance", balance);
+            Rows accountclassrows =controller.dbConnect.runSqlQuery("select * from sa_accountclass where siteid='"+controller.siteid+"' and  sa_accountclassid="+sa_accountclassid);
+            if(!accountclassrows.isEmpty()){
+                String content = "您的"+accountclassrows.get(0).getString("accountname")+"已支出【"+cashbillEntity.getAmount()+"】元";
+                new Accountbalance().sendMsg(controller, content, cashbillEntity.getOwnerid(), sys_enterpriseid);
+            }
         } else {
             sqlFactory.addParameter("status", "新建");
             sqlFactory.addParameter("checkby", "");
@@ -236,8 +246,6 @@ public class Accountbalance extends BaseClass {
             sqlFactory.addParameter("balance", 0);
         }
         sqlList.add(sqlFactory.getSQL());
-        String content = "您有一项来自【" + cashbillEntity.getSource() + "】金额为" + cashbillEntity.getAmount() + "的【支出】凭证";
-        new Accountbalance().sendMsg(controller, content, cashbillEntity.getOwnerid(), sys_enterpriseid);
         return sqlList;
     }
 
@@ -296,6 +304,11 @@ public class Accountbalance extends BaseClass {
                 balance = newbalance;
             }
             sqlFactory.addParameter("balance", balance);
+            Rows accountclassrows =controller.dbConnect.runSqlQuery("select * from sa_accountclass where siteid='"+controller.siteid+"' and  sa_accountclassid="+sa_accountclassid);
+            if(!accountclassrows.isEmpty()){
+                String content = "您的"+accountclassrows.get(0).getString("accountname")+"已支出【"+cashbillEntity.getAmount()+"】元";
+                new Accountbalance().sendMsg(controller, content, cashbillEntity.getOwnerid(), sys_enterpriseid);
+            }
         } else {
             sqlFactory.addParameter("status", "新建");
             sqlFactory.addParameter("checkby", "");
@@ -303,8 +316,6 @@ public class Accountbalance extends BaseClass {
             sqlFactory.addParameter("balance", 0);
         }
         sqlList.add(sqlFactory.getSQL());
-        String content = "您有一项来自【" + cashbillEntity.getSource() + "】金额为" + cashbillEntity.getAmount() + "的【支出】凭证";
-        new Accountbalance().sendMsg(controller, content, cashbillEntity.getOwnerid(), sys_enterpriseid);
         return sqlList;
     }