|
|
@@ -141,14 +141,20 @@ public class HyWorkOrder extends Controller {
|
|
|
Rows rows_saler = new Rows();
|
|
|
/** 馱等勤茼督昢等 **/
|
|
|
PaoSetRemote afterserviceorders = workorderpao.getPaoSet("AFTERSERVICEORDER");
|
|
|
+
|
|
|
+
|
|
|
if (!afterserviceorders.isEmpty()) {
|
|
|
if (!StringUtils.isBlank(afterserviceorders.getPao(0).getString("fsaler"))) {
|
|
|
Row row = new Row();
|
|
|
row.put("fsaler", afterserviceorders.getPao(0).getString("fsaler"));
|
|
|
row.put("fsalername", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("DISPLAYNAME"));
|
|
|
- row.put("fsalerphone", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("PRIMARYPHONE"));
|
|
|
+ row.put("fsalerphone", afterserviceorders.getPao(0).getPaoSet("PP_HR").getPao(0).getString("PRIMARYPHONE"));
|
|
|
rows_saler.add(row);
|
|
|
}
|
|
|
+ Row afterserviceorder= new Row();
|
|
|
+ afterserviceorder.put("servicebegindate", afterserviceorders.getPao(0).getString("SERVICEBEGINDATE"));
|
|
|
+ afterserviceorder.put("serviceenddate", afterserviceorders.getPao(0).getString("SERVICEENDDATE"));
|
|
|
+ row_detail.put("afterserviceorder", afterserviceorder);
|
|
|
}
|
|
|
row_detail.put("saler", rows_saler);
|
|
|
/** 馱等芶勦脤戙 **/
|
