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

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-06-29 18:24:21 +08:00
parent 2a34ba4ebe
commit a37f302fd1
14 changed files with 184 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/constant/Cts.java
View File

@ -39,6 +39,7 @@ public interface Cts {
String YYYY_MM_DD = "yyyy-MM-dd";
String TL_AUTH_USER = "authUser";
String PAGE_NO = "pageNo";
String PAGE_SIZE = "pageSize";
/**

9
src/main/java/com/zhgd/xmgl/modules/edu/mapper/xml/SafeEducationQuestionMapper.xml
View File

@ -34,15 +34,18 @@
INNER JOIN worker_info w ON a.worker_id=w.id
INNER JOIN worker_safe_education b ON a.edu_id=b.id
WHERE video_type=1 and w.project_sn=#{param.projectSn}
<if test="param.eduCourseName!=null and param.eduCourseName!=''">
<if test="param.eduCourseName != null and param.eduCourseName != ''">
and b.edu_course_name like CONCAT(CONCAT('%',#{param.eduCourseName}),'%')
</if>
<if test="param.workerName!=null and param.workerName!=''">
<if test="param.workerName != null and param.workerName != ''">
and w.worker_name like CONCAT(CONCAT('%',#{param.workerName}),'%')
</if>
<if test="param.eduType!=null and param.eduType!=''">
<if test="param.eduType != null and param.eduType != ''">
and b.edu_type=#{param.eduType}
</if>
<if test="param.workerId != null and param.workerId != ''">
and w.id=#{param.workerId}
</if>
</select>
<select id="selectSafeEducationQuestionList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
select a.*,cl.classify_name

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

@ -15,14 +15,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 教育培训记录信息
* @author： pengj
* @date： 2024-04-18
* @date： 2024-04-18
* @version： V1.0
*/
@Mapper
@DataScope
public interface ExamTrainRecordMapper extends BaseMapper<ExamTrainRecord> {
Page<ExamTrainRecordVo> pageList(Page page, @Param(Constants.WRAPPER)Wrapper<ExamTrainRecord> wrapper);
Page<ExamTrainRecordVo> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<ExamTrainRecord> wrapper);
Page<ExamTrainRecordVo> examPageList(Page page, @Param(Constants.WRAPPER)Wrapper<ExamTrainRecord> wrapper);
Page<ExamTrainRecordVo> examPageList(Page page, @Param(Constants.WRAPPER) Wrapper<ExamTrainRecord> wrapper);
List<ExamTrainRecordVo> getTrainRecordsByWorkerId(@Param("projectSn") String projectSn, @Param("workerId") String workerId);
}

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

@ -13,13 +13,25 @@
</select>
<select id="examPageList" resultType="com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo">
select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time, et.train_end_time, et.name trainName, et.duration examDuration,
p.name examPaperName from exam_train_record ec
left join exam_train et on ec.train_id = et.id
left join exam_subject es on et.subject_id = es.id
left join exam_course c on et.course_id = c.id
left join exam_paper p on et.exam_paper_id = p.id
where et.exam_paper_id IS NOT NULL) a
${ew.customSqlSegment}
select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time,
et.train_end_time, et.name trainName, et.duration examDuration,
p.name examPaperName from exam_train_record ec
left join exam_train et on ec.train_id = et.id
left join exam_subject es on et.subject_id = es.id
left join exam_course c on et.course_id = c.id
left join exam_paper p on et.exam_paper_id = p.id
where et.exam_paper_id IS NOT NULL) a
${ew.customSqlSegment}
</select>
</mapper>
<select id="getTrainRecordsByWorkerId" resultType="com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo">
select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time,
et.train_end_time, et.name trainName, et.duration examDuration,
p.name examPaperName from exam_train_record ec
left join exam_train et on ec.train_id = et.id
left join exam_subject es on et.subject_id = es.id
left join exam_course c on et.course_id = c.id
left join exam_paper p on et.exam_paper_id = p.id) a
where a.worker_id = #{workerId} and a.project_sn=#{projectSn}
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/exam/service/IExamTrainRecordService.java
View File

@ -24,4 +24,6 @@ public interface IExamTrainRecordService extends IService<ExamTrainRecord> {
ExamTrainRecord submit(List<ExamAnswerQuestion> examAnswerQuestionList);
void submitStudy(ExamCourseRecord examCourseRecord);
List<ExamTrainRecordVo> getTrainRecordsByWorkerId(String projectSn, String workerId);
}

