工单节点查询新增服务价格及服务确认单带入价格更新

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

@@ -87,8 +87,8 @@ public class MyHyconfirmationorder extends Controller {
 					if(!rowsMap.get("3_1").isEmpty()) {
 						remote.setValue("fispaid", rowsMap.get("3_1").get(0).getString("fpaid"),11l);
 					}
-					if(!rowsMap.get("3_1").isEmpty() && rowsMap.get("3_1").get(0).getString("ftext")!=null &&rowsMap.get("3_1").get(0).getString("ftext").length()!=0) {
-						remote.setValue("FAMOUNT", rowsMap.get("3_1").get(0).getString("ftext"),11l);
+					if(!rowsMap.get("3_1").isEmpty() && rowsMap.get("3_1").get(0).getString("serverprice")!=null &&rowsMap.get("3_1").get(0).getString("serverprice").length()!=0) {
+						remote.setValue("FAMOUNT", rowsMap.get("3_1").get(0).getString("serverprice"),11l);
 					}
 					if(!rowsMap.get("3_3").isEmpty() && rowsMap.get("3_3").get(0).getString("ftext")!=null &&rowsMap.get("3_3").get(0).getString("ftext").length()!=0) {
 						remote.setValue("RESULT", rowsMap.get("3_3").get(0).getString("ftext"));

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/SQL/工单节点明细查询.sql

@@ -1,4 +1,4 @@
-select convert(varchar,t1.frownum)+'_'+convert(varchar,t2.frownum) frownum,ftext,fpaid from 
+select convert(varchar,t1.frownum)+'_'+convert(varchar,t2.frownum) frownum,ftext,fpaid,serverprice from 
 (select ROW_NUMBER() OVER (ORDER BY frownum) AS frownum,hyordernodeid from HYORDERNODE where fparentid=$hyworkorderid$ and oneprocessname is not null and  siteid=$siteid$) t1 
 inner join 
-(select dense_rank() over(partition by supid order by frownum) AS frownum,ftext,supid,hyordernodeid,fpaid from HYORDERNODE where fparentid=$hyworkorderid$ and supid is not null and siteid=$siteid$) t2 on t1.hyordernodeid=t2.supid
+(select dense_rank() over(partition by supid order by frownum) AS frownum,ftext,supid,hyordernodeid,fpaid,serverprice from HYORDERNODE where fparentid=$hyworkorderid$ and supid is not null and siteid=$siteid$) t2 on t1.hyordernodeid=t2.supid