工单更新优化

src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -481,7 +481,7 @@ public class serviceorder extends Controller {
         sqlFactory.addParameter("reason", rows.get(0).getString("reason"));
         sqlFactory.addParameter("address", rows.get(0).getString("address"));
         sqlFactory.addParameter("isouritem", 1);
-        sqlFactory.addParameter("startdate", StringUtils.isBlank(rows.get(0).getString("begdate")) ? rows.get(0).getString("billdate") : rows.get(0).getString("begdate"));
+        sqlFactory.addParameter("startdate", StringUtils.isBlank(rows.get(0).getString("begdate")) ? (StringUtils.isBlank(rows.get(0).getString("billdate"))?"NULL":rows.get(0).getString("billdate")) : rows.get(0).getString("begdate"));
         sqlFactory.addParameter("scenecontact", rows.get(0).getString("scenecontact"));
         sqlFactory.addParameter("scenecontactrole", rows.get(0).getString("scenecontactrole"));
         sqlFactory.addParameter("scenecontactphonenumber", rows.get(0).getString("scenecontactphonenumber"));

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单更新.sql

@@ -12,7 +12,8 @@ SET
     scenecontactrole = $scenecontactrole$,
     scenecontactphonenumber = $scenecontactphonenumber$,
     isouritem = $isouritem$,
-    remarks = $remarks$
+    remarks = $remarks$,
+    type=$type$
 WHERE sa_workorderid = $sa_workorderid$ and siteid=$siteid$
 
 

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -96,6 +96,12 @@ public class workorder extends Controller {
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("userid", userid);
         sqlFactory.addParameter("username", username);
+        sqlFactory.addParameter("type", servicetype);
+
+        Rows templaterows = dbConnect.runSqlQuery(" select *from sa_workorder_template where type='"+servicetype+"' and siteid='"+siteid+"'");
+        if(templaterows.isNotEmpty()){
+            sa_workorder_templateid=templaterows.get(0).getLong("sa_workorder_templateid");
+        }
         sqlFactory.addParameter("sa_workorder_templateid", sa_workorder_templateid);
         // 判断当前模板id与数据库中sa_workorder_templateid是否一致，不一致 则删除 工单节点明细重新添加
         if (sa_workorder_templateid != rows.get(0).getLong("sa_workorder_templateid")) {