Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r20078 -r20085 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20078) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20085) @@ -537,15 +537,16 @@ if(StringUtils.isNotBlank(paramsStr)){ JSONObject params = JSONObject.fromObject(paramsStr); String app_id = params.optString("app_id"); - InvoicePlan applicaiton = invoicePlanManager + InvoicePlan application = invoicePlanManager .get(app_id); - if (applicaiton != null) { - RecyclingRecord recyclingRecord = applicaiton + if (application != null) { + RecyclingRecord recyclingRecord = application .getRecyclingRecord(objectDao); if(recyclingRecord == null){ - recyclingRecord = createRecyclingRecord(applicaiton); + recyclingRecord = createRecyclingRecord(application); } - buildUrgentTousseJson(params, applicaiton); + buildUrgentTousseJson(params, application); + buildRecyclingItemJson(params,application); try { recyclingRecordManager .save(recyclingRecord, params); @@ -559,7 +560,22 @@ return null; } - + private void buildRecyclingItemJson(JSONObject params,InvoicePlan application){ + if(application != null && CollectionUtils.isNotEmpty(application.getApplicationItems())){ + JSONArray array = new JSONArray(); + for(TousseItem ti : application.getApplicationItems()){ + JSONObject json = new JSONObject(); + json.put("tousseDefinitionID", ti.getTousseDefinitionId()); + json.put("tousseName", ti.getTousseName()); + json.put("errorRemark", ti.getErrorRemark()); + json.put("damageRemark", ti.getDamageRemark()); + json.put("urgentLevel", ti.getUrgentLevel()); + json.put("errorDamageQmKey", ti.getErrorDamageQmKey()); + array.add(json); + } + params.put("recyclingItemArray", array); + } + } /** * 快速回收加急处理 * @param params @@ -587,6 +603,7 @@ urgentJson.put("tousseName", tousseItem.getTousseName()); urgentJson.put("tousseDefinitionID", tousseItem.getTousseDefinitionId()); urgentJson.put("urgentAmount", tousseItem.getUrgentAmount()); + urgentJson.put("urgentLevel", tousseItem.getUrgentLevel()); urgentTousseItems.add(urgentJson); } }