浏览代码

添加字段

hu 1 月之前
父节点
当前提交
abff49073a

+ 1 - 1
src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单模板明细列表查询.sql

@@ -1 +1 @@
-SELECT t1.*,t2.workname,t2.remarks,t2.additem, t2.itemtype,t2.contractupload,t2.fileupload,t2.textedit,t2.confirm,t2.confirm_options,t2.amountpay,t2.required,t2.signature FROM sa_workorder_template_works t1 left join sa_workpreset t2 on t2.sa_workpresetid=t1.sa_workpresetid and  t1.siteid=t2.siteid where t1.siteid=$siteid$ and t1.sa_workorder_templateid=$sa_workorder_templateid$  and t1.parentid=$parentid$  and $where$
+SELECT t1.*,t2.workname,t2.remarks,t2.additem, t2.itemtype,t2.contractupload,t2.fileupload,t2.textedit,t2.confirm,t2.confirm_options,t2.amountpay,t2.required,t2.signature,t2.passcheck,t2.questionedit  FROM sa_workorder_template_works t1 left join sa_workpreset t2 on t2.sa_workpresetid=t1.sa_workpresetid and  t1.siteid=t2.siteid where t1.siteid=$siteid$ and t1.sa_workorder_templateid=$sa_workorder_templateid$  and t1.parentid=$parentid$  and $where$

+ 2 - 2
src/custom/restcontroller/webmanage/sale/workorder/workorderTemplateWorks.java

@@ -82,7 +82,7 @@ public class workorderTemplateWorks extends Controller{
 		 * 查询所有指定工单模板的服务工单模板明细
 		 */
 		Rows allrows = dbConnect.runSqlQuery(
-				"SELECT t1.*,t2.workname,t2.remarks,t2.additem, t2.itemtype,t2.contractupload,t2.fileupload,t2.textedit,t2.confirm,t2.confirm_options,t2.amountpay,t2.required,t2.signature FROM sa_workorder_template_works t1 left join sa_workpreset t2 on t2.sa_workpresetid=t1.sa_workpresetid and  t1.siteid=t2.siteid where t1.siteid='"
+				"SELECT t1.*,t2.workname,t2.remarks,t2.additem, t2.itemtype,t2.contractupload,t2.fileupload,t2.textedit,t2.confirm,t2.confirm_options,t2.amountpay,t2.required,t2.signature,t2.passcheck,t2.questionedit FROM sa_workorder_template_works t1 left join sa_workpreset t2 on t2.sa_workpresetid=t1.sa_workpresetid and  t1.siteid=t2.siteid where t1.siteid='"
 						+ siteid + "' and t1.sa_workorder_templateid ="+sa_workorder_templateid);
 		/*
 		 * 获取所有一级分类
@@ -132,7 +132,7 @@ public class workorderTemplateWorks extends Controller{
 	 * 递归查询下级服务工单模板明细
 	 *
 	 * @param root
-	 * @param allDepartments
+	 * @param
 	 * @return
 	 */
 	private Rows getSubWorkorderTemplate(Row root, Rows allWorkorderTemplate) {