diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java index 37b7ec2d7..89ad2a65f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java @@ -142,6 +142,11 @@ public class XzBlindPlatePlugSafeController { List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); } + JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName"); + if (jobPersonNameArray != null) { + List jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class); + paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(","))); + } String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"}; JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList"); List list = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java index 49c1b8f82..aab0a0a1d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java @@ -131,6 +131,11 @@ public class XzHighJobSafeController { List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); } + JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName"); + if (jobPersonNameArray != null) { + List jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class); + paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(","))); + } String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"}; JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList"); List list = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java index 7b0772286..28655f203 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java @@ -131,6 +131,21 @@ public class XzHoistSafetyWorkController { List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); } + JSONArray hoistJobPersonNameArray = paramMap.getJSONArray("hoistJobPersonName"); + if (hoistJobPersonNameArray != null) { + List hoistJobPersonName = JSONObject.parseObject(JSON.toJSONString(hoistJobPersonNameArray), List.class); + paramMap.put("hoistJobPersonName", hoistJobPersonName == null ? "" : hoistJobPersonName.stream().collect(Collectors.joining(","))); + } + JSONArray siSuoPersonNameArray = paramMap.getJSONArray("siSuoPersonName"); + if (siSuoPersonNameArray != null) { + List siSuoPersonName = JSONObject.parseObject(JSON.toJSONString(siSuoPersonNameArray), List.class); + paramMap.put("siSuoPersonName", siSuoPersonName == null ? "" : siSuoPersonName.stream().collect(Collectors.joining(","))); + } + JSONArray commanderArray = paramMap.getJSONArray("commander"); + if (commanderArray != null) { + List commander = JSONObject.parseObject(JSON.toJSONString(commanderArray), List.class); + paramMap.put("commander", commander == null ? "" : commander.stream().collect(Collectors.joining(","))); + } String [] param1 = {"name", "flag"}; JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); JSONArray safeMeasure = new JSONArray(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java index 0cf5abe58..4828e4c66 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java @@ -148,6 +148,11 @@ public class XzLimitSpaceSafeController { List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); } + JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName"); + if (jobPersonNameArray != null) { + List jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class); + paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(","))); + } String [] param = {"name", "standard"}; JSONArray toxicAndHarmfulGasInformations = paramMap.getJSONArray("toxicAndHarmfulGasInformation"); JSONArray toxicAndHarmfulGasInformation = new JSONArray(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java index 858111727..9e36fd866 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java @@ -127,6 +127,16 @@ public class XzTemporaryElectricitySafeController { List acceptTheInformantName = JSONObject.parseObject(JSON.toJSONString(acceptTheInformantNameArray), List.class); paramMap.put("acceptTheInformantName", acceptTheInformantName == null ? "" : acceptTheInformantName.stream().collect(Collectors.joining(","))); } + JSONArray jobPersonNameArray = paramMap.getJSONArray("jobPersonName"); + if (jobPersonNameArray != null) { + List jobPersonName = JSONObject.parseObject(JSON.toJSONString(jobPersonNameArray), List.class); + paramMap.put("jobPersonName", jobPersonName == null ? "" : jobPersonName.stream().collect(Collectors.joining(","))); + } + JSONArray electricityCustomerNameArray = paramMap.getJSONArray("electricityCustomerName"); + if (electricityCustomerNameArray != null) { + List electricityCustomerName = JSONObject.parseObject(JSON.toJSONString(electricityCustomerNameArray), List.class); + paramMap.put("electricityCustomerName", electricityCustomerName == null ? "" : electricityCustomerName.stream().collect(Collectors.joining(","))); + } String [] param = {"combustibleGasAnalysis", "analysePlace", "analysePerson"}; JSONArray analyseInfo = paramMap.getJSONArray("analysePlace"); if (analyseInfo != null) {