Commit 8574d8ee by shiwenbo

修改合同中对场站的关联

parent 2536052c
...@@ -291,15 +291,12 @@ public class ContractServiceImpl implements ContractService { ...@@ -291,15 +291,12 @@ public class ContractServiceImpl implements ContractService {
UUID regionalCompanyId = regionalCompany!=null? regionalCompany.getUuid("id"):emptyUUID; UUID regionalCompanyId = regionalCompany!=null? regionalCompany.getUuid("id"):emptyUUID;
String purchaseSandUnitName = contract.get("purchaseSandUnit").getString("name"); String purchaseSandUnitName = contract.get("purchaseSandUnit").getString("name");
String contractName = contract.getString("contractName"); String contractName = contract.getString("contractName");
KObject station = contract.get("station");
UUID stationId = station!=null? station.getUuid("id"):emptyUUID;//
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("contractName", contractName); jsonObject.put("contractName", contractName);
jsonObject.put("projectName", projectName); jsonObject.put("projectName", projectName);
jsonObject.put("purchaseSandUnitName", purchaseSandUnitName); jsonObject.put("purchaseSandUnitName", purchaseSandUnitName);
jsonObject.put("regionalCompanyId", regionalCompanyId.toString()); jsonObject.put("regionalCompanyId", regionalCompanyId.toString());
jsonObject.put("stationId", stationId.toString());
jsonObject.put("contractId", contract.getUuid("id")); jsonObject.put("contractId", contract.getUuid("id"));
jsonObject.put("projectId", project.getUuid("id")); jsonObject.put("projectId", project.getUuid("id"));
jsonObject.put("purchaseSandUnitId", contract.get("purchaseSandUnit").getUuid("id")); jsonObject.put("purchaseSandUnitId", contract.get("purchaseSandUnit").getUuid("id"));
......
...@@ -30,7 +30,6 @@ public class ContractPerformWarningProcessor implements DataProcessor { ...@@ -30,7 +30,6 @@ public class ContractPerformWarningProcessor implements DataProcessor {
row.put("purchaseSandUnitName",purchaseSandUnitName);//contract.getString("purchaseSandUnitName") row.put("purchaseSandUnitName",purchaseSandUnitName);//contract.getString("purchaseSandUnitName")
//KObject warnSetting = row.get("warnSetting"); //KObject warnSetting = row.get("warnSetting");
row.put("regionalCompanyName", contract.getString("regionalCompanyName")); row.put("regionalCompanyName", contract.getString("regionalCompanyName"));
row.put("stationName", contract.isNull("station") ? "": contract.get("station").getString("stationName"));
} }
} }
} }
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"table": { "table": {
"selectType": "MULTI", "selectType": "MULTI",
"serialNumber": "series", "serialNumber": "series",
"pageSize": 200, "pageSize": 10,
"orders":[ "orders":[
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment