Commit 799e33c9 authored by lisong's avatar lisong

添加返回字段

parent 1afbcfcc
...@@ -24,6 +24,12 @@ public class FileDto { ...@@ -24,6 +24,12 @@ public class FileDto {
private String insDep; private String insDep;
private String insPerson; private String insPerson;
private String projectName;
private String projectCode;
private String install;
private String design;
// 前端定制组件格式 文件 // 前端定制组件格式 文件
Page<Map<String, Object>> mapPage; Page<Map<String, Object>> mapPage;
} }
...@@ -175,4 +175,8 @@ public class InstallNoticeDto extends BaseDto { ...@@ -175,4 +175,8 @@ public class InstallNoticeDto extends BaseDto {
@ApiModelProperty("审核意见") @ApiModelProperty("审核意见")
private String auditOpinion; private String auditOpinion;
private String projectCode;
private String install;
private String design;
} }
...@@ -11,7 +11,9 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; ...@@ -11,7 +11,9 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil; import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.ugp.api.Enum.TabLogoEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.TabLogoEnum;
import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant; import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
import com.yeejoin.amos.boot.module.ugp.api.dto.FileDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.InformationDto; import com.yeejoin.amos.boot.module.ugp.api.dto.InformationDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto; import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice; import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project; import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
......
...@@ -227,6 +227,9 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -227,6 +227,9 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
if (ObjectUtils.isNotEmpty(one)) { if (ObjectUtils.isNotEmpty(one)) {
BeanUtils.copyProperties(one, installNoticeDto); BeanUtils.copyProperties(one, installNoticeDto);
} }
installNoticeDto.setProjectCode(projectDto.getCode());
installNoticeDto.setDesign(projectDto.getDesignUnit());
installNoticeDto.setInstall(projectDto.getInstallationUnit());
installNoticeDto.setImplementDate(projectDto.getStartDate()); installNoticeDto.setImplementDate(projectDto.getStartDate());
installNoticeDto.setConstructionUnit(projectDto.getInstallationUnit()); installNoticeDto.setConstructionUnit(projectDto.getInstallationUnit());
installNoticeDto.setUseUnitName(orgServiceImpl.getOrgUsr().getBizOrgName()); installNoticeDto.setUseUnitName(orgServiceImpl.getOrgUsr().getBizOrgName());
......
...@@ -740,6 +740,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -740,6 +740,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
installSubForm = jsonObject.getJSONArray("installSubForm"); installSubForm = jsonObject.getJSONArray("installSubForm");
designSubForm = jsonObject.getJSONArray("designSubForm"); designSubForm = jsonObject.getJSONArray("designSubForm");
} }
fileDto.setProjectName(detail.getName());
fileDto.setProjectCode(detail.getCode());
fileDto.setDesign(detail.getDesignUnit());
fileDto.setInstall(detail.getInstallationUnit());
fileDto.setInstallSubForm(installSubForm); fileDto.setInstallSubForm(installSubForm);
fileDto.setDesignSubForm(designSubForm); fileDto.setDesignSubForm(designSubForm);
fileDto.setStatus(detail.getStatus()); fileDto.setStatus(detail.getStatus());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment