admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG修复

Browse Source
This commit is contained in:
pengjie 2024-06-27 18:05:21 +08:00
parent 6e92b68ab7
commit 96a36cfb68
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -1223,6 +1223,9 @@
<if test="param.personType != null and param.personType != ''"> <if test="param.personType != null and param.personType != ''">
and a.person_type = #{param.personType} and a.person_type = #{param.personType}
</if> </if>
<if test="param.personSn != null and param.personSn != ''">
and a.person_sn = #{param.personSn}
</if>
</select> </select>
<select id="selectAttendanceWorkerCountByDate" resultType="java.util.Map" parameterType="map"> <select id="selectAttendanceWorkerCountByDate" resultType="java.util.Map" parameterType="map">
SELECT COUNT(1) total_person, SELECT COUNT(1) total_person,
@ -1239,6 +1242,9 @@
<if test="personType != null and personType != ''"> <if test="personType != null and personType != ''">
and a.person_type = #{personType} and a.person_type = #{personType}
</if> </if>
<if test="personSn != null and personSn != ''">
and a.person_sn = #{personSn}
</if>
</select> </select>
<select id="selectAppWorkerList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"> <select id="selectAppWorkerList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*, SELECT a.*,

1
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -1666,6 +1666,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
WorkerType workerType = workerTypeMapper.selectById(entityMap.get("workerTypeId")); WorkerType workerType = workerTypeMapper.selectById(entityMap.get("workerTypeId"));
List<WorkerSafeEducation> workerSafeEducations = workerSafeEducationMapper.selectList(Wrappers.<WorkerSafeEducation>lambdaQuery() List<WorkerSafeEducation> workerSafeEducations = workerSafeEducationMapper.selectList(Wrappers.<WorkerSafeEducation>lambdaQuery()
.eq(WorkerSafeEducation::getProjectSn, projectSn) .eq(WorkerSafeEducation::getProjectSn, projectSn)
.eq(WorkerSafeEducation::getEduType, 1)
.orderByDesc(WorkerSafeEducation::getAddTime)); .orderByDesc(WorkerSafeEducation::getAddTime));
if (workerSafeEducations == null || workerSafeEducations.size() == 0) { if (workerSafeEducations == null || workerSafeEducations.size() == 0) {
throw new OpenAlertException("该人员未参加过入场安全教育培训!"); throw new OpenAlertException("该人员未参加过入场安全教育培训!");