Parcourir la source

修改导出问题清单问题传参

tags/V1.3.3^2
wanjing il y a 11 mois
Parent
révision
4d1ae2d5b6
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/ExportInspectionFileRequest.java
  2. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/export/ExportInspectionFileByIdListService.java

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/ExportInspectionFileRequest.java Voir le fichier

@@ -21,7 +21,7 @@ public class ExportInspectionFileRequest extends BaseQuery {
/**
* 问题ID
*/
private String questionId;
private String questionCode;

/**
* 问题状态:5待确认 10已忽略 15已确认 20已生成工单 25问题已处理

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/export/ExportInspectionFileByIdListService.java Voir le fichier

@@ -72,7 +72,7 @@ public class ExportInspectionFileByIdListService {
List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
.eq(InspectionFile::getTenantId, user.getTenantId())
.eq(InspectionFile::getInspectionId, request.getInspectionId())
.eq(StringUtils.isNotEmpty(request.getQuestionId()), InspectionFile::getQuestionId, request.getQuestionId())
.eq(StringUtils.isNotEmpty(request.getQuestionCode()), InspectionFile::getQuestionCode, request.getQuestionCode())
.eq(ObjectUtil.isNotEmpty(request.getStatus()), InspectionFile::getStatus, request.getStatus())
.eq(InspectionFile::getMark, MarkEnum.VALID.getCode()));
if (CollectionUtil.isEmpty(inspectionFileList)) {

Chargement…
Annuler
Enregistrer