admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-05-17 23:16:55 +08:00
commit cbd57de706
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java
View File

@ -115,6 +115,10 @@ public class XzBlindPlatePlugSafeController {
if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));
}
JSONArray assignmentPersonInCharge = paramMap.getJSONArray("assignmentPersonInCharge");
if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
}
String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"};
JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList");
List<XzGasAnalyze> list = new ArrayList<>();

4
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java
View File

@ -111,6 +111,10 @@ public class XzHighJobSafeController {
if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));
}
JSONArray assignmentPersonInCharge = paramMap.getJSONArray("assignmentPersonInCharge");
if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
}
String [] param = {"gasAnalyzeTime", "representativeGas", "analyzeResult", "analyzer"};
JSONArray detail = paramMap.getJSONArray("xzGasAnalyzeList");
List<XzGasAnalyze> list = new ArrayList<>();

8
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java
View File

@ -112,10 +112,10 @@ public class XzLimitSpaceSafeController {
// if (safetyInformant != null) {
// paramMap.put("safetyInformant", safetyInformant.get(0));
// }
// JSONArray assignmentPersonInCharge = paramMap.getJSONArray("assignmentPersonInCharge");
// if (assignmentPersonInCharge != null) {
// paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
// }
JSONArray assignmentPersonInCharge = paramMap.getJSONArray("assignmentPersonInCharge");
if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
}
JSONArray jobApplicationUnit = paramMap.getJSONArray("jobApplicationUnit");
if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));

4
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java
View File

@ -107,6 +107,10 @@ public class XzTemporaryElectricitySafeController {
if (jobApplicationUnit != null) {
paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0));
}
JSONArray assignmentPersonInCharge = paramMap.getJSONArray("assignmentPersonInCharge");
if (assignmentPersonInCharge != null) {
paramMap.put("assignmentPersonInCharge", assignmentPersonInCharge.get(0));
}
String [] param = {"combustibleGasAnalysis", "analysePlace", "analysePerson"};
JSONArray analyseInfo = paramMap.getJSONArray("analysePlace");
if (analyseInfo != null) {