5
src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java
View File

@ -137,6 +137,11 @@ public class ExamTrainRecordServiceImpl extends ServiceImpl<ExamTrainRecordMappe
}
}
@Override
public List<ExamTrainRecordVo> getTrainRecordsByWorkerId(String projectSn, String workerId) {
return baseMapper.getTrainRecordsByWorkerId(projectSn, workerId);
}
private void point(String dictData, List<ExamPointConfig> list, Long workerId, String desc) {
List<ExamPointConfig> collect = list.stream().filter(l -> l.getDictData().equals(dictData)).collect(Collectors.toList());
int score = 0;

10
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java
View File

@ -756,4 +756,14 @@ public class WorkerInfoController {
return Result.ok();
}
@OperLog(operModul = "劳务管理", operType = "导出", operDesc = "查询某人的安全教育得分记录")
@ApiOperation(value = "查询某人的安全教育得分记录", notes = "查询某人的安全教育得分记录", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "workerId", value = "人员id", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/getTrainRecordsByWorkerId")
public Result<List<TrainRecordVo>> getTrainRecordsByWorkerId(@ApiIgnore @RequestBody Map<String, Object> param) {
return Result.success(workerInfoService.getTrainRecordsByWorkerId(param));
}
}

20
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/TrainRecordVo.java Normal file
View File

@ -0,0 +1,20 @@
package com.zhgd.xmgl.modules.worker.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class TrainRecordVo {
@ApiModelProperty("培训日期")
private String date;
@ApiModelProperty("培训主题")
private String subject;
@ApiModelProperty("考试分数")
private Double score;
@ApiModelProperty("是否及格0不及格1鸡哥")
private Integer isPass;
}

10
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationWorkerMapper.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.worker.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
@ -36,4 +37,13 @@ public interface WorkerSafeEducationWorkerMapper extends BaseMapper<WorkerSafeEd
* @return
*/
int selectWorkerCountByProjectSn(String projectSn);
/**
* 查询安全教育记录通过人员id
*
* @param map
* @return
*/
List<JSONObject> selectEdusByWorkerId(Map<String, Object> map);
}

20
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationWorkerMapper.xml
View File

@ -88,8 +88,8 @@
<select id="getPersonNumberByEduType" resultType="java.lang.Long">
SELECT count(DISTINCT w.worker_id)
FROM worker_safe_education_worker w
inner join worker_safe_education wse on w.edu_id = wse.id and wse.edu_type = #{eduType}
inner join worker_info wi on wi.id = w.worker_id
inner join worker_safe_education wse on w.edu_id = wse.id and wse.edu_type = #{eduType}
inner join worker_info wi on wi.id = w.worker_id
WHERE w.project_sn = #{projectSn}
</select>
@ -98,4 +98,20 @@
FROM worker_safe_education_worker
WHERE project_sn = #{projectSn}
</select>
<select id="selectEdusByWorkerId" resultType="com.alibaba.fastjson.JSONObject">
SELECT w.*,
a.worker_name,
a.sex,
a.field_acquisition_url,
a.id_card idcardnumber,
(case
when a.birthday != '' then year(from_days(datediff(NOW(), a.birthday)))
else '-' end) age
FROM worker_safe_education_worker w
inner join worker_safe_education wse on w.edu_id = wse.id
LEFT JOIN worker_info a ON w.worker_id = a.id
WHERE w.id = #{workerId}
and w.project_sn = #{projectSn}
</select>
</mapper>

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

@ -170,4 +170,5 @@ public interface IWorkerInfoService extends IService<WorkerInfo> {
double getAvgSafeScore(List<Long> enterpriseIds, String projectSn);
List<TrainRecordVo> getTrainRecordsByWorkerId(Map<String, Object> param);
}

3
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerSafeEducationWorkerService.java
View File

