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

人员和教育培训修改

Browse Source
This commit is contained in:
pengjie 2024-05-24 17:24:36 +08:00
parent 66fd160ae2
commit 2702f5975b
8 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -96,6 +96,9 @@ public class DataScopeHandler implements DataPermissionHandler {
tables.put("inspect_task_record", "enterprise_id");
tables.put("xz_security_inspect_task_record", "enterprise_id");
tables.put("xz_security_quality_inspection_record", "enterprise_id");
tables.put("exam_notice", "enterprise_id");
tables.put("exam_train_record", "enterprise_id");
tables.put("exam_course_record", "enterprise_id");
if (!environmentUtil.isBaise()) {
tables.put("car_info", "enterprise_id");
tables.put("enterprise_info", "id");

6
src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamCourseRecord.java
View File

@ -122,6 +122,12 @@ public class ExamCourseRecord implements Serializable {
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**
* 企业ID
*/
@Excel(name = "企业ID", width = 15)
@ApiModelProperty(value = "企业ID")
private Long enterpriseId;
@TableField(exist = false)
@Excel(name = "课程名称", width = 20)

6
src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamTrainRecord.java
View File

@ -147,4 +147,10 @@ public class ExamTrainRecord implements Serializable {
@Excel(name = "考试时长", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "考试时长")
private String duration;
/**
* 企业ID
*/
@Excel(name = "企业ID", width = 15)
@ApiModelProperty(value = "企业ID")
private Long enterpriseId;
}

2
src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamCourseRecordMapper.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord;
@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @version： V1.0
*/
@Mapper
@DataScope
public interface ExamCourseRecordMapper extends BaseMapper<ExamCourseRecord> {
Page<ExamCourseRecord> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<ExamCourseRecord> wrapper);

2
src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainRecordMapper.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -18,6 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @version： V1.0
*/
@Mapper
@DataScope
public interface ExamTrainRecordMapper extends BaseMapper<ExamTrainRecord> {
Page<ExamTrainRecordVo> pageList(Page page, @Param(Constants.WRAPPER)Wrapper<ExamTrainRecord> wrapper);

3
src/main/java/com/zhgd/xmgl/modules/exam/service/IExamTrainService.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.exam.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.exam.entity.ExamCourse;
import com.zhgd.xmgl.modules.exam.entity.ExamTrain;
@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IExamTrainService extends IService<ExamTrain> {
Page<ExamTrain> pageList(Page page, Wrapper<ExamTrain> wrapper);
Page<ExamTrain> pageList(Page page, QueryWrapper<ExamTrain> wrapper);
boolean saveInfo(ExamTrain examTrain);

10
src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.exam.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
@ -28,6 +29,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -56,7 +58,12 @@ public class ExamTrainServiceImpl extends ServiceImpl<ExamTrainMapper, ExamTrain
private IExamCourseRecordService examCourseRecordService;
@Override
public Page<ExamTrain> pageList(Page page, Wrapper<ExamTrain> wrapper) {
public Page<ExamTrain> pageList(Page page, QueryWrapper<ExamTrain> wrapper) {
Set<Long> trainIds = examTrainRecordService.list().stream().map(e -> e.getTrainId()).collect(Collectors.toSet());
if (trainIds.size() == 0) {
return new Page<>();
}
wrapper.lambda().in(ExamTrain::getId, trainIds);
Page<ExamTrain> examTrainPage = baseMapper.pageList(page, wrapper);
List<Long> ids = examTrainPage.getRecords().stream().map(e -> e.getId()).collect(Collectors.toList());
if (ids.size() > 0) {
@ -108,6 +115,7 @@ public class ExamTrainServiceImpl extends ServiceImpl<ExamTrainMapper, ExamTrain
examCourseRecord.setWorkerName(r.getWorkerName());
examCourseRecord.setWorkerCard(r.getWorkerCard());
examCourseRecord.setTrainId(examTrain.getId());
examCourseRecord.setEnterpriseId(r.getEnterpriseId());
examCourseRecordList.add(examCourseRecord);
});
}

10
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java
View File

@ -77,9 +77,13 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl<WorkerInfoAudi
QueryWrapper<WorkerInfoAuditRecord> queryWrapper2=new QueryWrapper<>();
queryWrapper2.lambda().eq(WorkerInfoAuditRecord::getProjectSn,workerInfoAuditRecord.getProjectSn())
.eq(WorkerInfoAuditRecord::getIdCard,workerInfoAuditRecord.getIdCard());
int count2=workerInfoAuditRecordMapper.selectCount(queryWrapper2);
if(count2>0){
throw new OpenAlertException(MessageUtil.get("existsIDCardErr"));
WorkerInfoAuditRecord workerInfoAuditRecord1 = workerInfoAuditRecordMapper.selectOne(queryWrapper2);
if(workerInfoAuditRecord1 != null){
// throw new OpenAlertException(MessageUtil.get("existsIDCardErr"));
workerInfoAuditRecord.setId(workerInfoAuditRecord1.getId());
workerInfoAuditRecord.setIsExamPass(0);
workerInfoAuditRecordMapper.updateById(workerInfoAuditRecord1);
return;
}
workerInfoAuditRecord.setAddTime(new Date());
workerInfoAuditRecordMapper.insert(workerInfoAuditRecord);