修改程序
parent
0b4a5787d9
commit
a81c447e85
|
@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="examCode != null and examCode != ''">#{examCode},</if>
|
||||
<if test="groupCode != null and groupCode != ''">#{groupCode},</if>
|
||||
(select nvl(max(order_id),0) + 1 from exam_task_group where exam_code = #{examCode}),
|
||||
(select ifnull(max(order_id),0) + 1 from exam_task_group where exam_code = #{examCode}),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -30,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectExamTaskManagerList" parameterType="ExamTaskManager" resultMap="ExamTaskManagerResult">
|
||||
<include refid="selectExamTaskManagerVo"/>
|
||||
<where>
|
||||
<if test="examName != null and examName != ''"> and exam_name like '%' || #{examName} || '%'</if>
|
||||
<if test="examName != null and examName != ''"> and exam_name like concat('%', #{examName}, '%')</if>
|
||||
<if test="buildType != null and buildType != ''"> and build_type = #{buildType}</if>
|
||||
<if test="startDateText != null and startDateText != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(start_time,'yyyy-MM-dd') >= #{startDateText}
|
||||
AND date_format(start_time,'%Y-%m-%d') >= #{startDateText}
|
||||
</if>
|
||||
<if test="endDateText != null and endDateText != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(start_time,'yyyy-MM-dd') <= #{endDateText}
|
||||
AND date_format(start_time,'%Y-%m-%d') <= #{endDateText}
|
||||
</if>
|
||||
|
||||
</where>
|
||||
|
@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
create_time,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(exam_id),0) + 1 from exam_task_manager),
|
||||
(select ifnull(max(exam_id),0) + 1 from exam_task_manager),
|
||||
<if test="examCode != null and examCode != ''">#{examCode},</if>
|
||||
<if test="examName != null and examName != ''">#{examName},</if>
|
||||
<if test="examDescribe != null">#{examDescribe},</if>
|
||||
|
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
0,
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createDept != null">#{createDept},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -80,12 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<update id="updateStartTime" parameterType="ExamTaskPerson">
|
||||
update exam_task_person set start_time = sysdate
|
||||
update exam_task_person set start_time = now()
|
||||
where exam_code = #{examCode} and user_code = #{userCode}
|
||||
</update>
|
||||
|
||||
<update id="updateDoneStatus" parameterType="ExamTaskPerson">
|
||||
update exam_task_person set end_time = sysdate, status = 0
|
||||
update exam_task_person set end_time = now(), status = 0
|
||||
where exam_code = #{examCode} and user_code = #{userCode}
|
||||
</update>
|
||||
|
||||
|
|
|
@ -45,14 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
status,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(photo_id),0) + 1 from exam_task_picture),
|
||||
(select ifnull(max(photo_id),0) + 1 from exam_task_picture),
|
||||
<if test="photoPath != null and photoPath != ''">#{photoPath},</if>
|
||||
<if test="photoCode != null and photoCode != ''">#{photoCode},</if>
|
||||
<if test="photoUrl != null and photoUrl != ''">#{photoUrl},</if>
|
||||
<if test="fileName != null">#{fileName},</if>
|
||||
<if test="originalName != null">#{originalName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
|
|
@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
status,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(file_id),0) + 1 from fms_files),
|
||||
(select ifnull(max(file_id),0) + 1 from fms_files),
|
||||
<if test="fileTitle != null and fileTitle != ''">#{fileTitle},</if>
|
||||
<if test="fileDescribe != null and fileDescribe != ''">#{fileDescribe},</if>
|
||||
<if test="fileName != null and fileName != ''">#{fileName},</if>
|
||||
|
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="originalName != null">#{originalName},</if>
|
||||
<if test="uploadName != null">#{uploadName},</if>
|
||||
<if test="uploadDept != null">#{uploadDept},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="fileTitle != null and fileTitle != ''">file_title = #{fileTitle},</if>
|
||||
<if test="fileDescribe != null and fileDescribe != ''">file_describe = #{fileDescribe},</if>
|
||||
upload_time = sysdate,
|
||||
upload_time = now(),
|
||||
</trim>
|
||||
where file_id = #{fileId}
|
||||
</update>
|
||||
|
|
|
@ -47,14 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
status,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(photo_id),0) + 1 from fms_photo),
|
||||
(select ifnull(max(photo_id),0) + 1 from fms_photo),
|
||||
<if test="fileName != null and fileName != ''">#{fileName},</if>
|
||||
<if test="photoPath != null and photoPath != ''">#{photoPath},</if>
|
||||
<if test="photoUrl != null and photoUrl != ''">#{photoUrl},</if>
|
||||
<if test="originalName != null">#{originalName},</if>
|
||||
<if test="uploadName != null">#{uploadName},</if>
|
||||
<if test="uploadDept != null">#{uploadDept},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
|
|
@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<select id="selectQuestionsList" parameterType="ExamQuestionsListData" resultMap="ExamQuestionsListDataResult">
|
||||
select a.exam_code, a.questions_code, a.questions_number,b.questions_type,b.questions_score,c.questions_answer,nvl(c.is_mark,1) as is_mark,nvl(c.is_current,1) as is_current from exam_task_questions a
|
||||
select a.exam_code, a.questions_code, a.questions_number,b.questions_type,b.questions_score,c.questions_answer,ifnull(c.is_mark,1) as is_mark,ifnull(c.is_current,1) as is_current from exam_task_questions a
|
||||
left join exam_questions_property b on b.questions_code = a.questions_code
|
||||
left join exam_task_answer c on c.exam_code = a.exam_code and c.questions_code = a.questions_code and c.user_code = #{userCode}
|
||||
where a.exam_code = #{examCode}
|
||||
|
|
|
@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<select id="selectCurrentExam" parameterType="String" resultMap="ExamTitleDataResult">
|
||||
select a.exam_id, a.exam_code, a.exam_name, a.exam_describe, a.build_type, a.force_done, a.exam_bank, a.exam_bank_text, a.picture_url, a.start_time, a.end_time,sysdate as current_date, a.exam_duration, b.judge_number,c.radio_number, d.choice_number, e.questions_score, a.status, a.create_by, a.create_dept, a.create_time
|
||||
select a.exam_id, a.exam_code, a.exam_name, a.exam_describe, a.build_type, a.force_done, a.exam_bank, a.exam_bank_text, a.picture_url, a.start_time, a.end_time,now() as current_date, a.exam_duration, b.judge_number,c.radio_number, d.choice_number, e.questions_score, a.status, a.create_by, a.create_dept, a.create_time
|
||||
from exam_task_manager a
|
||||
left join
|
||||
(
|
||||
select questions_type,nvl(count(questions_type),0) as judge_number from exam_questions_property
|
||||
select questions_type,ifnull(count(questions_type),0) as judge_number from exam_questions_property
|
||||
where questions_type = 1 and questions_code in
|
||||
(
|
||||
select questions_code from exam_task_questions where exam_code =
|
||||
|
@ -42,20 +42,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate and start_time =
|
||||
) and end_time > now() and start_time =
|
||||
(
|
||||
select min(start_time) as start_time from exam_task_manager where exam_code in
|
||||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate
|
||||
) and end_time > now()
|
||||
)
|
||||
)
|
||||
) group by questions_type
|
||||
) b on 1 = 1
|
||||
left join
|
||||
(
|
||||
select questions_type,nvl(count(questions_type),0) as radio_number from exam_questions_property
|
||||
select questions_type,ifnull(count(questions_type),0) as radio_number from exam_questions_property
|
||||
where questions_type = 2 and questions_code in
|
||||
(
|
||||
select questions_code from exam_task_questions where exam_code =
|
||||
|
@ -64,20 +64,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate and start_time =
|
||||
) and end_time > now() and start_time =
|
||||
(
|
||||
select min(start_time) as start_time from exam_task_manager where exam_code in
|
||||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate
|
||||
) and end_time > now()
|
||||
)
|
||||
)
|
||||
) group by questions_type
|
||||
) c on 1 = 1
|
||||
left join
|
||||
(
|
||||
select questions_type,nvl(count(questions_type),0) as choice_number from exam_questions_property
|
||||
select questions_type,ifnull(count(questions_type),0) as choice_number from exam_questions_property
|
||||
where questions_type = 3 and questions_code in
|
||||
(
|
||||
select questions_code from exam_task_questions where exam_code =
|
||||
|
@ -86,13 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate and start_time =
|
||||
) and end_time > now() and start_time =
|
||||
(
|
||||
select min(start_time) as start_time from exam_task_manager where exam_code in
|
||||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate
|
||||
) and end_time > now()
|
||||
)
|
||||
)
|
||||
) group by questions_type
|
||||
|
@ -108,13 +108,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate and start_time =
|
||||
) and end_time > now() and start_time =
|
||||
(
|
||||
select min(start_time) as start_time from exam_task_manager where exam_code in
|
||||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate
|
||||
) and end_time > now()
|
||||
)
|
||||
)
|
||||
)
|
||||
|
@ -123,13 +123,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate and start_time =
|
||||
) and end_time > now() and start_time =
|
||||
(
|
||||
select min(start_time) as start_time from exam_task_manager where exam_code in
|
||||
(
|
||||
select exam_code from exam_task_person
|
||||
where user_code = #{userCode} and status = 1
|
||||
) and end_time > sysdate
|
||||
) and end_time > now()
|
||||
)
|
||||
</select>
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<insert id="intoExamUserScore" parameterType="ExamUserScore" >
|
||||
insert into exam_user_score
|
||||
select a.exam_code, a.user_code, b.start_time, sysdate as end_time, d.questions_score, a.exam_score,c.exam_number,a.answered_number,c.exam_number - a.answered_number as not_answered, 0 as status from
|
||||
select a.exam_code, a.user_code, b.start_time, now() as end_time, d.questions_score, a.exam_score,c.exam_number,a.answered_number,c.exam_number - a.answered_number as not_answered, 0 as status from
|
||||
(
|
||||
select exam_code, user_code, sum(exam_score) as exam_score,count(questions_code) as answered_number from exam_finish_answer
|
||||
where exam_code = #{examCode} and user_code = #{userCode} group by exam_code,user_code
|
||||
|
|
|
@ -46,14 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
status,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(photo_id),0) + 1 from exam_bank_picture),
|
||||
(select ifnull(max(photo_id),0) + 1 from exam_bank_picture),
|
||||
<if test="photoCode != null">#{photoCode},</if>
|
||||
<if test="photoPath != null">#{photoPath},</if>
|
||||
<if test="photoUrl != null">#{photoUrl},</if>
|
||||
<if test="fileName != null and fileName != ''">#{fileName},</if>
|
||||
<if test="originalName != null">#{originalName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
0,
|
||||
</trim>
|
||||
</insert>
|
||||
|
|
|
@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isRight != null">#{isRight},</if>
|
||||
<if test="orderId != null">#{orderId},</if>
|
||||
<if test="orderId == null or orderId == ''">
|
||||
(select nvl(max(order_id),0) + 1 from exam_questions_answer where questions_code = #{questionsCode}),
|
||||
(select ifnull(max(order_id),0) + 1 from exam_questions_answer where questions_code = #{questionsCode}),
|
||||
</if>
|
||||
|
||||
</trim>
|
||||
|
|
|
@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectExamQuestionsBankVo">
|
||||
select a.bank_id, a.bank_code, a.bank_name, a.bank_describe, a.bank_version, a.exam_type, b.type_name,a.online_date, a.picture_url, nvl(c.judge_number,0) as judge_number,nvl(d.radio_number,0) as radio_number,nvl(e.choice_number,0) as choice_number,a.radio_score, a.choice_score, a.judge_score, a.status, a.create_by, a.create_dept, a.create_time from exam_questions_bank a
|
||||
select a.bank_id, a.bank_code, a.bank_name, a.bank_describe, a.bank_version, a.exam_type, b.type_name,a.online_date, a.picture_url, ifnull(c.judge_number,0) as judge_number,ifnull(d.radio_number,0) as radio_number,ifnull(e.choice_number,0) as choice_number,a.radio_score, a.choice_score, a.judge_score, a.status, a.create_by, a.create_dept, a.create_time from exam_questions_bank a
|
||||
left join exam_type b on b.type_id = a.exam_type
|
||||
left join
|
||||
(
|
||||
|
@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
create_time,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(bank_id),0) + 1 from exam_questions_bank),
|
||||
(select ifnull(max(bank_id),0) + 1 from exam_questions_bank),
|
||||
<if test="bankCode != null">#{bankCode},</if>
|
||||
<if test="bankName != null and bankName != ''">#{bankName},</if>
|
||||
<if test="bankDescribe != null">#{bankDescribe},</if>
|
||||
|
@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
0,
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createDept != null">#{createDept},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -23,12 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectExamQuestionsListVo">
|
||||
select rownum, bank_code, bank_name, questions_id, questions_code, questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from
|
||||
select @rownum := @rownum + 1 as rownum, bank_code, bank_name, questions_id, questions_code, questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from
|
||||
(
|
||||
select a.bank_code, b.bank_name, a.questions_id, a.questions_code, substr(a.questions_title,1,50) as questions_title, a.questions_type, a.questions_score, a.rate_number, a.right_answer, a.answer_analyse, a.status, a.create_by, a.create_dept, a.create_time from exam_questions_property a
|
||||
select a.bank_code, b.bank_name, a.questions_id, a.questions_code, substring(a.questions_title,1,50) as questions_title, a.questions_type, a.questions_score, a.rate_number, a.right_answer, a.answer_analyse, a.status, a.create_by, a.create_dept, a.create_time from exam_questions_property a
|
||||
left join exam_questions_bank b on b.bank_code = a.bank_code
|
||||
order by a.questions_type, a.bank_code, a.questions_id
|
||||
)
|
||||
order by a.questions_type, a.bank_code, a.questions_id
|
||||
) t, (select @rownum := 0) r
|
||||
</sql>
|
||||
|
||||
<select id="selectExamQuestionsList" parameterType="String" resultMap="ExamQuestionsListResult">
|
||||
|
|
|
@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="bankCode != null">#{bankCode},</if>
|
||||
(select nvl(max(questions_id),0) + 1 from exam_questions),
|
||||
(select ifnull(max(questions_id),0) + 1 from exam_questions),
|
||||
<if test="questionsCode != null">#{questionsCode},</if>
|
||||
<if test="questionsTitle != null">#{questionsTitle},</if>
|
||||
<if test="questionsContent != null">#{questionsContent},</if>
|
||||
|
@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
0,
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createDept != null">#{createDept},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -22,10 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectExamQuestionsPropertyVo">
|
||||
select rownum, bank_code, questions_id, questions_code, questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from
|
||||
select @rownum := @rownum + 1 as rownum, bank_code, questions_id, questions_code, questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from
|
||||
(
|
||||
select bank_code, questions_id, questions_code, substr(questions_title,1,50) as questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from exam_questions_property
|
||||
)
|
||||
select bank_code, questions_id, questions_code, substring(questions_title,1,50) as questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from exam_questions_property
|
||||
) t, (select @rownum := 0) r
|
||||
</sql>
|
||||
|
||||
<select id="selectExamQuestionsPropertyList" parameterType="ExamQuestionsProperty" resultMap="ExamQuestionsPropertyResult">
|
||||
|
@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="bankCode != null">#{bankCode},</if>
|
||||
(select nvl(max(questions_id),0) + 1 from exam_questions_property),
|
||||
(select ifnull(max(questions_id),0) + 1 from exam_questions_property),
|
||||
<if test="questionsCode != null">#{questionsCode},</if>
|
||||
<if test="questionsTitle != null">#{questionsTitle},</if>
|
||||
<if test="questionsType != null">#{questionsType},</if>
|
||||
|
@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
0,
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createDept != null">#{createDept},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -44,14 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
create_time,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(type_id),0) + 1 from exam_type),
|
||||
(select ifnull(max(type_id),0) + 1 from exam_type),
|
||||
<if test="parentId != null">#{parentId},</if>
|
||||
<if test="typeCode != null">#{typeCode},</if>
|
||||
<if test="typeName != null and typeName != ''">#{typeName},</if>
|
||||
<if test="orderId != null">#{orderId},</if>
|
||||
0,
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -59,13 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
create_time,
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
(select nvl(max(group_id),0) + 1 from sys_group),
|
||||
(select ifnull(max(group_id),0) + 1 from sys_group),
|
||||
<if test="groupCode != null and groupCode != ''">#{groupCode},</if>
|
||||
<if test="groupName != null and groupName != ''">#{groupName},</if>
|
||||
<if test="groupDescribe != null">#{groupDescribe},</if>
|
||||
0,
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
sysdate,
|
||||
now(),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="groupCode != null and groupCode != ''">#{groupCode},</if>
|
||||
<if test="personCode != null and personCode != ''">#{personCode},</if>
|
||||
(select nvl(max(order_id),0) + 1 from sys_group_person where group_code = #{groupCode}),
|
||||
(select ifnull(max(order_id),0) + 1 from sys_group_person where group_code = #{groupCode}),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="choiceCode != null and choiceCode != ''">#{choiceCode},</if>
|
||||
<if test="userCode != null and userCode != ''">#{userCode},</if>
|
||||
(select nvl(max(order_id),0) + 1 from temp_user_choice where choice_code = #{choiceCode}),
|
||||
(select ifnull(max(order_id),0) + 1 from temp_user_choice where choice_code = #{choiceCode}),
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<version>3.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<packaging>war</packaging>
|
||||
<packaging>jar</packaging>
|
||||
<artifactId>ruoyi-admin</artifactId>
|
||||
|
||||
<description>
|
||||
|
@ -98,11 +98,11 @@
|
|||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<failOnMissingWebXml>false</failOnMissingWebXml>
|
||||
<warName>exam-online-api</warName>
|
||||
<warName>examapi</warName>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<finalName>exam-online-api</finalName>
|
||||
<finalName>examapi</finalName>
|
||||
</build>
|
||||
|
||||
</project>
|
|
@ -7,9 +7,9 @@ spring:
|
|||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://192.168.126.19:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://62.234.3.186:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: hadoopspring123
|
||||
password: Sxyanzhu@cf123
|
||||
|
||||
#url: jdbc:oracle:thin:@127.0.0.1:1521/xchwdb
|
||||
#username: exam_user
|
||||
|
@ -37,7 +37,7 @@ spring:
|
|||
# 配置一个连接在池中最大生存的时间,单位是毫秒
|
||||
maxEvictableIdleTimeMillis: 900000
|
||||
# 配置检测连接是否有效
|
||||
validationQuery: SELECT 1 FROM DUAL
|
||||
validationQuery: SELECT 1
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
|
|
|
@ -22,7 +22,7 @@ server:
|
|||
port: 8040
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /exam-online-api
|
||||
context-path: /examapi
|
||||
tomcat:
|
||||
# tomcat的URI编码
|
||||
uri-encoding: UTF-8
|
||||
|
@ -124,12 +124,10 @@ mybatis:
|
|||
configLocation: classpath:mybatis/mybatis-config.xml
|
||||
|
||||
# PageHelper分页插件
|
||||
pagehelper:
|
||||
# helperDialect: mysql
|
||||
helperDialect: oracle
|
||||
reasonable: true
|
||||
pagehelper:
|
||||
helperDialect: mysql
|
||||
supportMethodsArguments: true
|
||||
params: count=countSql
|
||||
params: count=countSql
|
||||
|
||||
# Swagger配置
|
||||
swagger:
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
"imageCompressEnable": true,
|
||||
"imageCompressBorder": 1600,
|
||||
"imageInsertAlign": "none",
|
||||
"imageUrlPrefix": "http://127.0.0.1:8080/exam-online-api",
|
||||
"imageUrlPrefix": "http://127.0.0.1:8080/examapi",
|
||||
"imagePathFormat": "/photo/ueditor/{yyyy}{mm}{dd}/{time}{rand:6}",
|
||||
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
|||
"videoActionName": "uploadvideo",
|
||||
"videoFieldName": "upfile",
|
||||
"videoPathFormat": "/photo/ueditor/{yyyy}{mm}{dd}/{time}{rand:6}",
|
||||
"videoUrlPrefix": "http://127.0.0.1:8080/exam-online-api",
|
||||
"videoUrlPrefix": "http://127.0.0.1:8080/examapi",
|
||||
"videoMaxSize": 102400000,
|
||||
"videoAllowFiles": [
|
||||
".mp4", ".ogg", ".webm"],
|
||||
|
|
|
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<insert id="insertGenTableColumn" parameterType="GenTableColumn">
|
||||
<selectKey keyProperty="columnId" resultType="long" order="BEFORE">
|
||||
select nvl(max(column_id),0) + 1 from gen_table_column
|
||||
select ifnull(max(column_id),0) + 1 from gen_table_column
|
||||
</selectKey>
|
||||
insert into gen_table_column (
|
||||
column_id,
|
||||
|
@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(column_id),0) + 1 from gen_table_column),
|
||||
(select ifnull(max(column_id),0) + 1 from gen_table_column),
|
||||
<if test="tableId != null and tableId != ''">#{tableId},</if>
|
||||
<if test="columnName != null and columnName != ''">#{columnName},</if>
|
||||
<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
|
||||
|
@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="dictType != null and dictType != ''">#{dictType},</if>
|
||||
<if test="sort != null">#{sort},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dict_type = #{dictType,jdbcType=VARCHAR},
|
||||
sort = #{sort},
|
||||
update_by = #{updateBy,jdbcType=VARCHAR},
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where column_id = #{columnId}
|
||||
</update>
|
||||
|
|
|
@ -61,10 +61,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectGenTableVo"/>
|
||||
<where>
|
||||
<if test="tableName != null and tableName != ''">
|
||||
AND lower(table_name) like lower('%' || #{tableName} || '%')
|
||||
AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
|
||||
</if>
|
||||
<if test="tableComment != null and tableComment != ''">
|
||||
AND lower(table_comment) like lower('%' || #{tableComment} || '%')
|
||||
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
@ -78,11 +78,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
AND dt.table_name NOT LIKE 'QRTZ_%' AND dt.table_name NOT LIKE 'GEN_%'
|
||||
AND lower(dt.table_name) NOT IN (select table_name from gen_table)
|
||||
<if test="tableName != null and tableName != ''">
|
||||
AND lower(dt.table_name) like lower('%' || #{tableName} || '%')
|
||||
</if>
|
||||
<if test="tableComment != null and tableComment != ''">
|
||||
AND lower(dtc.comments) like lower( '%' || #{tableComment} || '%')
|
||||
</if>
|
||||
AND lower(dt.table_name) like lower(concat('%', #{tableName}, '%'))
|
||||
</if>
|
||||
<if test="tableComment != null and tableComment != ''">
|
||||
AND lower(dtc.comments) like lower(concat('%', #{tableComment}, '%'))
|
||||
</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
|
@ -136,12 +136,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<select id="selectMenuId" resultType="java.lang.Long">
|
||||
SELECT seq_sys_menu.nextval FROM dual
|
||||
SELECT ifnull(max(menu_id),0) + 1 FROM sys_menu
|
||||
</select>
|
||||
|
||||
<insert id="insertGenTable" parameterType="GenTable">
|
||||
<selectKey keyProperty="tableId" resultType="long" order="BEFORE">
|
||||
select nvl(max(table_id),0) + 1 from gen_table
|
||||
select ifnull(max(table_id),0) + 1 from gen_table
|
||||
</selectKey>
|
||||
insert into gen_table (
|
||||
table_id,
|
||||
|
@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(table_id),0) + 1 from gen_table),
|
||||
(select ifnull(max(table_id),0) + 1 from gen_table),
|
||||
<if test="tableName != null">#{tableName},</if>
|
||||
<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
|
||||
<if test="className != null and className != ''">#{className},</if>
|
||||
|
@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="genPath != null and genPath != ''">#{genPath},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="options != null and options != ''">options = #{options},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where table_id = #{tableId}
|
||||
</update>
|
||||
|
@ -213,4 +213,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -1,22 +1,18 @@
|
|||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate, '', null, '${functionName}菜单');
|
||||
insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', now(), '', null, '${functionName}菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate, '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate, '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate, '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate, '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate, '', null, '');
|
||||
insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', now(), '', null, '');
|
||||
insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', now(), '', null, '');
|
||||
insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', now(), '', null, '');
|
||||
insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', now(), '', null, '');
|
||||
insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', now(), '', null, '');
|
|
@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectJobLogVo"/>
|
||||
<where>
|
||||
<if test="jobName != null and jobName != ''">
|
||||
AND job_name like '%' || #{jobName} || '%'
|
||||
AND job_name like concat('%', #{jobName}, '%')
|
||||
</if>
|
||||
<if test="jobGroup != null and jobGroup != ''">
|
||||
AND job_group = #{jobGroup}
|
||||
|
@ -33,13 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
AND status = #{status}
|
||||
</if>
|
||||
<if test="invokeTarget != null and invokeTarget != ''">
|
||||
AND invoke_target like '%' || #{invokeTarget} || '%'
|
||||
AND invoke_target like concat('%', #{invokeTarget}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(create_time,'yyyy-mm-dd hh24:mi:ss') >= to_char(#{params.beginTime},'yyyy-mm-dd hh24:mi:ss')
|
||||
AND date_format(create_time,'%Y-%m-%d %H:%i:%s') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(create_time,'yyyy-mm-dd hh24:mi:ss') <= to_char(#{params.endTime},'yyyy-mm-dd hh24:mi:ss')
|
||||
AND date_format(create_time,'%Y-%m-%d %H:%i:%s') <= #{params.endTime}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
@ -86,8 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status !=null">status = #{status},</if>
|
||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where job_id = #{jobId}
|
||||
</update>
|
||||
|
@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -42,19 +42,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectConfigVo"/>
|
||||
<where>
|
||||
<if test="configName != null and configName != ''">
|
||||
AND config_name like '%' || #{configName} || '%'
|
||||
AND config_name like concat('%', #{configName}, '%')
|
||||
</if>
|
||||
<if test="configType != null and configType != ''">
|
||||
AND config_type = #{configType}
|
||||
</if>
|
||||
<if test="configKey != null and configKey != ''">
|
||||
AND config_key like '%' || #{configKey} || '%'
|
||||
AND config_key like concat('%', #{configKey}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(create_time,'yyyy-MM-dd') >= #{params.beginTime}
|
||||
AND date_format(create_time,'%Y-%m-%d') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(create_time,'yyyy-MM-dd') <= #{params.endTime}
|
||||
AND date_format(create_time,'%Y-%m-%d') <= #{params.endTime}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
@ -75,14 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="remark != null and remark != ''">remark,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(config_id),0) + 1 from sys_config),
|
||||
(select ifnull(max(config_id),0) + 1 from sys_config),
|
||||
<if test="configName != null and configName != ''">#{configName},</if>
|
||||
<if test="configKey != null and configKey != ''">#{configKey},</if>
|
||||
<if test="configValue != null and configValue != ''">#{configValue},</if>
|
||||
<if test="configType != null and configType != ''">#{configType},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="configType != null and configType != ''">config_type = #{configType},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where config_id = #{configId}
|
||||
</update>
|
||||
|
|
|
@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(dept_id),0) + 1 from sys_dept),
|
||||
(select ifnull(max(dept_id),0) + 1 from sys_dept),
|
||||
<if test="parentId != null and parentId != 0">#{parentId},</if>
|
||||
<if test="deptCode != null and deptCode != ''">#{deptCode},</if>
|
||||
<if test="deptName != null and deptName != ''">#{deptName},</if>
|
||||
|
@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null">#{status},</if>
|
||||
'0',
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="email != null">email = #{email},</if>
|
||||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where dept_id = #{deptId}
|
||||
</update>
|
||||
|
|
|
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where dict_code = #{dictCode}
|
||||
</update>
|
||||
|
@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(config_id),0) + 1 from sys_config),
|
||||
(select ifnull(max(config_id),0) + 1 from sys_config),
|
||||
<if test="dictSort != null">#{dictSort},</if>
|
||||
<if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
|
||||
<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
|
||||
|
@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null">#{status},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -24,19 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectDictTypeVo"/>
|
||||
<where>
|
||||
<if test="dictName != null and dictName != ''">
|
||||
AND dict_name like '%' || #{dictName} || '%'
|
||||
AND dict_name like concat('%', #{dictName}, '%')
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND status = #{status}
|
||||
</if>
|
||||
<if test="dictType != null and dictType != ''">
|
||||
AND dict_type like '%' || #{dictType} || '%'
|
||||
AND dict_type like concat('%', #{dictType}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(create_time,'yyyy-MM-dd') >= #{params.beginTime}
|
||||
AND date_format(create_time,'%Y-%m-%d') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(create_time,'yyyy-MM-dd') <= #{params.endTime}
|
||||
AND date_format(create_time,'%Y-%m-%d') <= #{params.endTime}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where dict_id = #{dictId}
|
||||
</update>
|
||||
|
@ -94,14 +94,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(dict_id),0) + 1 from sys_dict_type),
|
||||
(select ifnull(max(dict_id),0) + 1 from sys_dict_type),
|
||||
<if test="dictName != null and dictName != ''">#{dictName},</if>
|
||||
<if test="dictType != null and dictType != ''">#{dictType},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -18,26 +18,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<insert id="insertLogininfor" parameterType="SysLogininfor">
|
||||
insert into sys_logininfor (info_id,user_name, status, ipaddr, login_location, browser, os, msg, login_time)
|
||||
values ((select nvl(max(info_id),0) + 1 from sys_logininfor),#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate)
|
||||
values ((select ifnull(max(info_id),0) + 1 from sys_logininfor),#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now())
|
||||
</insert>
|
||||
|
||||
<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
|
||||
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
|
||||
<where>
|
||||
<if test="ipaddr != null and ipaddr != ''">
|
||||
AND ipaddr like '%' || #{ipaddr} || '%'
|
||||
AND ipaddr like concat('%', #{ipaddr}, '%')
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND status = #{status}
|
||||
</if>
|
||||
<if test="userName != null and userName != ''">
|
||||
AND user_name like '%' || #{userName} || '%'
|
||||
AND user_name like concat('%', #{userName}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(login_time,'yyyy-MM-dd') >= #{params.beginTime}
|
||||
AND date_format(login_time,'%Y-%m-%d') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(login_time,'yyyy-MM-dd') <= #{params.endTime}
|
||||
AND date_format(login_time,'%Y-%m-%d') <= #{params.endTime}
|
||||
</if>
|
||||
</where>
|
||||
order by info_id desc
|
||||
|
@ -54,4 +54,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
truncate table sys_logininfor
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -27,7 +27,7 @@
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectMenuVo">
|
||||
select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, nvl(perms,'') as perms, icon, create_time
|
||||
select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
|
||||
from sys_menu
|
||||
</sql>
|
||||
|
||||
|
@ -48,13 +48,13 @@
|
|||
</select>
|
||||
|
||||
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
|
||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, nvl(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
|
||||
order by m.parent_id, m.order_num
|
||||
</select>
|
||||
|
||||
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
|
||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, nvl(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||
from sys_menu m
|
||||
left join sys_role_menu rm on m.menu_id = rm.menu_id
|
||||
left join sys_user_role ur on rm.role_id = ur.role_id
|
||||
|
@ -73,7 +73,7 @@
|
|||
</select>
|
||||
|
||||
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
|
||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, nvl(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||
from sys_menu m
|
||||
left join sys_role_menu rm on m.menu_id = rm.menu_id
|
||||
left join sys_user_role ur on rm.role_id = ur.role_id
|
||||
|
@ -141,7 +141,7 @@
|
|||
<if test="icon !=null and icon != ''">icon = #{icon},</if>
|
||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where menu_id = #{menuId}
|
||||
</update>
|
||||
|
@ -165,7 +165,7 @@
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(menu_id),0) + 1 from sys_menu),
|
||||
(select ifnull(max(menu_id),0) + 1 from sys_menu),
|
||||
<if test="menuId != null and menuId != 0">#{menuId},</if>
|
||||
<if test="parentId != null and parentId != 0">#{parentId},</if>
|
||||
<if test="menuName != null and menuName != ''">#{menuName},</if>
|
||||
|
@ -181,7 +181,7 @@
|
|||
<if test="icon != null and icon != ''">#{icon},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -53,14 +53,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(notice_id),0) + 1 from sys_notice),
|
||||
(select ifnull(max(notice_id),0) + 1 from sys_notice),
|
||||
<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
|
||||
<if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
|
||||
<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
|
||||
<if test="status != null and status != ''">#{status}, </if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="noticeContent != null">notice_content = #{noticeContent}, </if>
|
||||
<if test="status != null and status != ''">status = #{status}, </if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where notice_id = #{noticeId}
|
||||
</update>
|
||||
|
|
|
@ -30,14 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<insert id="insertOperlog" parameterType="SysOperLog">
|
||||
insert into sys_oper_log(oper_id,title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
|
||||
values ((select nvl(max(oper_id),0) + 1 from sys_oper_log),#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate)
|
||||
values ((select ifnull(max(oper_id),0) + 1 from sys_oper_log),#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, now())
|
||||
</insert>
|
||||
|
||||
<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
|
||||
<include refid="selectOperLogVo"/>
|
||||
<where>
|
||||
<if test="title != null and title != ''">
|
||||
AND title like '%' || #{title} || '%'
|
||||
AND title like concat('%', #{title}, '%')
|
||||
</if>
|
||||
<if test="businessType != null and businessType != ''">
|
||||
AND business_type = #{businessType}
|
||||
|
@ -52,13 +52,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
AND status = #{status}
|
||||
</if>
|
||||
<if test="operName != null and operName != ''">
|
||||
AND oper_name like '%' || #{operName} || '%'
|
||||
AND oper_name like concat('%', #{operName}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(oper_time,'yyyy-MM-dd') >= #{params.beginTime}
|
||||
AND date_format(oper_time,'%Y-%m-%d') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(oper_time,'yyyy-MM-dd') <= #{params.endTime}
|
||||
AND date_format(oper_time,'%Y-%m-%d') <= #{params.endTime}
|
||||
</if>
|
||||
</where>
|
||||
order by oper_id desc
|
||||
|
@ -80,4 +80,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
truncate table sys_oper_log
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where post_id = #{postId}
|
||||
</update>
|
||||
|
@ -97,14 +97,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(post_id),0) + 1 from sys_post),
|
||||
(select ifnull(max(post_id),0) + 1 from sys_post),
|
||||
<if test="postCode != null and postCode != ''">#{postCode},</if>
|
||||
<if test="postName != null and postName != ''">#{postName},</if>
|
||||
<if test="postSort != null and postSort != ''">#{postSort},</if>
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
|
|
@ -34,19 +34,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectRoleVo"/>
|
||||
where r.del_flag = '0'
|
||||
<if test="roleName != null and roleName != ''">
|
||||
AND r.role_name like like '%' || #{roleName} || '%'
|
||||
AND r.role_name like concat('%', #{roleName}, '%')
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND r.status = #{status}
|
||||
</if>
|
||||
<if test="roleKey != null and roleKey != ''">
|
||||
AND r.role_key like like '%' || #{roleKey} || '%'
|
||||
AND r.role_key like concat('%', #{roleKey}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(r.create_time,'yyyy-MM-dd') >= #{params.beginTime}
|
||||
AND date_format(r.create_time,'%Y-%m-%d') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(r.create_time,'yyyy-MM-dd') <= #{params.endTime}
|
||||
AND date_format(r.create_time,'%Y-%m-%d') <= #{params.endTime}
|
||||
</if>
|
||||
<!-- 数据范围过滤 -->
|
||||
${params.dataScope}
|
||||
|
@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(role_id),0) + 1 from sys_role),
|
||||
(select ifnull(max(role_id),0) + 1 from sys_role),
|
||||
<if test="roleName != null and roleName != ''">#{roleName},</if>
|
||||
<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
|
||||
<if test="roleSort != null and roleSort != ''">#{roleSort},</if>
|
||||
|
@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
'0',
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where role_id = #{roleId}
|
||||
</update>
|
||||
|
@ -152,4 +152,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -61,19 +61,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
select u.user_id, u.user_code,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
<if test="nickName != null and nickName != ''">
|
||||
AND u.nick_name like '%' || #{nickName} || '%'
|
||||
AND u.nick_name like concat('%', #{nickName}, '%')
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND u.status = #{status}
|
||||
</if>
|
||||
<if test="phonenumber != null and phonenumber != ''">
|
||||
AND u.phonenumber like '%' || #{phonenumber} || '%'
|
||||
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
||||
</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND to_char(u.create_time,'yyyy-MM-dd') >= #{params.beginTime}
|
||||
AND date_format(u.create_time,'%Y-%m-%d') >= #{params.beginTime}
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND to_char(u.create_time,'yyyy-MM-dd') <= #{params.endTime}
|
||||
AND date_format(u.create_time,'%Y-%m-%d') <= #{params.endTime}
|
||||
</if>
|
||||
<if test="deptId != null and deptId != 0">
|
||||
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE dept_id = #{deptId} ))
|
||||
|
@ -93,10 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
left join sys_role r on r.role_id = ur.role_id
|
||||
where u.del_flag = '0' and r.role_id = #{roleId}
|
||||
<if test="nickName != null and nickName != ''">
|
||||
AND u.nick_name like '%' || #{nickName} || '%'
|
||||
AND u.nick_name like concat('%', #{nickName}, '%')
|
||||
</if>
|
||||
<if test="phonenumber != null and phonenumber != ''">
|
||||
AND u.phonenumber like '%' || #{phonenumber} || '%'
|
||||
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
||||
</if>
|
||||
<!-- 数据范围过滤 -->
|
||||
${params.dataScope}
|
||||
|
@ -111,10 +111,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
|
||||
and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
|
||||
<if test="nickName != null and nickName != ''">
|
||||
AND u.nick_name like '%' || #{nickName} || '%'
|
||||
AND u.nick_name like concat('%', #{nickName}, '%')
|
||||
</if>
|
||||
<if test="phonenumber != null and phonenumber != ''">
|
||||
AND u.phonenumber like '%' || #{phonenumber} || '%'
|
||||
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
||||
</if>
|
||||
<if test="deptId != null and deptId != ''">
|
||||
AND u.dept_id = #{deptId}
|
||||
|
@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="remark != null and remark != ''">remark,</if>
|
||||
create_time
|
||||
)values(
|
||||
(select nvl(max(user_id),0) + 1 from sys_user),
|
||||
(select ifnull(max(user_id),0) + 1 from sys_user),
|
||||
<if test="deptId != null and deptId != ''">#{deptId},</if>
|
||||
<if test="userName != null and userName != ''">#{userName},</if>
|
||||
<if test="userCode != null and userCode != ''">#{userCode},</if>
|
||||
|
@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
'0',
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
sysdate
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="loginDate != null">login_date = #{loginDate},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
update_time = sysdate
|
||||
update_time = now()
|
||||
</set>
|
||||
where user_id = #{userId}
|
||||
</update>
|
||||
|
@ -235,4 +235,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
|
@ -5,7 +5,7 @@ VUE_APP_TITLE = 在线考试系统
|
|||
ENV = 'development'
|
||||
|
||||
# 管理系统/开发环境
|
||||
VUE_APP_BASE_API = '/exam-online-api'
|
||||
VUE_APP_BASE_API = '/examapi'
|
||||
|
||||
# 路由懒加载
|
||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||
|
|
|
@ -5,4 +5,4 @@ VUE_APP_TITLE = 在线考试系统
|
|||
ENV = 'production'
|
||||
|
||||
# 管理系统/生产环境
|
||||
VUE_APP_BASE_API = '/exam-online-api'
|
||||
VUE_APP_BASE_API = '/examapi'
|
||||
|
|
|
@ -7,4 +7,4 @@ NODE_ENV = production
|
|||
ENV = 'staging'
|
||||
|
||||
# 管理系统/测试环境
|
||||
VUE_APP_BASE_API = '/exam-online-api'
|
||||
VUE_APP_BASE_API = '/examapi'
|
||||
|
|
|
@ -37,53 +37,54 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@riophae/vue-treeselect": "0.4.0",
|
||||
"axios": "0.21.0",
|
||||
"clipboard": "2.0.6",
|
||||
"core-js": "3.8.1",
|
||||
"axios": "^1.7.9",
|
||||
"clipboard": "^2.0.11",
|
||||
"core-js": "^3.39.0",
|
||||
"echarts": "4.9.0",
|
||||
"element-ui": "^2.15.13",
|
||||
"file-saver": "2.0.4",
|
||||
"fuse.js": "6.4.3",
|
||||
"highlight.js": "9.18.5",
|
||||
"js-beautify": "1.13.0",
|
||||
"js-cookie": "2.2.1",
|
||||
"js-pinyin": "^0.1.9",
|
||||
"jsencrypt": "3.0.0-rc.1",
|
||||
"nprogress": "0.2.0",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
"sortablejs": "1.10.2",
|
||||
"file-saver": "^2.0.5",
|
||||
"fuse.js": "^7.0.0",
|
||||
"highlight.js": "^9.18.5",
|
||||
"js-beautify": "^1.15.1",
|
||||
"js-cookie": "^3.0.5",
|
||||
"js-pinyin": "^0.2.7",
|
||||
"jsencrypt": "^3.3.2",
|
||||
"nprogress": "^0.2.0",
|
||||
"quill": "^1.3.7",
|
||||
"screenfull": "^5.2.0",
|
||||
"sortablejs": "^1.15.6",
|
||||
"spark-md5": "^3.0.2",
|
||||
"vue": "2.6.12",
|
||||
"vue-count-to": "1.0.13",
|
||||
"vue-cropper": "0.5.5",
|
||||
"vue": "^2.7.16",
|
||||
"vue-count-to": "^1.0.13",
|
||||
"vue-cropper": "^0.6.5",
|
||||
"vue-meta": "^2.4.0",
|
||||
"vue-router": "3.4.9",
|
||||
"vue-router": "^3.6.5",
|
||||
"vue-simple-uploader": "^0.7.6",
|
||||
"vuedraggable": "2.24.3",
|
||||
"vuex": "3.6.0"
|
||||
"vuedraggable": "^2.24.3",
|
||||
"vuex": "^3.6.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "4.4.6",
|
||||
"@vue/cli-plugin-eslint": "4.4.6",
|
||||
"@vue/cli-service": "4.4.6",
|
||||
"babel-eslint": "10.1.0",
|
||||
"chalk": "4.1.0",
|
||||
"connect": "3.6.6",
|
||||
"@vue/cli-plugin-babel": "^4.5.19",
|
||||
"@vue/cli-plugin-eslint": "^4.5.19",
|
||||
"@vue/cli-service": "^4.5.19",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"chalk": "^4.1.2",
|
||||
"connect": "^3.7.0",
|
||||
"vue-ueditor-wrap": "^2.5.6",
|
||||
"eslint": "7.15.0",
|
||||
"eslint-plugin-vue": "7.2.0",
|
||||
"lint-staged": "10.5.3",
|
||||
"runjs": "4.4.2",
|
||||
"sass": "1.32.0",
|
||||
"sass-loader": "10.1.0",
|
||||
"script-ext-html-webpack-plugin": "2.1.5",
|
||||
"svg-sprite-loader": "5.1.1",
|
||||
"vue-template-compiler": "2.6.12"
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-plugin-vue": "^7.20.0",
|
||||
"lint-staged": "^10.5.4",
|
||||
"runjs": "^4.4.2",
|
||||
"sass": "^1.90.0",
|
||||
"sass-loader": "^10.5.2",
|
||||
"script-ext-html-webpack-plugin": "^2.1.5",
|
||||
"svg-sprite-loader": "^5.2.1",
|
||||
"vue-template-compiler": "^2.7.16"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.9",
|
||||
"npm": ">= 3.0.0"
|
||||
"node": ">=14.0.0",
|
||||
"npm": ">= 6.0.0",
|
||||
"yarn": ">= 1.22.0"
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
|
|
|
@ -0,0 +1,92 @@
|
|||
{
|
||||
"name": "ruoyi",
|
||||
"version": "3.6.0",
|
||||
"description": "若依管理系统",
|
||||
"author": "若依",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"dev": "vue-cli-service serve",
|
||||
"build:prod": "vue-cli-service build",
|
||||
"build:stage": "vue-cli-service build --mode staging",
|
||||
"preview": "node build/index.js --preview",
|
||||
"lint": "eslint --ext .js,.vue src"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
"pre-commit": "lint-staged"
|
||||
}
|
||||
},
|
||||
"lint-staged": {
|
||||
"src/**/*.{js,vue}": [
|
||||
"eslint --fix",
|
||||
"git add"
|
||||
]
|
||||
},
|
||||
"keywords": [
|
||||
"vue",
|
||||
"admin",
|
||||
"dashboard",
|
||||
"element-ui",
|
||||
"boilerplate",
|
||||
"admin-template",
|
||||
"management-system"
|
||||
],
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
|
||||
},
|
||||
"dependencies": {
|
||||
"@riophae/vue-treeselect": "0.4.0",
|
||||
"axios": "0.21.0",
|
||||
"clipboard": "2.0.6",
|
||||
"core-js": "3.8.1",
|
||||
"echarts": "4.9.0",
|
||||
"element-ui": "^2.15.13",
|
||||
"file-saver": "2.0.4",
|
||||
"fuse.js": "6.4.3",
|
||||
"highlight.js": "9.18.5",
|
||||
"js-beautify": "1.13.0",
|
||||
"js-cookie": "2.2.1",
|
||||
"js-pinyin": "^0.1.9",
|
||||
"jsencrypt": "3.0.0-rc.1",
|
||||
"nprogress": "0.2.0",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
"sortablejs": "1.10.2",
|
||||
"spark-md5": "^3.0.2",
|
||||
"vue": "2.6.12",
|
||||
"vue-count-to": "1.0.13",
|
||||
"vue-cropper": "0.5.5",
|
||||
"vue-meta": "^2.4.0",
|
||||
"vue-router": "3.4.9",
|
||||
"vue-simple-uploader": "^0.7.6",
|
||||
"vuedraggable": "2.24.3",
|
||||
"vuex": "3.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "4.4.6",
|
||||
"@vue/cli-plugin-eslint": "4.4.6",
|
||||
"@vue/cli-service": "4.4.6",
|
||||
"babel-eslint": "10.1.0",
|
||||
"chalk": "4.1.0",
|
||||
"connect": "3.6.6",
|
||||
"vue-ueditor-wrap": "^2.5.6",
|
||||
"eslint": "7.15.0",
|
||||
"eslint-plugin-vue": "7.2.0",
|
||||
"lint-staged": "10.5.3",
|
||||
"runjs": "4.4.2",
|
||||
"sass": "1.32.0",
|
||||
"sass-loader": "10.1.0",
|
||||
"script-ext-html-webpack-plugin": "2.1.5",
|
||||
"svg-sprite-loader": "5.1.1",
|
||||
"vue-template-compiler": "2.6.12"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.9",
|
||||
"npm": ">= 3.0.0"
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"last 2 versions"
|
||||
]
|
||||
}
|
|
@ -0,0 +1,92 @@
|
|||
{
|
||||
"name": "ruoyi",
|
||||
"version": "3.6.0",
|
||||
"description": "若依管理系统",
|
||||
"author": "若依",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"dev": "vue-cli-service serve",
|
||||
"build:prod": "vue-cli-service build",
|
||||
"build:stage": "vue-cli-service build --mode staging",
|
||||
"preview": "node build/index.js --preview",
|
||||
"lint": "eslint --ext .js,.vue src"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
"pre-commit": "lint-staged"
|
||||
}
|
||||
},
|
||||
"lint-staged": {
|
||||
"src/**/*.{js,vue}": [
|
||||
"eslint --fix",
|
||||
"git add"
|
||||
]
|
||||
},
|
||||
"keywords": [
|
||||
"vue",
|
||||
"admin",
|
||||
"dashboard",
|
||||
"element-ui",
|
||||
"boilerplate",
|
||||
"admin-template",
|
||||
"management-system"
|
||||
],
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
|
||||
},
|
||||
"dependencies": {
|
||||
"@riophae/vue-treeselect": "0.4.0",
|
||||
"axios": "0.21.0",
|
||||
"clipboard": "2.0.6",
|
||||
"core-js": "3.8.1",
|
||||
"echarts": "4.9.0",
|
||||
"element-ui": "^2.15.13",
|
||||
"file-saver": "2.0.4",
|
||||
"fuse.js": "6.4.3",
|
||||
"highlight.js": "9.18.5",
|
||||
"js-beautify": "1.13.0",
|
||||
"js-cookie": "2.2.1",
|
||||
"js-pinyin": "^0.1.9",
|
||||
"jsencrypt": "3.0.0-rc.1",
|
||||
"nprogress": "0.2.0",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
"sortablejs": "1.10.2",
|
||||
"spark-md5": "^3.0.2",
|
||||
"vue": "2.6.12",
|
||||
"vue-count-to": "1.0.13",
|
||||
"vue-cropper": "0.5.5",
|
||||
"vue-meta": "^2.4.0",
|
||||
"vue-router": "3.4.9",
|
||||
"vue-simple-uploader": "^0.7.6",
|
||||
"vuedraggable": "2.24.3",
|
||||
"vuex": "3.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "4.4.6",
|
||||
"@vue/cli-plugin-eslint": "4.4.6",
|
||||
"@vue/cli-service": "4.4.6",
|
||||
"babel-eslint": "10.1.0",
|
||||
"chalk": "4.1.0",
|
||||
"connect": "3.6.6",
|
||||
"vue-ueditor-wrap": "^2.5.6",
|
||||
"eslint": "7.15.0",
|
||||
"eslint-plugin-vue": "7.2.0",
|
||||
"lint-staged": "10.5.3",
|
||||
"runjs": "4.4.2",
|
||||
"sass": "1.32.0",
|
||||
"sass-loader": "10.1.0",
|
||||
"script-ext-html-webpack-plugin": "2.1.5",
|
||||
"svg-sprite-loader": "5.1.1",
|
||||
"vue-template-compiler": "2.6.12"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.9",
|
||||
"npm": ">= 3.0.0"
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"last 2 versions"
|
||||
]
|
||||
}
|
|
@ -19,7 +19,7 @@
|
|||
* 因此,UEditor提供了针对不同页面的编辑器可单独配置的根路径,具体来说,在需要实例化编辑器的页面最顶部写上如下代码即可。当然,需要令此处的URL等于对应的配置。
|
||||
* window.UEDITOR_HOME_URL = "/xxxx/xxxx/";
|
||||
*/
|
||||
window.UEDITOR_HOME_URL = "/exam_online_ui/UEditor/";
|
||||
window.UEDITOR_HOME_URL = "/examui/UEditor/";
|
||||
var URL = window.UEDITOR_HOME_URL || getUEBasePath();
|
||||
|
||||
/**
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
// 服务器统一请求接口路径
|
||||
, serverUrl: URL + "jsp/controller.jsp"
|
||||
// , serverUrl: 'http://10.200.121.66:8080/exam_online_ui/ueditor/config'
|
||||
// , serverUrl: 'http://10.200.121.66:8080/examui/ueditor/config'
|
||||
//工具栏上的所有的功能按钮和下拉框,可以在new编辑器的实例时选择自己需要的重新定义
|
||||
, toolbars: [[
|
||||
'fullscreen', 'source', '|', 'undo', 'redo', '|',
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
// 本地运行用这个
|
||||
export var baseApiUrl = 'http://localhost:8080/exam-online-api'
|
||||
export var uiUrl = 'http://localhost:8081/exam_online_ui'
|
||||
export var baseApiUrl = 'http://localhost:8080/examapi'
|
||||
export var uiUrl = 'http://localhost:8081/examui'
|
||||
|
||||
// 测试环境使用内网环境
|
||||
/* export var baseApiUrl = 'http://127.0.0.1:8080/exam-online-api'
|
||||
export var uiUrl = 'http://127.0.0.1:8080/exam_online_ui' */
|
||||
/* export var baseApiUrl = 'http://127.0.0.1:8080/examapi'
|
||||
export var uiUrl = 'http://127.0.0.1:8080/examui' */
|
||||
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ export default {
|
|||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$store.dispatch('LogOut').then(() => {
|
||||
location.href = '/exam_online_ui/';
|
||||
location.href = '/examui/';
|
||||
})
|
||||
}).catch(() => {});
|
||||
}
|
||||
|
|
|
@ -150,7 +150,7 @@ export const constantRoutes = [
|
|||
|
||||
export default new Router({
|
||||
// mode: 'history', // 去掉url中的#
|
||||
base: '/exam_online_ui/',
|
||||
base: '/examui/',
|
||||
scrollBehavior: () => ({ y: 0 }),
|
||||
routes: constantRoutes
|
||||
})
|
||||
|
|
|
@ -8,8 +8,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
|
|||
// 创建axios实例
|
||||
const service = axios.create({
|
||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||
baseURL: 'http://localhost:8080/exam-online-api', // 本地后端加路径
|
||||
// baseURL: 'http://127.0.0.1:8080/exam-online-api', // 发服务器使用内网
|
||||
baseURL: '/examapi', // 本地后端加路径
|
||||
// baseURL: 'http://127.0.0.1:8080/examapi', // 发服务器使用内网
|
||||
|
||||
timeout: 180000
|
||||
})
|
||||
|
@ -62,7 +62,7 @@ service.interceptors.response.use(res => {
|
|||
}
|
||||
).then(() => {
|
||||
store.dispatch('LogOut').then(() => {
|
||||
location.href = '/exam_online_ui/';
|
||||
location.href = '/examui/';
|
||||
})
|
||||
}).catch(() => {});
|
||||
} else if (code === 500) {
|
||||
|
|
|
@ -190,7 +190,7 @@ export default {
|
|||
// 上传文件接口(这个地址是我为了方便各位体验文件上传功能搭建的临时接口,请勿在生产环境使用!!!)
|
||||
serverUrl: baseApiUrl + '/ueditor/config',
|
||||
// UEditor 资源文件的存放路径,如果你使用的是 vue-cli 生成的项目,通常不需要设置该选项,vue-ueditor-wrap 会自动处理常见的情况,如果需要特殊配置,参考下方的常见问题2
|
||||
UEDITOR_HOME_URL: '/exam_online_ui/UEditor/'
|
||||
UEDITOR_HOME_URL: '/examui/UEditor/'
|
||||
},
|
||||
Ueditor: null,
|
||||
isNew: false,
|
||||
|
|
|
@ -16,7 +16,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
|
|||
module.exports = {
|
||||
// 部署生产环境和开发环境下的URL。
|
||||
// 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
|
||||
publicPath: '/exam_online_ui/',
|
||||
publicPath: '/examui/',
|
||||
// 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
|
||||
outputDir: 'dist',
|
||||
// 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
|
||||
|
@ -25,6 +25,21 @@ module.exports = {
|
|||
lintOnSave: process.env.NODE_ENV === 'development',
|
||||
// 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
|
||||
productionSourceMap: false,
|
||||
devServer: {
|
||||
host: '0.0.0.0',
|
||||
port: port,
|
||||
open: true,
|
||||
proxy: {
|
||||
'/examapi': {
|
||||
target: `http://127.0.0.1:8040`,
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
'^/examapi': '/examapi'
|
||||
}
|
||||
}
|
||||
},
|
||||
disableHostCheck: true
|
||||
},
|
||||
configureWebpack: {
|
||||
name: name,
|
||||
resolve: {
|
||||
|
|
Loading…
Reference in New Issue