@ -1,11 +1,13 @@
package com.zhgd.xmgl.modules.worker.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.entity.vo.EducationWorkerDataVo;
import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker;
import java.util.List;
import java.util.Map;
/**
@ -28,4 +30,5 @@ public interface IWorkerSafeEducationWorkerService extends IService<WorkerSafeEd
Long getPersonNumberByEduType(String projectSn, Integer eduType);
List<JSONObject> selectEdusByWorkerId(Map<String, Object> param);
}

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

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.worker.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
@ -19,7 +20,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gexin.fastjson.JSON;
import com.zhgd.exception.CustomException;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
@ -41,6 +41,9 @@ import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
import com.zhgd.xmgl.modules.car.service.impl.CarInfoServiceImpl;
import com.zhgd.xmgl.modules.dangerous.mapper.HiddenDangerInspectRecordMapper;
import com.zhgd.xmgl.modules.edu.service.ISafeEducationQuestionService;
import com.zhgd.xmgl.modules.exam.service.IExamTrainRecordService;
import com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo;
import com.zhgd.xmgl.modules.govtapi.GovtOpenApiService;
import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskRecordMapper;
import com.zhgd.xmgl.modules.project.entity.Project;
@ -69,7 +72,6 @@ import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpStatus;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@ -116,6 +118,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
WorkerInfoServiceImpl workerInfoService;
@Lazy
@Autowired
ISafeEducationQuestionService safeEducationQuestionService;
@Lazy
@Autowired
private IDictionaryItemService dictionaryItemService;
@Lazy
@Autowired
@ -237,6 +242,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
private String basePath;
@Value("${isGetFaceFeatureDate}")
private boolean isGetFaceFeatureDate;
@Lazy
@Autowired
private IExamTrainRecordService examTrainRecordService;
/**
* 人员管理分页
@ -2071,6 +2079,55 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
return Result.success(page);
}
///*
//全量和增量更新
// */
//public String getWorkerInfoByDev1(GetWorkerInfoByDevDto dto) {
// String deviceId = dto.getDeviceId();
// UfaceDev dev = ufaceDevMapper.selectOne(new LambdaQueryWrapper<UfaceDev>()
// .eq(UfaceDev::getDevSn, deviceId));
// if (dev == null) {
// throw new OpenAlertException("设备编号不存在");
// }
// String update = null;
// if (StringUtils.isNotBlank(dto.getUpdate())) {
// update = DateUtil.formatDateTime(new Date(Long.valueOf(dto.getUpdate()) * 1000));
// }
// String projectSn = dev.getProjectSn();
// List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
// .eq(WorkerInfo::getProjectSn, projectSn)
// .eq(WorkerInfo::getInserviceType, 1)
// .ge(update != null, WorkerInfo::getUpdateTime, update)
// );
//
// //添加人员
// ArrayList<GetWorkerInfoByDevVo.Worker> datas = new ArrayList<>();
// addDatas(workerInfos, "0", datas);
//
// //添加删除的人员(离职或已删除）
// List<WorkerInfo> exitWorkerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
// .eq(WorkerInfo::getProjectSn, projectSn)
// .eq(WorkerInfo::getInserviceType, 2)
// .ge(update != null, WorkerInfo::getUpdateTime, update)
// );
// addDatas(exitWorkerInfos, "1", datas);
// HashMap<String, Object> map = new HashMap<String, Object>();
// map.put("projectSn", projectSn);
// map.put("updateTime", update);
// List<WorkerInfo> deleteWorkerInfos = workerInfoDeleteMapper.getDeleteWorkerInfo(map);
// addDatas(deleteWorkerInfos, "1", datas);
//
//
// GetWorkerInfoByDevVo getWorkerInfoByDevVo = new GetWorkerInfoByDevVo();
// getWorkerInfoByDevVo.setSuccess(true);
// getWorkerInfoByDevVo.setCode(0);
// getWorkerInfoByDevVo.setMessage("success");
// getWorkerInfoByDevVo.setTime(System.currentTimeMillis() / 1000);
// getWorkerInfoByDevVo.setData(datas);
// getWorkerInfoByDevVo.setEvent("workers");
// return JSON.toJSONString(getWorkerInfoByDevVo);
//}
@Override
public PresenceAndTotalNumberOfEngineeringPersonnelVo queryThePresenceAndTotalNumberOfEngineeringPersonnel(Map<String, Object> paramMap) {
List<PresenceAndTotalNumberOfEngineeringPersonnelVo.Count> presentCountList = workerInfoMapper.queryPresentNum(paramMap);
@ -2123,55 +2180,6 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
return rtList;
}
///*
//全量和增量更新
// */
//public String getWorkerInfoByDev1(GetWorkerInfoByDevDto dto) {
// String deviceId = dto.getDeviceId();
// UfaceDev dev = ufaceDevMapper.selectOne(new LambdaQueryWrapper<UfaceDev>()
// .eq(UfaceDev::getDevSn, deviceId));
// if (dev == null) {
// throw new OpenAlertException("设备编号不存在");
// }
// String update = null;
// if (StringUtils.isNotBlank(dto.getUpdate())) {
// update = DateUtil.formatDateTime(new Date(Long.valueOf(dto.getUpdate()) * 1000));
// }
// String projectSn = dev.getProjectSn();
// List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
// .eq(WorkerInfo::getProjectSn, projectSn)
// .eq(WorkerInfo::getInserviceType, 1)
// .ge(update != null, WorkerInfo::getUpdateTime, update)
// );
//
// //添加人员
// ArrayList<GetWorkerInfoByDevVo.Worker> datas = new ArrayList<>();
// addDatas(workerInfos, "0", datas);
//
// //添加删除的人员(离职或已删除）
// List<WorkerInfo> exitWorkerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
// .eq(WorkerInfo::getProjectSn, projectSn)
// .eq(WorkerInfo::getInserviceType, 2)
// .ge(update != null, WorkerInfo::getUpdateTime, update)
// );
// addDatas(exitWorkerInfos, "1", datas);
// HashMap<String, Object> map = new HashMap<String, Object>();
// map.put("projectSn", projectSn);
// map.put("updateTime", update);
// List<WorkerInfo> deleteWorkerInfos = workerInfoDeleteMapper.getDeleteWorkerInfo(map);
// addDatas(deleteWorkerInfos, "1", datas);
//
//
// GetWorkerInfoByDevVo getWorkerInfoByDevVo = new GetWorkerInfoByDevVo();
// getWorkerInfoByDevVo.setSuccess(true);
// getWorkerInfoByDevVo.setCode(0);
// getWorkerInfoByDevVo.setMessage("success");
// getWorkerInfoByDevVo.setTime(System.currentTimeMillis() / 1000);
// getWorkerInfoByDevVo.setData(datas);
// getWorkerInfoByDevVo.setEvent("workers");
// return JSON.toJSONString(getWorkerInfoByDevVo);
//}
@Override
public SpecialWorkerStaticsVo getSpecialWorkerStatics(HashMap<String, Object> map) {
SpecialWorkerStaticsVo vo = workerInfoMapper.getSpecialWorkerStatics(map);
@ -2563,4 +2571,21 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
public double getAvgSafeScore(List<Long> enterpriseIds, String projectSn) {
return baseMapper.getAvgSafeScore(enterpriseIds, projectSn);
}
@Override
public List<TrainRecordVo> getTrainRecordsByWorkerId(Map<String, Object> param) {
List<TrainRecordVo> rtList = new ArrayList<>();
String projectSn = MapUtils.getString(param, Cts.PROJECT_SN);
String workerId = MapUtils.getString(param, "workerId");
param.put(Cts.PAGE_SIZE, -1);
List<ExamTrainRecordVo> list1 = examTrainRecordService.getTrainRecordsByWorkerId(projectSn, workerId);
for (ExamTrainRecordVo vo : list1) {
rtList.add(new TrainRecordVo(DateUtil.formatDate(vo.getStartExamTime()), vo.getTitle(), Convert.toDouble(vo.getScore()), vo.getIsPass()));
}
List<JSONObject> list3 = workerSafeEducationWorkerService.selectEdusByWorkerId(param);
for (JSONObject jo : list3) {
rtList.add(new TrainRecordVo(DateUtil.formatDate(DateUtil.parse(jo.getString("study_time"))), jo.getString("edu_course_name"), jo.getDouble("score"), Objects.equals(jo.getInteger("is_qualified"), 1) ? 1 : 0));
}
return rtList;
}
}

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

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.worker.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -103,4 +104,9 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl<WorkerSafe
public Long getPersonNumberByEduType(String projectSn, Integer eduType) {
return workerSafeEducationWorkerMapper.getPersonNumberByEduType(projectSn, eduType);
}
@Override
public List<JSONObject> selectEdusByWorkerId(Map<String, Object> param) {
return baseMapper.selectEdusByWorkerId(param);
}
}