报检新增API兼容新发起页面

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -41,6 +41,12 @@ public class JyjcInspectionApplicationController extends BaseController {
     @Autowired
     JyjcInspectionApplicationServiceImpl jyjcInspectionApplicationServiceImpl;
 
+	// 业务通用发起——基本信息
+	private static final String basic = "basic";
+	// 业务通用发起——设备信息
+	private static final String equipPageInfo = "equipPageInfo";
+	// 业务通用发起——技术参数-
+	private static final String filePageData = "filePageData";
 
     /**
      * 新增
@@ -51,7 +57,17 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<JyjcInspectionApplicationModel> save(@RequestBody JSONObject model) {
-
+    	if (model.containsKey(basic)) {
+			JSONObject finallyJson = new JSONObject();
+			Map<String, Object> basicObj = (Map<String, Object>) model.get(basic);
+			Map<String, Object> equipPageInfoObj = (Map<String, Object>) model.get(equipPageInfo);
+			Map<String, Object> filePageDataObj = (Map<String, Object>) model.get(filePageData);
+			finallyJson.putAll(model);
+			finallyJson.putAll(basicObj);
+			finallyJson.putAll(equipPageInfoObj);
+			finallyJson.putAll(filePageDataObj);
+			model = finallyJson;
+		}
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		model.put("applicationUnitCode",selectedOrgInfo.getCompany().getCompanyCode());