diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index a915d11..f7dfd23 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java @@ -373,7 +373,7 @@ public class Project implements Serializable { @ApiModelProperty("区县预审上级条线主管单位盖章审核意见") private String countrySealAuditOpinion; - @ApiModelProperty("区县预审上级条线主管盖章审核日期") + @ApiModelProperty("区县预审上级条线主管单位盖章审核日期") private String countrySealAuditDate; @ApiModelProperty("区县预审盖章上级条线主管单位印章编号") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 5d853db..e33de79 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -1308,20 +1308,24 @@ public class TodoCenterManage { // 上传OSS FileResultVO resultVo = fileService.upload(multipartFile, "default"); - // 将返回的文件ID更新到项目库中对应的项目下 + // 将带审核意见的返回的文件ID更新到项目库中对应的项目下 Project declaredProject = projectService.getById(projectId); // 根据模版名称判断是预审申请单还是建设方案申请单 - if (TodoCenterConstant.SealTemplate.CITY_TEMPLATE.equals(templateName) || - TodoCenterConstant.SealTemplate.COUNTRY_TEMPLATE.equals(templateName)) { - declaredProject.setPretrialFileId(resultVo.getId()); - declaredProject.setPretrialFileName(resultVo.getOriginalFileName()); - declaredProject.setUpdateOn(LocalDateTime.now()); - } else if (TodoCenterConstant.SealTemplate.CONSTRUCT_TEMPLATE.equals(templateName)) { - declaredProject.setConstructFileId(resultVo.getId()); - declaredProject.setConstructFileName(resultVo.getOriginalFileName()); - declaredProject.setUpdateOn(LocalDateTime.now()); + String superOrgOpinion = paramsMap.getString("superOrgOpinion"); + String higherOrgOpinion = paramsMap.getString("higherOrgOpinion"); + if (StringUtils.isNotBlank(superOrgOpinion) || StringUtils.isNotBlank(higherOrgOpinion)) { + if (TodoCenterConstant.SealTemplate.CITY_TEMPLATE.equals(templateName) || + TodoCenterConstant.SealTemplate.COUNTRY_TEMPLATE.equals(templateName)) { + declaredProject.setPretrialFileId(resultVo.getId()); + declaredProject.setPretrialFileName(resultVo.getOriginalFileName()); + declaredProject.setUpdateOn(LocalDateTime.now()); + } else if (TodoCenterConstant.SealTemplate.CONSTRUCT_TEMPLATE.equals(templateName)) { + declaredProject.setConstructFileId(resultVo.getId()); + declaredProject.setConstructFileName(resultVo.getOriginalFileName()); + declaredProject.setUpdateOn(LocalDateTime.now()); + } + projectService.updateById(declaredProject); } - projectService.updateById(declaredProject); try { if (null != htmlInputStream) { htmlInputStream.close();