Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

技术监督代码bug修改

Browse Source
This commit is contained in:
雨木c
2023-07-19 14:27:12 +08:00
parent b32e6f252a
commit a154924d9a
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvProblem.java
View File

@@ -127,8 +127,14 @@ public class SupvProblem extends BaseEntity {
private String remark;
@TableField(exist = false)
@ApiModelProperty(name = "attachmentName",value = "盖章报告")
private String attachmentName;
@TableField(exist = false)
@ApiModelProperty(name = "attachmentNameTwo",value = "佐证材料")
private String attachmentNameTwo;
}

4
pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvFileController.java
View File

@@ -48,9 +48,9 @@ public class SupvFileController extends BaseController {
@PostMapping("detail")
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DOWNLOAD)
@ApiOperation("监督计划问题附件下载")
public HttpResult<Object> detail(HttpServletResponse response, @RequestParam("busId") String busId, @RequestParam("type") Integer type){
public HttpResult<Object> detail(HttpServletResponse response, @RequestParam("busId") String busId, @RequestParam("type") Integer type,@RequestParam("attachmentType") String attachmentType){
String methodDescribe = getMethodDescribe("detail");
iSupvFileService.detail(response,busId,type);
iSupvFileService.detail(response,busId,type,attachmentType);
return null;
}
}

2
pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvFileService.java
View File

@@ -25,6 +25,6 @@ public interface ISupvFileService extends IService<SupvFile> {
boolean planUpload(MultipartFile file,String planId, Integer type,String attachmentType);
String detail(HttpServletResponse response,String busId,Integer type);
String detail(HttpServletResponse response,String busId,Integer type,String attachmentType);
}

6
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvFileServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class SupvFileServiceImpl extends ServiceImpl<SupvFileMapper, SupvFile> i
@Override
public boolean planUpload(MultipartFile file, String planId, Integer type,String attachmentType) {
SupvFile supvFile = this.getOne(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId,planId).eq(SupvFile::getType,type));
SupvFile supvFile = this.getOne(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId,planId).eq(SupvFile::getType,type).eq(SupvFile::getAttachmentType,attachmentType));
String url = fileStorageUtil.uploadMultipart(file, OssPath.SURVEY_RESULT);
SupvFile supvFilePO = new SupvFile();
supvFilePO.setAttachmentName(file.getOriginalFilename());
@@ -57,8 +57,8 @@ public class SupvFileServiceImpl extends ServiceImpl<SupvFileMapper, SupvFile> i
}
@Override
public String detail(HttpServletResponse response,String busId, Integer type) {
SupvFile supvFile = this.getOne(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId,busId).eq(SupvFile::getType,type));
public String detail(HttpServletResponse response,String busId, Integer type,String attachmentType) {
SupvFile supvFile = this.getOne(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId,busId).eq(SupvFile::getType,type).eq(SupvFile::getAttachmentType,attachmentType));
if(Objects.nonNull(supvFile)){
fileStorageUtil.downloadStream(response,supvFile.getFileUrl());
return null;

13
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java
View File

@@ -110,9 +110,16 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
item.setDutyOrgName(mapCode.get(item.getDutyOrgId()).getName());
}
SupvFile supvFile = supvFileMapper.selectOne(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId, item.getProblemId()).eq(SupvFile::getType, 1));
if (Objects.nonNull(supvFile)) {
item.setAttachmentName(supvFile.getAttachmentName());
List<SupvFile> supvFileList = supvFileMapper.selectList(new LambdaQueryWrapper<SupvFile>().eq(SupvFile::getBusiId, item.getProblemId()).eq(SupvFile::getType, 1));
if (CollUtil.isNotEmpty(supvFileList)) {
for(SupvFile supvFile:supvFileList){
if(supvFile.getAttachmentType().equals("01")){
item.setAttachmentName(supvFile.getAttachmentName());
}else {
item.setAttachmentNameTwo(supvFile.getAttachmentName());
}
}
}
}