Commit 6dae3c98 by 杨清松

预警记录备注字段补充

parent 9ab9d937
...@@ -97,7 +97,7 @@ public class WarningSettingServiceImpl implements IWarningSettingService{ ...@@ -97,7 +97,7 @@ public class WarningSettingServiceImpl implements IWarningSettingService{
warSettingIdObj.set("personnel", personnelStr); warSettingIdObj.set("personnel", personnelStr);
} }
String min = warnSetting.getMin(); String min = warnSetting.getMin();
if(min!=null) warSettingIdObj.set("min", min); warSettingIdObj.set("min", min);
warnSettingDao.update(warSettingIdObj); warnSettingDao.update(warSettingIdObj);
} }
......
...@@ -261,6 +261,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -261,6 +261,9 @@ public class ContractServiceImpl implements ContractService {
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("stationId", stationId.toString());
jsonObject.put("contractId", contract.getUuid("id"));
jsonObject.put("projectId", project.getUuid("id"));
jsonObject.put("purchaseSandUnitId", contract.get("purchaseSandUnit").getUuid("id"));
return jsonObject.toString(); return jsonObject.toString();
} }
......
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