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

木垒安全管理调整bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-10-29 09:10:09 +08:00
parent 43a4a16b62
commit b80d503bfd
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java
View File

@ -18,13 +18,11 @@ import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation; import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation;
import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker; import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker;
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
import com.zhgd.xmgl.modules.worker.mapper.WorkerSafeEducationMapper;
import com.zhgd.xmgl.modules.worker.mapper.WorkerSafeEducationWorkerMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerSafeEducationWorkerMapper;
import com.zhgd.xmgl.modules.worker.service.ITeamInfoService; import com.zhgd.xmgl.modules.worker.service.ITeamInfoService;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
import com.zhgd.xmgl.modules.worker.service.IWorkerSafeEducationService; import com.zhgd.xmgl.modules.worker.service.IWorkerSafeEducationService;
import com.zhgd.xmgl.modules.worker.service.IWorkerSafeEducationWorkerService; import com.zhgd.xmgl.modules.worker.service.IWorkerSafeEducationWorkerService;
import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.MessageUtil;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -150,7 +148,7 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
} }
resultMap.put("educationNum", list.size()); resultMap.put("educationNum", list.size());
resultMap.put("educationPass", list.stream().filter(l -> Objects.equals(l.getIsQualified(), 1)).count()); resultMap.put("educationPass", list.stream().filter(l -> Objects.equals(l.getIsQualified(), 1)).count());
resultMap.put("educationNewRecord", list.get(0).getStudyTime()); resultMap.put("educationNewRecord", CollUtil.isNotEmpty(list) ? list.get(0).getStudyTime() : null);
return resultMap; return resultMap;
} }