新增sql输出测试

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/MyHyconfirmationorder.java

@@ -73,10 +73,10 @@ public class MyHyconfirmationorder extends Controller {
 					remote.setValue("FISPRODUCT", pao.getBoolean("FISTITEM"),11l);
 					remote.setValue("FISSHELFLIFE", pao.getBoolean("FISPERIOD"),11l);
 					if(!rowsMap.get("2_1").isEmpty() && rowsMap.get("2_1").get(0).getString("ftext")!=null &&rowsMap.get("2_1").get(0).getString("ftext").length()!=0) {
-						remote.setValue("fnotes", "2-1 确认是否可以在线维修、调试？"+rowsMap.get("2_1").get(0).getString("ftext"),11l);
+						remote.setValue("fnotes", rowsMap.get("2_1").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("2_2").isEmpty() && rowsMap.get("2_2").get(0).getString("ftext")!=null &&rowsMap.get("2_2").get(0).getString("ftext").length()!=0) {
-						remote.setValue("fnotes2", "2-2 确认是否需要拆卸配件或整拆？（返厂）"+rowsMap.get("2_2").get(0).getString("ftext"),11l);
+						remote.setValue("fnotes2", rowsMap.get("2_2").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("2_3").isEmpty() && rowsMap.get("2_3").get(0).getString("ftext")!=null &&rowsMap.get("2_3").get(0).getString("ftext").length()!=0) {
 						remote.setValue("TREATMENTMEASURES", rowsMap.get("2_3").get(0).getString("ftext"),11l);

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/HyWorkOrder.java

@@ -430,12 +430,18 @@ public class HyWorkOrder extends Controller {
 						+ where.getString("frownum") + "'");
 
 				/** 节点关联培训物料查询 **/
+				System.err.println("select t.fitemno,t.fitemname,t.fmodel,t.fspec,t.fqty  from HYORDERNODE_TITEM t left join titem t2 on t.fitemno=t2.fitemno and t.siteid=t2.siteid\n"
+						+ "where EXISTS(select 1 from hyordernode t1 where t1.hyordernodeid=t.fparentid and t1.hyordernodeid="
+						+ rowdetail.getInteger("ownerid") + ") and t.siteid='" + siteid + "'");
 				Rows rows_traintitem = dbConnect.runSqlQuery(
 						"select t.fitemno,t.fitemname,t.fmodel,t.fspec,t.fqty  from HYORDERNODE_TITEM t left join titem t2 on t.fitemno=t2.fitemno and t.siteid=t2.siteid\n"
 								+ "where EXISTS(select 1 from hyordernode t1 where t1.hyordernodeid=t.fparentid and t1.hyordernodeid="
 								+ rowdetail.getInteger("ownerid") + ") and t.siteid='" + siteid + "'");
 
 				/** 节点关联培训人员查询 **/
+				System.err.println("select t.fname,t.job,t.phone,t.fagentnum,t2.fagentshortname  from HYORDERNODE_trainers t left join tagents t2 on t.fagentnum=t2.fagentnum and t.siteid=t2.siteid\n"
+						+ "where EXISTS(select 1 from hyordernode t1 where t1.hyordernodeid=t.fparentid and t1.hyordernodeid="
+						+ rowdetail.getInteger("ownerid") + ") and t.siteid='" + siteid + "'");
 				Rows rows_trainers = dbConnect.runSqlQuery(
 						"select t.fname,t.job,t.phone,t.fagentnum,t2.fagentshortname  from HYORDERNODE_trainers t left join tagents t2 on t.fagentnum=t2.fagentnum and t.siteid=t2.siteid\n"
 								+ "where EXISTS(select 1 from hyordernode t1 where t1.hyordernodeid=t.fparentid and t1.hyordernodeid="