|
|
|
@ -666,12 +666,12 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 检验记录
|
|
|
|
// 检验记录
|
|
|
|
// if (moduleList.get(1)) {
|
|
|
|
if (moduleList.get(1)) { |
|
|
|
JSONObject modelJson1 = new JSONObject(); |
|
|
|
JSONObject modelJson1 = new JSONObject(); |
|
|
|
List<JSONObject> checkList = this.getCheckListNotNG(woId, wpList, true); |
|
|
|
List<JSONObject> checkList = this.getCheckListNotNG(woId, wpList, true); |
|
|
|
modelJson1.put("checkList", checkList); |
|
|
|
modelJson1.put("checkList", checkList); |
|
|
|
jsonObj.put("modelThree", modelJson1); |
|
|
|
jsonObj.put("modelThree", modelJson1); |
|
|
|
// }
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
List<JSONObject> modelTwoList = this.buildModelTwo(wo, yo, dsPart, wpList, planList); |
|
|
|
List<JSONObject> modelTwoList = this.buildModelTwo(wo, yo, dsPart, wpList, planList); |
|
|
|
jsonObj.put("modelTwo", modelTwoList); |
|
|
|
jsonObj.put("modelTwo", modelTwoList); |
|
|
|
|