订单审核发送邮件时带上订单备注

.gitignore

@@ -1,3 +1,3 @@
 /classes/
 /.idea/
-/customapps.iml
+/customapps.iml

src/apps/saorder/saorder.java

@@ -796,7 +796,7 @@ public class saorder extends BaseSaorder {
             sql.append("inner join titem t3 on t2.fitemno=t3.fitemno and t2.siteid=t3.siteid ");
             sql.append("inner join titem_ration t4 on t3.fitemno=t4.fitemno and t2.siteid and t4.siteid ");
             sql.append("inner join tration t5 on t4.frationnum=t5.frationnum and t4.siteid=t5.siteid ");
-            sql.append("where t1.fsonum='" + getString("fsonum") + "' and t1.siteid='"+getString("siteid")+"' and t2.fisration=0 and t3.fisrationmag=1 ");
+            sql.append("where t1.fsonum='" + getString("fsonum") + "' and t1.siteid='" + getString("siteid") + "' and t2.fisration=0 and t3.fisrationmag=1 ");
             sql.append("and t5.fstatus='审核' ");
             sql.append("and (t5.fagentauthors=1 or exists(select *from tagents_ration where frationnum=t5.frationnum and fagentnum=t1.fagentnum))");
 
@@ -824,7 +824,7 @@ public class saorder extends BaseSaorder {
                 sql2.append("select t2.frownum,t2.fitemno from saorder t1 ");
                 sql2.append("inner join saorderdetail t2 on t1.saorderid=t2.fparentid ");
                 sql2.append("inner join titem t3 on t2.fitemno=t3.fitemno and t2.siteid=t3.siteid ");
-                sql2.append("where t1.fsonum='" + getString("fsonum") + "' and t1.siteid='"+getString("siteid")+"' and t3.fisonsale=0 and t1.ftype !='特殊订单'");
+                sql2.append("where t1.fsonum='" + getString("fsonum") + "' and t1.siteid='" + getString("siteid") + "' and t3.fisonsale=0 and t1.ftype !='特殊订单'");
                 ArrayList<HashMap<String, Object>> list2 = runQuerySQL(sql2.toString());
                 if (!list2.isEmpty()) {
                     int frownum = (int) list2.get(0).get("frownum");
@@ -1599,22 +1599,22 @@ public class saorder extends BaseSaorder {
             try {
                 if ("NB".equals(getString("siteid"))) {
                     //业务员邮件提醒
-                    sendReportByEmail(getMailByHrId(getString("fsaler")), "NB_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
+                    sendReportByEmail(getMailByHrId(getString("fsaler")), "NB_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
                     //根据领域不同发送邮件给对应的小组
-                    sendReportByEmail(getMailByHrGroup("NB1007", getString("fieldname")), "NB_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
-                    sendReportByEmail(getMailByHrGroup_Brand("NB1008", getString("fbrand")), "NB_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
+                    sendReportByEmail(getMailByHrGroup("NB1007", getString("fieldname")), "NB_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
+                    sendReportByEmail(getMailByHrGroup_Brand("NB1008", getString("fbrand")), "NB_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
                 } else if ("TZ".equals(getString("siteid"))) {
                     //业务员邮件提醒
-                    sendReportByEmail(getMailByHrId(getString("fsaler")), "TZ_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
+                    sendReportByEmail(getMailByHrId(getString("fsaler")), "TZ_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
                     //根据领域不同发送邮件给对应的小组
-                    sendReportByEmail(getMailByHrGroup("TZ1007", getString("fieldname")), "TZ_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
-                    sendReportByEmail(getMailByHrGroup_Brand("TZ1008", getString("fbrand")), "TZ_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
+                    sendReportByEmail(getMailByHrGroup("TZ1007", getString("fieldname")), "TZ_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
+                    sendReportByEmail(getMailByHrGroup_Brand("TZ1008", getString("fbrand")), "TZ_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
                 } else if ("HY".equals(getString("siteid"))) {
                     //业务员邮件提醒
-                    sendReportByEmail(getMailByHrId(getString("fsaler")), "HY_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
+                    sendReportByEmail(getMailByHrId(getString("fsaler")), "HY_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
                     //根据领域不同发送邮件给对应的小组
-                    sendReportByEmail(getMailByHrGroup("HY1007", getString("fieldname")), "HY_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
-                    sendReportByEmail(getMailByHrGroup_Brand("TZ1008", getString("fbrand")), "HY_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum"));
+                    sendReportByEmail(getMailByHrGroup("HY1007", getString("fieldname")), "HY_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
+                    sendReportByEmail(getMailByHrGroup_Brand("TZ1008", getString("fbrand")), "HY_SAORDERDETAIL", "where=saorder.saorderid=" + getUniqueIDValue(), getString("FAGENTSHORTNAME") + "《" + getString("ftype") + "》已审核；订单号：" + getString("fsonum") + "；订单备注:" + getString("fnotes"));
                 }
             } catch (Exception e) {
                 e.printStackTrace();