Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 93409e5b authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

考试统计接口 gengdidi

parents 3a67c4ec fed02cbc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 358 additions and 167 deletions
danger-manage-admin/src/main/resources/application-dev.yml
View file @ 93409e5b
......@@ -73,13 +73,13 @@ spring:
# redis 配置
redis:
# 地址
host: 127.0.0.1
host: 36.148.23.59
# 端口，默认为6379
port: 6378
port: 6379
# 数据库索引
database: 1
# 密码
password: Redis@2021
password: 1qaz2wsx3edc
# 连接超时时间
timeout: 10s
lettuce:
......
danger-manage-system/src/main/java/com/zehong/system/domain/THiddenTroubleAssessment.java
View file @ 93409e5b
......@@ -20,6 +20,9 @@ public class THiddenTroubleAssessment extends BaseEntity
/** $column.columnComment */
private Long assessmentId;
private Long libraryId;
private Integer isXun;
/** 排查任务id */
@Excel(name = "排查任务id")
private Long workId;
......@@ -94,6 +97,59 @@ public class THiddenTroubleAssessment extends BaseEntity
private Integer updateType = 0;
private String riskPoint;
private String inspectTerm;
private String inspectBasis;
private String libraryContent;
public Long getLibraryId() {
return libraryId;
}
public void setLibraryId(Long libraryId) {
this.libraryId = libraryId;
}
public Integer getIsXun() {
return isXun;
}
public void setIsXun(Integer isXun) {
this.isXun = isXun;
}
public String getRiskPoint() {
return riskPoint;
}
public void setRiskPoint(String riskPoint) {
this.riskPoint = riskPoint;
}
public String getInspectTerm() {
return inspectTerm;
}
public void setInspectTerm(String inspectTerm) {
this.inspectTerm = inspectTerm;
}
public String getInspectBasis() {
return inspectBasis;
}
public void setInspectBasis(String inspectBasis) {
this.inspectBasis = inspectBasis;
}
public String getLibraryContent() {
return libraryContent;
}
public void setLibraryContent(String libraryContent) {
this.libraryContent = libraryContent;
}
public Integer getUpdateType() {
return updateType;
}
......
danger-manage-system/src/main/java/com/zehong/system/domain/TTrainCourse.java
View file @ 93409e5b
......@@ -87,6 +87,24 @@ public class TTrainCourse extends BaseEntity
@Excel(name = "考试人员")
private String testPersons;
private Integer personnelType;
public String getPlanName() {
return planName;
}
public void setPlanName(String planName) {
this.planName = planName;
}
public Integer getPersonnelType() {
return personnelType;
}
public void setPersonnelType(Integer personnelType) {
this.personnelType = personnelType;
}
public void setCourseId(Long courseId)
{
this.courseId = courseId;
......
danger-manage-system/src/main/java/com/zehong/system/domain/TTrainPlan.java
View file @ 93409e5b
......@@ -26,6 +26,8 @@ public class TTrainPlan extends BaseEntity
@Excel(name = "计划名称")
private String planName;
private Integer personnelType;
/** 排序 */
@Excel(name = "排序")
private Integer sort;
......@@ -37,6 +39,14 @@ public class TTrainPlan extends BaseEntity
private List<PlanPostVo> postList;
public Integer getPersonnelType() {
return personnelType;
}
public void setPersonnelType(Integer personnelType) {
this.personnelType = personnelType;
}
public List<PlanPostVo> getPostList() {
return postList;
}
......
danger-manage-system/src/main/java/com/zehong/system/domain/TTrainUserCourse.java
View file @ 93409e5b
......@@ -45,12 +45,23 @@ public class TTrainUserCourse extends BaseEntity
@Excel(name = "创建人")
private String createUser;
/**人员名称**/
private String staffName;
/**人员部门**/
private String deptName;
private Integer personnelType;
public Integer getPersonnelType() {
return personnelType;
}
public void setPersonnelType(Integer personnelType) {
this.personnelType = personnelType;
}
public void setUserCourseId(Long userCourseId)
{
this.userCourseId = userCourseId;
......
danger-manage-system/src/main/java/com/zehong/system/mapper/TTrainCourseMapper.java
View file @ 93409e5b
......@@ -69,7 +69,7 @@ public interface TTrainCourseMapper
* @param userIds
* @return
*/
public int insertUserCourse(@Param("courseId") Long courseId,@Param("userIds") List<String> userIds);
public int insertUserCourse(@Param("courseId") Long courseId,@Param("userIds") List<String> userIds,@Param("personnelType")Integer personnelType);
/**
* 用户课程表
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleWorkServiceImpl.java
View file @ 93409e5b
......@@ -84,10 +84,10 @@ public class THiddenTroubleWorkServiceImpl implements ITHiddenTroubleWorkService
{
tHiddenTroubleWork.setCreateTime(DateUtils.getNowDate());
int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(tHiddenTroubleWork);
// if(tHiddenTroubleWork.getWorkCycle()==1||tHiddenTroubleWork.getParentId()!=0L){
// String[] ids = tHiddenTroubleWork.getContent().split(",");
// tHiddenTroubleAssessmentMapper.inserts(tHiddenTroubleWork.getWorkId(),ids);
// }
if(tHiddenTroubleWork.getWorkCycle()==1){
String[] ids = tHiddenTroubleWork.getContent().split(",");
tHiddenTroubleAssessmentMapper.inserts(tHiddenTroubleWork.getWorkId(),ids);
}
return a;
}
......@@ -205,26 +205,28 @@ public class THiddenTroubleWorkServiceImpl implements ITHiddenTroubleWorkService
work.setWorkStep(0);
work.setCreateTime(d);
if(work.getBookId()!=null){
TStaningBook b = tStaningBookMapper.selectTStaningBookById(work.getBookId());
//如果隐患存在，并绑定的任务已完成则生成新新任务，否则不生成
if(b!=null&&b.getWorkId()!=null){
THiddenTroubleWork w = tHiddenTroubleWorkMapper.selectTHiddenTroubleWorkById(b.getWorkId());
if(w.getWorkStep()==4){
int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
b.setWorkId(work.getWorkId());
tStaningBookMapper.updateTStaningBook(b);
}else{
logger.info("===================任务进行中生成新排查任务失败");
}
}else {
int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
if(b!=null){
b.setWorkId(work.getWorkId());
tStaningBookMapper.updateTStaningBook(b);
}
}
// TStaningBook b = tStaningBookMapper.selectTStaningBookById(work.getBookId());
// //如果隐患存在，并绑定的任务已完成则生成新新任务，否则不生成
// if(b!=null&&b.getWorkId()!=null){
// THiddenTroubleWork w = tHiddenTroubleWorkMapper.selectTHiddenTroubleWorkById(b.getWorkId());
// if(w.getWorkStep()==4){
// int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
// b.setWorkId(work.getWorkId());
// tStaningBookMapper.updateTStaningBook(b);
// }else{
// logger.info("===================任务进行中生成新排查任务失败");
// }
// }else {
// int a = tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
// if(b!=null){
// b.setWorkId(work.getWorkId());
// tStaningBookMapper.updateTStaningBook(b);
// }
// }
}else {
tHiddenTroubleWorkMapper.insertTHiddenTroubleWork(work);
String[] ids = work.getContent().split(",");
tHiddenTroubleAssessmentMapper.inserts(work.getWorkId(),ids);
}
}
}
danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java
View file @ 93409e5b
......@@ -6,6 +6,7 @@ import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.StatisticsTrainCourse;
import com.zehong.system.domain.TTrainCourse;
import com.zehong.system.domain.TTrainCourseTopic;
import com.zehong.system.domain.TTrainPlan;
import com.zehong.system.domain.TTrainUserCourse;
import com.zehong.system.domain.vo.UserCourseVo;
import com.zehong.system.mapper.TTrainCourseMapper;
......@@ -62,7 +63,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
return 0;
}
List<String> userIds = tTrainPlanMapper.selectAlluserByplanId(course.getCourseType());
tTrainCourseMapper.insertUserCourse(courseId,userIds);
tTrainCourseMapper.insertUserCourse(courseId,userIds,course.getPersonnelType());
course.setStatus(1);
course.setReleaseTime(new Date());
return tTrainCourseMapper.updateTTrainCourse(course);
......@@ -88,6 +89,12 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
@Override
public Long insertTTrainCourse(TTrainCourse tTrainCourse)
{
if(tTrainCourse.getCourseType()!=null){
TTrainPlan p = tTrainPlanMapper.selectTTrainPlanById(tTrainCourse.getCourseType());
if(p!=null){
tTrainCourse.setPersonnelType(p.getPersonnelType());
}
}
tTrainCourse.setCreateTime(DateUtils.getNowDate());
tTrainCourseMapper.insertTTrainCourse(tTrainCourse);
return tTrainCourse.getCourseId();
......
danger-manage-system/src/main/resources/mapper/system/THiddenTroubleAssessmentMapper.xml
View file @ 93409e5b
......@@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="THiddenTroubleAssessment" id="THiddenTroubleAssessmentResult">
<result property="assessmentId" column="assessment_id" />
<result property="libraryId" column="library_id" />
<result property="isXun" column="is_xun" />
<result property="workId" column="work_id" />
<result property="checkFeedback" column="check_feedback" />
<result property="checkUrl" column="check_url" />
......@@ -23,6 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="modifyBegin" column="modify_begin" />
<result property="modifyEnd" column="modify_end" />
<result property="modifyComplete" column="modify_complete" />
<result property="riskPoint" column="risk_point" />
<result property="inspectTerm" column="inspect_term" />
<result property="inspectBasis" column="inspect_basis" />
<result property="libraryContent" column="library_content" />
</resultMap>
<sql id="selectTHiddenTroubleAssessmentVo">
......@@ -30,9 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectTHiddenTroubleAssessmentList" parameterType="THiddenTroubleAssessment" resultMap="THiddenTroubleAssessmentResult">
<include refid="selectTHiddenTroubleAssessmentVo"/>
SELECT a.`assessment_id`,a.library_id,a.is_xun,a.check_url,a.check_time,a.check_user,a.check_feedback,
l.risk_point,l.inspect_term,l.inspect_basis,l.library_content
FROM t_hidden_trouble_assessment a LEFT JOIN t_hidden_library l ON l.`library_id` = a.library_id
<where>
<if test="assessmentLevel != null "> and assessment_level = #{assessmentLevel}</if>
<if test="workId != null "> and work_id = #{workId}</if>
</where>
</select>
......@@ -124,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="inserts" >
insert into t_hidden_trouble_assessment (library_id,work_id) VALUES
<foreach collection="ids" item="item" index="index" separator=",">
(${item},workId)
(${item},#{workId})
</foreach>
</insert>
</mapper>
\ No newline at end of file
danger-manage-system/src/main/resources/mapper/system/THiddenTroubleWorkMapper.xml
View file @ 93409e5b
......@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="timeTerm != null">time_term,</if>
<if test="workRange != null">work_range,</if>
<if test="deptId != null">dept_id,</if>
<if test="staffId != null">staff_id,</if>
<if test="workStep != null">work_step,</if>
<if test="content != null">content,</if>
<if test="createTime != null">create_time,</if>
......@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="timeTerm != null">#{timeTerm},</if>
<if test="workRange != null">#{workRange},</if>
<if test="deptId != null">#{deptId},</if>
<if test="staffId != null">#{staffId},</if>
<if test="workStep != null">#{workStep},</if>
<if test="content != null">#{content},</if>
<if test="createTime != null">#{createTime},</if>
......
danger-manage-system/src/main/resources/mapper/system/TTrainCourseMapper.xml
View file @ 93409e5b
......@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="planName" column="plan_name" />
<result property="courseConent" column="course_conent" />
<result property="status" column="status" />
<result property="personnelType" column="personnel_type" />
<result property="releaseTime" column="release_time" />
<result property="enclosure" column="enclosure" />
<result property="video" column="video" />
......@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTTrainCourseVo">
select course_id, course_name, course_type, course_conent, status, release_time, enclosure, video, qualified_num, topic_num, create_time, create_user, is_del, data_kind, test_start_time, test_end_time, test_persons from t_train_course
select course_id, course_name, course_type, course_conent, status,personnel_type, release_time, enclosure, video, qualified_num, topic_num, create_time, create_user, is_del, data_kind, test_start_time, test_end_time, test_persons from t_train_course
</sql>
<select id="selectTTrainCourseList" parameterType="TTrainCourse" resultMap="TTrainCourseResult">
......@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="courseType != null">course_type,</if>
<if test="courseConent != null">course_conent,</if>
<if test="status != null">status,</if>
<if test="personnelType != null">personnel_type,</if>
<if test="releaseTime != null">release_time,</if>
<if test="enclosure != null">enclosure,</if>
<if test="video != null">video,</if>
......@@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="courseType != null">#{courseType},</if>
<if test="courseConent != null">#{courseConent},</if>
<if test="status != null">#{status},</if>
<if test="personnelType != null">#{personnelType},</if>
<if test="releaseTime != null">#{releaseTime},</if>
<if test="enclosure != null">#{enclosure},</if>
<if test="video != null">#{video},</if>
......@@ -113,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="courseType != null">course_type = #{courseType},</if>
<if test="courseConent != null">course_conent = #{courseConent},</if>
<if test="status != null">status = #{status},</if>
<if test="personnelType != null">personnel_type = #{personnelType},</if>
<if test="releaseTime != null">release_time = #{releaseTime},</if>
<if test="enclosure != null">enclosure = #{enclosure},</if>
<if test="video != null">video = #{video},</if>
......@@ -140,9 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<insert id="insertUserCourse">
INSERT INTO t_train_user_course(user_id,course_id,create_time) VALUES
INSERT INTO t_train_user_course(user_id,course_id,personnel_type,create_time) VALUES
<foreach collection="userIds" separator="," item="item">
(#{item},#{courseId},NOW())
(#{item},#{courseId},#{personnelType},NOW())
</foreach>
</insert>
<select id="userCourseList" resultType="com.zehong.system.domain.vo.UserCourseVo">
......@@ -153,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM t_train_user_course uc
LEFT JOIN t_train_course c ON c.`course_id` = uc.`course_id`
LEFT JOIN t_train_plan p ON p.`plan_id` = c.`course_type`
WHERE uc.user_id = #{userId}
WHERE uc.user_id = #{userId} and uc.personnel_type =1
<if test="type!=null and type == 1">
and uc.state !=2
</if>
......
danger-manage-system/src/main/resources/mapper/system/TTrainPlanMapper.xml
View file @ 93409e5b
......@@ -8,12 +8,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="planId" column="plan_id" />
<result property="planName" column="plan_name" />
<result property="sort" column="sort" />
<result property="personnelType" column="personnel_type" />
<result property="createTime" column="create_time" />
<result property="createUser" column="create_user" />
</resultMap>
<sql id="selectTTrainPlanVo">
select plan_id, plan_name, sort, create_time, create_user from t_train_plan
select plan_id, plan_name, sort, create_time,personnel_type, create_user from t_train_plan
</sql>
<select id="selectTTrainPlanList" parameterType="TTrainPlan" resultMap="TTrainPlanResult">
......@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">plan_id,</if>
<if test="planName != null">plan_name,</if>
<if test="sort != null">sort,</if>
<if test="personnelType != null">personnel_type,</if>
<if test="createTime != null">create_time,</if>
<if test="createUser != null">create_user,</if>
</trim>
......@@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">#{planId},</if>
<if test="planName != null">#{planName},</if>
<if test="sort != null">#{sort},</if>
<if test="personnelType != null">#{personnelType},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createUser != null">#{createUser},</if>
</trim>
......@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="planName != null">plan_name = #{planName},</if>
<if test="sort != null">sort = #{sort},</if>
<if test="personnelType != null">personnel_type = #{personnelType},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createUser != null">create_user = #{createUser},</if>
</trim>
......@@ -84,8 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN t_train_plan_post pp ON ( p.`post_id` = pp.`post_id` AND pp.`plan_id` = #{planId} )
</select>
<select id="selectAlluserByplanId" resultType="java.lang.String">
SELECT user_id FROM sys_user_post
WHERE post_id IN (SELECT post_id FROM t_train_plan_post WHERE plan_id =#{planId})
GROUP BY user_id
SELECT post_id FROM t_train_plan_post WHERE plan_id =#{planId}
</select>
</mapper>
\ No newline at end of file
danger-manage-system/src/main/resources/mapper/system/TTrainUserCourseMapper.xml
View file @ 93409e5b
......@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="userId" column="user_id" />
<result property="courseId" column="course_id" />
<result property="state" column="state" />
<result property="personnelType" column="personnel_type" />
<result property="examinationTime" column="examination_time" />
<result property="examinationResult" column="examination_result" />
<result property="createTime" column="create_time" />
......@@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTTrainUserCourseVo">
select user_course_id, user_id, course_id, state, examination_time, examination_result, create_time, create_user from t_train_user_course
select user_course_id, user_id, course_id, state, examination_time, personnel_type,examination_result, create_time, create_user from t_train_user_course
</sql>
<select id="selectTTrainUserCourseList" parameterType="TTrainUserCourse" resultMap="TTrainUserCourseResult">
......@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null">user_id,</if>
<if test="courseId != null">course_id,</if>
<if test="state != null">state,</if>
<if test="personnelType != null">personnel_type,</if>
<if test="examinationTime != null">examination_time,</if>
<if test="examinationResult != null">examination_result,</if>
<if test="createTime != null">create_time,</if>
......@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null">#{userId},</if>
<if test="courseId != null">#{courseId},</if>
<if test="state != null">#{state},</if>
<if test="personnelType != null">#{personnelType},</if>
<if test="examinationTime != null">#{examinationTime},</if>
<if test="examinationResult != null">#{examinationResult},</if>
<if test="createTime != null">#{createTime},</if>
......@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null">user_id = #{userId},</if>
<if test="courseId != null">course_id = #{courseId},</if>
<if test="state != null">state = #{state},</if>
<if test="personnelType != null">personnel_type = #{personnelType},</if>
<if test="examinationTime != null">examination_time = #{examinationTime},</if>
<if test="examinationResult != null">examination_result = #{examinationResult},</if>
<if test="createTime != null">create_time = #{createTime},</if>
......
danger-manage-web/.env.development
View file @ 93409e5b
......@@ -8,5 +8,5 @@ VUE_APP_BASE_API = '/dev-api'
VUE_CLI_BABEL_TRANSPILE_MODULES = true
#安全平台后台地址
VUE_APP_TARGET = 'http://36.138.181.113:8091/dangerManage'
VUE_APP_TARGET = 'http://localhost:8908/dangerManage'
danger-manage-web/src/views/educationPlanExam/lessonsProgram/index.vue
View file @ 93409e5b
......@@ -70,16 +70,16 @@
<el-table v-loading="loading" :data="lessonsList">
<el-table-column label="课程标题" align="center" prop="courseName" />
<el-table-column label="课程类别" align="center" prop="courseType">
<template v-slot="scope">
<div>
{{
courseOptions.filter(
(item) => item.planId == scope.row.courseType
)[0].planName
}}
</div>
</template>
<el-table-column label="课程类别" align="center" prop="planName">
<!--<template v-slot="scope">-->
<!--<div>-->
<!--{{-->
<!--courseOptions.filter(-->
<!--(item) => item.planId == scope.row.courseType-->
<!--)[0].planName-->
<!--}}-->
<!--</div>-->
<!--</template>-->
</el-table-column>
<el-table-column label="课程状态" align="center" prop="status">
<template v-slot="scope">
......@@ -241,7 +241,7 @@ export default {
this.loading = true;
getLessons(this.queryParams)
.then((res) => {
// console.log(res);
console.log(res);
this.lessonsList = res.rows;
this.total = res.total;
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment