Skip to content

A
amos-boot-biz
Commit 416c5759 authored by wujiang's avatar wujiang
Browse files
Options

修改装备详情

parent a8f72c8c
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 13 deletions
amos-boot-data/amos-boot-data-openapi/src/main/resources/application.properties
View file @ 416c5759
......@@ -11,4 +11,4 @@ redis.cache.failure.time=10800
# mybatis-plus
mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
mybatis-plus.type-aliases-super-type=org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
mybatis-plus.global-config.db-config.id-type=id_worker
mybatis-plus.global-config.db-config.id-type=ID_WORKER
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgBasicInfoDto.java
View file @ 416c5759
package com.yeejoin.amos.boot.module.tzs.api.dto;
import java.util.List;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgConstructionInfo;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgDesignInfo;
......@@ -83,15 +85,23 @@ public class TzsJgBasicInfoDto extends BaseDto {
@ApiModelProperty(value = "施工信息-最新一次")
private TzsJgConstructionInfoDto constructionInfo;
@ApiModelProperty(value = "施工信息列表")
private List<TzsJgConstructionInfoDto> constructionInfoList;
@ApiModelProperty(value = "维保信息")
private TzsJgMaintenanceInfoDto maintenanceInfo;
@ApiModelProperty(value = "维保信息列表")
private List<TzsJgMaintenanceInfoDto> maintenanceInfoList;
@ApiModelProperty(value = "技术信息")
private TzsJgElevatorTechInfoDto elevatorTechInfo;
@ApiModelProperty(value = "检验信息")
private TzsJgInspectionInfoDto inspectionInfo;
@ApiModelProperty(value = "检验信息列表")
private List<TzsJgInspectionInfoDto> inspectionInfoList;
@ApiModelProperty(value = "其他信息")
private TzsJgOtherInfoDto otherInfo;
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgFile.java
View file @ 416c5759
......@@ -51,4 +51,5 @@ public class TzsJgFile extends BaseEntity {
@ApiModelProperty(value = "对接公司编码")
private String appId;
private Long squNbr;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/JgFileObjectEnum.java
View file @ 416c5759
......@@ -10,7 +10,7 @@ package com.yeejoin.amos.boot.module.tzs.api.enums;
public enum JgFileObjectEnum {
DESIGN_INFO("designInf"),
DESIGN_INFO("designInfo"),
PRODUCE_INFO("produceInfo"),
REGISTRATION_INFO("registrationInfo"),
MAINTENANCE_INFO("maintenanceInfo"),
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsJgServiceImpl.java
View file @ 416c5759
package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.BeanUtils;
......@@ -115,12 +116,12 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (designInfo != null) {
BeanUtils.copyProperties(designInfo, designInfoDto);
List<TzsJgFile> designFile = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, designInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.DESIGN_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.DESIGN_FILE.getAttribute()));
designFile.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
List<TzsJgFile> designCode = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, designInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.DESIGN_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.DESIGN_CODE.getAttribute()));
designCode.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
......@@ -133,23 +134,23 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (produceInfo != null) {
BeanUtils.copyProperties(produceInfo, produceInfoDto);
List<TzsJgFile> produceStandard = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.PRODUCE_STANDARD.getAttribute()));
List<TzsJgFile> productCertificate = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.PRODUCT_CERTIFICATE.getAttribute()));
List<TzsJgFile> iumInstructions = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.IUM_INSTRUCTIONS.getAttribute()));
List<TzsJgFile> supervisionCert = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.SUPERVISION_CERT.getAttribute()));
List<TzsJgFile> ceCert = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.CE_CERT.getAttribute()));
produceStandard.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
......@@ -169,7 +170,7 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (registrationInfo != null) {
BeanUtils.copyProperties(registrationInfo, registrationInfoDto);
List<TzsJgFile> useRegistCertificate = iTzsJgFileService.list(new LambdaQueryWrapper<TzsJgFile>()
.eq(TzsJgFile::getSequenceCode, code)
.eq(TzsJgFile::getSquNbr, registrationInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.REGISTRATION_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.USE_REGIST_CERTIFICATE.getAttribute()));
useRegistCertificate.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
......@@ -188,6 +189,18 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (constructionInfo != null) {
BeanUtils.copyProperties(constructionInfo, constructionInfoDto);
}
List<TzsJgConstructionInfo> constructionInfoList = iTzsJgConstructionInfoService
.list(new LambdaQueryWrapper<TzsJgConstructionInfo>().eq(TzsJgConstructionInfo::getSequenceCode, code));
List<TzsJgConstructionInfoDto> constructionInfoDtoList = new ArrayList<>();
if (!constructionInfoList.isEmpty()) {
for (TzsJgConstructionInfo constructionInfoOne : constructionInfoList) {
TzsJgConstructionInfoDto constructionInfoDtoOne = new TzsJgConstructionInfoDto();
BeanUtils.copyProperties(constructionInfoOne, constructionInfoDtoOne);
constructionInfoDtoList.add(constructionInfoDtoOne);
}
}
TzsJgMaintenanceInfo maintenanceInfo = iTzsJgMaintenanceInfoService
.getOne(new LambdaQueryWrapper<TzsJgMaintenanceInfo>().eq(TzsJgMaintenanceInfo::getSequenceCode, code)
.orderByDesc(TzsJgMaintenanceInfo::getRecDate).last("limit 1"));
......@@ -195,12 +208,30 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (maintenanceInfo != null) {
BeanUtils.copyProperties(maintenanceInfo, maintenanceInfoDto);
List<TzsJgFile> repairInform = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, maintenanceInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.MAINTENANCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.REPAIR_INFORM.getAttribute()));
repairInform.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
maintenanceInfoDto.setRepairInform(repairInform);
}
List<TzsJgMaintenanceInfo> maintenanceInfoList = iTzsJgMaintenanceInfoService
.list(new LambdaQueryWrapper<TzsJgMaintenanceInfo>().eq(TzsJgMaintenanceInfo::getSequenceCode, code));
List<TzsJgMaintenanceInfoDto> maintenanceInfoDtoList = new ArrayList<>();
if (!maintenanceInfoList.isEmpty()) {
for (TzsJgMaintenanceInfo maintenanceInfoOne : maintenanceInfoList) {
TzsJgMaintenanceInfoDto maintenanceInfoDtoOne = new TzsJgMaintenanceInfoDto();
BeanUtils.copyProperties(maintenanceInfoOne, maintenanceInfoDtoOne);
List<TzsJgFile> repairInform = iTzsJgFileService.list(new LambdaQueryWrapper<TzsJgFile>()
.eq(TzsJgFile::getSquNbr, maintenanceInfoOne.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.MAINTENANCE_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.REPAIR_INFORM.getAttribute()));
repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
maintenanceInfoDtoOne.setRepairInform(repairInform);
maintenanceInfoDtoList.add(maintenanceInfoDtoOne);
}
}
TzsJgInspectionInfo inspectionInfo = iTzsJgInspectionInfoService
.getOne(new LambdaQueryWrapper<TzsJgInspectionInfo>().eq(TzsJgInspectionInfo::getSequenceCode, code)
.orderByDesc(TzsJgInspectionInfo::getRecDate).last("limit 1"));
......@@ -208,12 +239,32 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (inspectionInfo != null) {
BeanUtils.copyProperties(inspectionInfo, inspectionInfoDto);
List<TzsJgFile> inspectionReport = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, inspectionInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.INSPECTION_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.INSPECTION_REPORT.getAttribute()));
inspectionReport.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
inspectionInfoDto.setInspectionReport(inspectionReport);
}
List<TzsJgInspectionInfo> inspectionInfoList = iTzsJgInspectionInfoService
.list(new LambdaQueryWrapper<TzsJgInspectionInfo>().eq(TzsJgInspectionInfo::getSequenceCode, code));
List<TzsJgInspectionInfoDto> inspectionInfoDtoList = new ArrayList<>();
if (!inspectionInfoList.isEmpty()) {
for (TzsJgInspectionInfo inspectionInfoOne : inspectionInfoList) {
TzsJgInspectionInfoDto inspectionInfoDtoOne = new TzsJgInspectionInfoDto();
BeanUtils.copyProperties(inspectionInfoOne, inspectionInfoDtoOne);
List<TzsJgFile> repairInform = iTzsJgFileService.list(new LambdaQueryWrapper<TzsJgFile>()
.eq(TzsJgFile::getSquNbr, inspectionInfoOne.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.INSPECTION_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.INSPECTION_REPORT.getAttribute()));
repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
inspectionInfoDtoOne.setInspectionReport(repairInform);
inspectionInfoDtoList.add(inspectionInfoDtoOne);
}
}
TzsJgOtherInfo otherInfo = iTzsJgOtherInfoService
.getOne(new LambdaQueryWrapper<TzsJgOtherInfo>().eq(TzsJgOtherInfo::getSequenceCode, code));
TzsJgOtherInfoDto otherInfoDto = new TzsJgOtherInfoDto();
......@@ -226,7 +277,7 @@ public class TzsJgServiceImpl implements ITzsJgService {
if (elevatorTechInfo != null) {
BeanUtils.copyProperties(elevatorTechInfo, elevatorTechInfoDto);
List<TzsJgFile> governorEffiReport = iTzsJgFileService
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, elevatorTechInfo.getSequenceNbr())
.eq(TzsJgFile::getObjectType, JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject())
.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.GOVERNOR_EFFI_REPORT.getAttribute()));
governorEffiReport.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
......@@ -265,8 +316,11 @@ public class TzsJgServiceImpl implements ITzsJgService {
dto.setUseInfo(useInfoDto);
dto.setElevatorTechInfo(elevatorTechInfoDto);
dto.setConstructionInfo(constructionInfoDto);
dto.setConstructionInfoList(constructionInfoDtoList);
dto.setMaintenanceInfo(maintenanceInfoDto);
dto.setMaintenanceInfoList(maintenanceInfoDtoList);
dto.setInspectionInfo(inspectionInfoDto);
dto.setInspectionInfoList(inspectionInfoDtoList);
dto.setOtherInfo(otherInfoDto);
return dto;
}
......
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