diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml index 6e44767..d02f639 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml @@ -37,6 +37,7 @@ where a2.apply_status != 1 ) as t1 + t1.apply_status = 1 or t1.apply_status = 2 or t1.apply_status = 3 and t1.stu_no = #{stuNo} and t1.room_id = #{roomId} and t1.start_date = #{startDate} diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml index 34960d9..dfd25a4 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml @@ -528,18 +528,6 @@ select concat('zsg-',count(a.id)) as `all` from knzz_zsg_apply as a where a.apply_status = 3 - # 宁博-辅导员管理--成果绩效----待办 (第3步:科室复核 和 第4步:学工处长终审) - union - select concat('cg-',count(a.check_id)) as `all` - from sys_teacher_achievementcheck as a - left join sys_user as b on a.teacher_id = b.user_name - where a.check_status in (3, 4) - -- 陈冠元 辅导员业绩考核-科室复核待办-学工处长审核待办 - union - select concat('yj-',count(a.id)) as `all` - from sys_teacher_kpi_filling as a - left join sys_user as b on a.job_number = b.user_name - where a.role_audit in (3, 4) diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml index f7fe94d..89f6a57 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into knzz_gl_apply @@ -289,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from knzz_gl_apply where id in + delete from knzz_gl_apply where id in #{id} @@ -317,4 +318,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by a.id desc - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml index 1053e31..6eb6d1e 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into knzz_tufa_apply @@ -254,7 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from knzz_tufa_apply where id in + delete from knzz_tufa_apply where id in #{id} @@ -283,4 +284,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml index 40db5cb..bc24e76 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into knzz_zsg_apply @@ -286,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from knzz_zsg_apply where id in + delete from knzz_zsg_apply where id in #{id} @@ -314,4 +315,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml index 9e2b0c8..cb4c829 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into knzz_zzq_apply @@ -243,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from knzz_zzq_apply where id in + delete from knzz_zzq_apply where id in #{id} @@ -272,4 +273,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml index 404cf5e..e1618ae 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml @@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.major_id = #{majorId} and c.class_id = #{classId} - order by a.id asc + order by a.id desc diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml index 154ed09..8c60228 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (a.bjpyyj = #{yj} or a.ejxyldqmyj = #{yj} or xsqmyj = #{yj}) and a.apply_year like CONCAT('%',#{applyYear},'%') - order by a.id asc + order by a.id desc - + and a.stu_no = #{stuNo} and a.stu_time = #{stuTime} and a.fdy_time = #{fdyTime} @@ -36,13 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.stu_year_id = #{stuYearId} and a.term = #{term} + order by a.id desc - + - + insert into srs_knrd_time @@ -84,9 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from srs_knrd_time where id in + delete from srs_knrd_time where id in #{id} - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml index b26b7aa..1fd1a3f 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml @@ -27,6 +27,7 @@ and a.knrd_type = #{knrdType} and a.stu_year_id = #{stuYearId} + order by a.id desc diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml index 5b926c0..85e32c4 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,19 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into srs_zxj_approval_record @@ -88,14 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and r.operator like concat('%',#{operator},'%') and r.status = #{status} - order by a.id asc + order by a.id desc delete from srs_zxj_approval_record where id = #{id} - delete from srs_zxj_approval_record where id in + delete from srs_zxj_approval_record where id in #{id} @@ -107,4 +107,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml index 6579db1..bb9f1c0 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml @@ -43,6 +43,7 @@ and a.stu_year_id = #{stuYearId} and a.term = #{term} + order by a.id desc