From 05a54025b1ae843f9d21a4450ec05c9e420e7f24 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 28 九月 2023 10:47:37 +0800
Subject: [PATCH] bug修改
---
exam-system/src/main/resources/mapper/noncoalmine/TrainingInstitutionMapper.xml | 2 +-
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/ExamSiteVO.java | 1 +
exam-system/src/main/resources/mapper/noncoalmine/ExamSiteMapper.xml | 2 +-
exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java | 10 ++++++++--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/ExamSiteVO.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/ExamSiteVO.java
index a03c420..e7f4d73 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/ExamSiteVO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/ExamSiteVO.java
@@ -36,6 +36,7 @@
private String remark;
//机构ID
private Long institutionId;
+ private String institutionName;
//删除标识（0未删除，1删除）
private Byte delFlag;
//是否为煤矿：0为非，1是
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java
index 203fcff..1844e07 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.noncoalmine.entity.ExamSite;
-import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
+import com.gkhy.exam.noncoalmine.entity.TrainingInstitution;
import com.gkhy.exam.noncoalmine.mapper.ExamSiteMapper;
+import com.gkhy.exam.noncoalmine.mapper.TrainingInstitutionMapper;
import com.gkhy.exam.noncoalmine.model.addForm.ExamSiteAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.ExamSiteModForm;
import com.gkhy.exam.noncoalmine.model.query.ExamSiteQuery;
@@ -18,7 +19,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +34,8 @@
private SysDistrictService districtService;
@Autowired
private ExamSiteMapper examSiteMapper;
+ @Autowired
+ private TrainingInstitutionMapper institutionMapper;
@Override
public List<ExamSiteVO> listByPage(ExamSiteQuery query) {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -53,6 +55,10 @@
}
}
List<ExamSiteVO> trainingInstitutionVOS = examSiteMapper.listByPage(query);
+ trainingInstitutionVOS.forEach(item->{
+ TrainingInstitution trainingInstitution = institutionMapper.selectById(item.getInstitutionId());
+ item.setInstitutionName(trainingInstitution != null ? trainingInstitution.getInstitutionName() : "");
+ });
return trainingInstitutionVOS;
}
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/ExamSiteMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/ExamSiteMapper.xml
index 840abd6..cdc70d4 100644
--- a/exam-system/src/main/resources/mapper/noncoalmine/ExamSiteMapper.xml
+++ b/exam-system/src/main/resources/mapper/noncoalmine/ExamSiteMapper.xml
@@ -18,7 +18,7 @@
<if test="query.districtCode != null and query.districtCode != ''">
AND d.`code` LIKE concat(#{query.districtCode}, '%')
</if>
- <if test="query.isCm != null and query.isCm != ''">
+ <if test="query.isCm != null">
AND s.is_cm = #{query.isCm}
</if>
order by s.create_time desc
diff --git a/exam-system/src/main/resources/mapper/noncoalmine/TrainingInstitutionMapper.xml b/exam-system/src/main/resources/mapper/noncoalmine/TrainingInstitutionMapper.xml
index a1e06d8..30d04f5 100644
--- a/exam-system/src/main/resources/mapper/noncoalmine/TrainingInstitutionMapper.xml
+++ b/exam-system/src/main/resources/mapper/noncoalmine/TrainingInstitutionMapper.xml
@@ -18,7 +18,7 @@
<if test="query.districtCode != null and query.districtCode != ''">
AND d.`code` LIKE concat(#{query.districtCode}, '%')
</if>
- <if test="query.isCm != null and query.isCm != ''">
+ <if test="query.isCm != null">
AND t.is_cm = #{query.isCm}
</if>
order by t.create_time desc
--
Gitblit v1.9.2