台州工单节点是否有偿更新逻辑及反写到工单头的维修价格

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

@@ -83,7 +83,7 @@ public class MyHyconfirmationorder extends Controller {
 						remote.setValue("FMAINTENANCECYCLE", rowsMap.get("2_3").get(0).getString("ftext"),11l);
 					}
 					if(!rowsMap.get("3_1").isEmpty()) {
-						remote.setValue("fispaid", rowsMap.get("3_1").get(0).getString("fispaid"),11l);
+						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);

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

@@ -1,4 +1,4 @@
-select convert(varchar,t1.frownum)+'_'+convert(varchar,t2.frownum) frownum,ftext,fispaid from 
+select convert(varchar,t1.frownum)+'_'+convert(varchar,t2.frownum) frownum,ftext,fpaid 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,fispaid 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 from HYORDERNODE where fparentid=$hyworkorderid$ and supid is not null and siteid=$siteid$) t2 on t1.hyordernodeid=t2.supid

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

@@ -600,8 +600,8 @@ public class HyWorkOrder extends Controller {
 //                            ordernodePao.setValue("explain",where.getString("explain"),11l);
 //                        }
 						/** 添加是否有偿 **/
-						if (where.containsKey("fispaid")) {
-							ordernodePao.setValue("fispaid", where.getString("fispaid"), 11l);
+						if (where.containsKey("fpaid")) {
+							ordernodePao.setValue("fpaid", where.getString("fpaid"), 11l);
 						}
 						/** 添加文本 **/
 						if (where.containsKey("ftext")) {
@@ -616,6 +616,7 @@ public class HyWorkOrder extends Controller {
 						/** 添加服务价格 **/
 						if (where.containsKey("serverprice")) {
 							ordernodePao.setValue("serverprice", where.getDouble("serverprice"), 11l);
+							workorderPao.setValue("REPAIRPRICE",  where.getDouble("serverprice"),11l);
 						}
 						if (where.containsKey("isconfirm")) {
 							if (where.getBoolean("isconfirm")) {