Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InformationDto.java

@@ -12,6 +12,8 @@ public class InformationDto {
     private List<Map<String, Object>>welderList;
     private List<Map<String, Object>>materialList;
     private List<Map<String, Object>> fileList;
+    private JSONObject fileJson;
     private Long  projectId;
+    private String  type;
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/OverProjectDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 
@@ -19,7 +20,7 @@ public class OverProjectDto extends BaseDto {
     /**
      * 竣工资料
      */
-    private Object completeFile;
+    private JSONArray completeFile;
 
     /**
      * 审核意见

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -441,13 +441,20 @@ public class ProjectController extends BaseController {
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "POST", value = "资料提交保存", notes = "资料提交保存")
+	@ApiOperation(httpMethod = "POST", value = "资料提交/保存", notes = "资料提交/保存")
 	@PostMapping(value = "/informationSaveOrUpdate")
 	public ResponseModel<Object> informationSaveOrUpdate(@RequestBody InformationDto dto){
-		projectServiceImpl.informationSaveOrUpdate(dto.getEquipmentList(),dto.getWelderList(),dto.getMaterialList(),dto.getFileList(),dto.getProjectId());
+		projectServiceImpl.informationSaveOrUpdate(dto.getEquipmentList(),dto.getWelderList(),dto.getMaterialList(),dto.getFileJson(),dto.getProjectId(), dto.getType());
 		return ResponseHelper.buildResponse("ok");
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "POST", value = "资料保存、审核", notes = "资料保存、审核")
+	@PostMapping(value = "/informationAudit")
+	public ResponseModel<Object> informationAudit(@RequestBody InformationDto dto){
+		projectServiceImpl.informationAudit(dto.getEquipmentList(),dto.getWelderList(),dto.getMaterialList(),dto.getFileList(),dto.getProjectId(), dto.getType());
+		return ResponseHelper.buildResponse("ok");
+	}
 
 	/**
 	 * 审核资料详情