修改bug

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgBasicInfoDto.java

@@ -3,15 +3,6 @@ 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;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgInspectionInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgMaintenanceInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgOtherInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgProduceInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgRegistrationInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgSuperviseInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgUseInfo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -99,10 +90,15 @@ public class TzsJgBasicInfoDto extends BaseDto {
 
 	@ApiModelProperty(value = "检验信息")
 	private TzsJgInspectionInfoDto inspectionInfo;
-	
+
 	@ApiModelProperty(value = "检验信息列表")
 	private List<TzsJgInspectionInfoDto> inspectionInfoList;
 
 	@ApiModelProperty(value = "其他信息")
 	private TzsJgOtherInfoDto otherInfo;
+
+	@ApiModelProperty(value = "附件信息")
+	private List<TzsJgEnclosureInfoDto> enclousureInfo;
+	
+	private String superviseKey;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzsJgMapper.xml

@@ -39,6 +39,11 @@
 		supervise.sequence_code
 		<where>
 			<if
+				test="tzsJgBasicInfoDto.orgBranchCode!=null and tzsJgBasicInfoDto.orgBranchCode!='' ">
+				AND supervise.org_branch_code LIKE
+				CONCAT('%',#{tzsJgBasicInfoDto.orgBranchCode},'%')
+			</if>
+			<if
 				test="tzsJgBasicInfoDto.orgBranchName!=null and tzsJgBasicInfoDto.orgBranchName!='' ">
 				AND supervise.org_branch_name LIKE
 				CONCAT('%',#{tzsJgBasicInfoDto.orgBranchName},'%')
@@ -70,7 +75,7 @@
 			</if>
 			<if
 				test="tzsJgBasicInfoDto.equDefine!=null and tzsJgBasicInfoDto.equDefine!='' ">
-				AND supervise.equ_define LIKE
+				AND registration.equ_define LIKE
 				CONCAT('%',#{tzsJgBasicInfoDto.equDefine},'%')
 			</if>
 			<if

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsJgServiceImpl.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgConstructionInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgDesignInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgElevatorTechInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgEnclosureInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgInspectionInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgMaintenanceInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgOtherInfoDto;
@@ -26,6 +27,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgConstructionInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgDesignInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgElevatorTechInfo;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgEnclosureInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgInspectionInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgMaintenanceInfo;
@@ -40,6 +42,7 @@ import com.yeejoin.amos.boot.module.tzs.api.mapper.TzsJgMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgConstructionInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgDesignInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgElevatorTechInfoService;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgEnclosureInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgFileService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgInspectionInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgMaintenanceInfoService;
@@ -49,6 +52,9 @@ import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgRegistrationInfoServic
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgSuperviseInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgUseInfoService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 @Service
 public class TzsJgServiceImpl implements ITzsJgService {
@@ -89,6 +95,9 @@ public class TzsJgServiceImpl implements ITzsJgService {
 	@Autowired
 	ITzsJgFileService iTzsJgFileService;
 
+	@Autowired
+	ITzsJgEnclosureInfoService iTzsJgEnclosureInfoService;
+
 	/**
 	 * 文件服务器地址
 	 */
@@ -97,6 +106,13 @@ public class TzsJgServiceImpl implements ITzsJgService {
 
 	@Override
 	public IPage<TzsJgBasicInfoDto> page(PageParam pageParam, TzsJgBasicInfoDto tzsJgBasicInfoDto) {
+		if (tzsJgBasicInfoDto.getSuperviseKey() != null) {
+			FeignClientResult<CompanyModel> result = Privilege.companyClient
+					.seleteOne(Long.valueOf(tzsJgBasicInfoDto.getSuperviseKey()));
+			if (result.getResult() != null) {
+				tzsJgBasicInfoDto.setOrgBranchCode(result.getResult().getOrgCode());
+			}
+		}
 		Page<TzsJgBasicInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
 		return tzsJgMapper.page(page, tzsJgBasicInfoDto);
 	}
@@ -245,7 +261,7 @@ public class TzsJgServiceImpl implements ITzsJgService {
 			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<>();
@@ -253,18 +269,16 @@ public class TzsJgServiceImpl implements ITzsJgService {
 			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()));
+				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();
@@ -276,13 +290,26 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgElevatorTechInfoDto elevatorTechInfoDto = new TzsJgElevatorTechInfoDto();
 		if (elevatorTechInfo != null) {
 			BeanUtils.copyProperties(elevatorTechInfo, elevatorTechInfoDto);
-			List<TzsJgFile> governorEffiReport = iTzsJgFileService
-					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, elevatorTechInfo.getSequenceNbr())
+			List<TzsJgFile> governorEffiReport = iTzsJgFileService.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()));
 			elevatorTechInfoDto.setGovernorEffiReport(governorEffiReport);
 		}
+
+		List<TzsJgEnclosureInfo> enclosureInfoList = iTzsJgEnclosureInfoService
+				.list(new LambdaQueryWrapper<TzsJgEnclosureInfo>().eq(TzsJgEnclosureInfo::getSequenceCode, code));
+		List<TzsJgEnclosureInfoDto> enclosureInfoDtoList = new ArrayList<TzsJgEnclosureInfoDto>();
+		if (!enclosureInfoList.isEmpty()) {
+			for (TzsJgEnclosureInfo  enclosureInfo : enclosureInfoList) {
+				TzsJgEnclosureInfoDto enclosureInfoDtoOne = new TzsJgEnclosureInfoDto();
+				BeanUtils.copyProperties( enclosureInfo, enclosureInfoDtoOne);
+				//repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
+				enclosureInfoDtoList.add(enclosureInfoDtoOne);
+			}
+		}
+		
 		dto.setSequenceCode(code);
 		if (superviseInfo != null) {
 			dto.setSuperviseCode(superviseInfo.getSuperviseCode());
@@ -321,6 +348,7 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		dto.setMaintenanceInfoList(maintenanceInfoDtoList);
 		dto.setInspectionInfo(inspectionInfoDto);
 		dto.setInspectionInfoList(inspectionInfoDtoList);
+		dto.setEnclousureInfo(enclosureInfoDtoList);
 		dto.setOtherInfo(otherInfoDto);
 		return dto;
 	}