Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

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

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

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

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