bug修复

This commit is contained in:
guo 2024-01-19 19:09:17 +08:00
parent b846e86fa6
commit e5c9acd391
3 changed files with 8 additions and 0 deletions

View File

@ -213,6 +213,7 @@ public class MaterialApproachRecordController {
@ApiOperation(value = "通过excel导入材料进场记录 信息", notes = "通过excel导入材料进场记录 信息", httpMethod = "POST")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
String projectSn = request.getParameter("projectSn");
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@ -224,6 +225,7 @@ public class MaterialApproachRecordController {
try {
List<MaterialApproachRecord> listMaterialApproachRecords = ExcelImportUtil.importExcel(file.getInputStream(), MaterialApproachRecord.class, params);
for (MaterialApproachRecord materialApproachRecordExcel : listMaterialApproachRecords) {
materialApproachRecordExcel.setProjectSn(projectSn);
materialApproachRecordService.save(materialApproachRecordExcel);
}
return Result.ok("文件导入成功!数据行数:" + listMaterialApproachRecords.size());

View File

@ -267,6 +267,12 @@ public class Project implements Serializable {
private String jzgProjectCode;
@ApiModelProperty(value = "金筑工访问host")
private String jzgHost;
/**
* 弃用使用xiwonUrl
*/
@Deprecated
@ApiModelProperty(value = "携稳扬尘url")
private String xiwonDustUrl;
@ApiModelProperty(value = "'携稳的appId'")
private String xiwonAppId;
@ApiModelProperty(value = "'携稳的appSecret'")