xgxt_sd/zhxg_java
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
知无涯
2025-08-27 17:35:37 +08:00
parent 59749c51d8 3ba997de77
commit f7d5d45372
15 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml
View File

@@ -37,6 +37,7 @@
where a2.apply_status != 1 where a2.apply_status != 1
) as t1 ) as t1
<where> <where>
t1.apply_status = 1 or t1.apply_status = 2 or t1.apply_status = 3
<if test="stuNo != null and stuNo != ''">and t1.stu_no = #{stuNo}</if> <if test="stuNo != null and stuNo != ''">and t1.stu_no = #{stuNo}</if>
<if test="roomId != null ">and t1.room_id = #{roomId}</if> <if test="roomId != null ">and t1.room_id = #{roomId}</if>
<if test="startDate != null ">and t1.start_date = #{startDate}</if> <if test="startDate != null ">and t1.start_date = #{startDate}</if>

19
srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
View File

@@ -528,18 +528,6 @@
select concat('zsg-',count(a.id)) as `all` select concat('zsg-',count(a.id)) as `all`
from knzz_zsg_apply as a from knzz_zsg_apply as a
where a.apply_status = 3 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)
</select> </select>
<select id="countStuUnDo" resultType="String" parameterType="String"> <select id="countStuUnDo" resultType="String" parameterType="String">
@@ -784,9 +772,10 @@
-- 邵政文-(宿舍管理-住宿费用-辅导员确认待办) -- 邵政文-(宿舍管理-住宿费用-辅导员确认待办)
union union
select concat('zsfy-',count(a.id)) as `all` select concat('zsfy-',count(a.id)) as `all`
from dms_new_record as a from view_dms_record as a
left join view_dms_record as d on a.stu_no = d.stu_no left join dms_new_record as b on a.stu_year_id = b.id
where d.employee_id = #{tNo} and a.apply_status = 6 and a.apply_status = 1 left join view_stu_info as d on a.stu_no = d.stu_no
where d.t_no = #{tNo} and a.apply_status = 1
</select> </select>

13
srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.KnzzGlApplyMapper"> <mapper namespace="com.srs.comprehensive.mapper.KnzzGlApplyMapper">
<resultMap type="KnzzGlApply" id="KnzzGlApplyResult"> <resultMap type="KnzzGlApply" id="KnzzGlApplyResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="stuYearId" column="stu_year_id" /> <result property="stuYearId" column="stu_year_id" />
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectKnzzGlApplyList" parameterType="KnzzGlApply" resultMap="KnzzGlApplyResult"> <select id="selectKnzzGlApplyList" parameterType="KnzzGlApply" resultMap="KnzzGlApplyResult">
<include refid="selectKnzzGlApplyVo"/> <include refid="selectKnzzGlApplyVo"/>
<where> <where>
<if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if> <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
<if test="stuNo != null and stuNo != ''"> and stu_no = #{stuNo}</if> <if test="stuNo != null and stuNo != ''"> and stu_no = #{stuNo}</if>
<if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if> <if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
@@ -112,13 +112,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="xgNo != null and xgNo != ''"> and xg_no = #{xgNo}</if> <if test="xgNo != null and xgNo != ''"> and xg_no = #{xgNo}</if>
<if test="applyStatus != null and applyStatus != ''"> and apply_status = #{applyStatus}</if> <if test="applyStatus != null and applyStatus != ''"> and apply_status = #{applyStatus}</if>
</where> </where>
order by id desc
</select> </select>
<select id="selectKnzzGlApplyById" parameterType="Long" resultMap="KnzzGlApplyResult"> <select id="selectKnzzGlApplyById" parameterType="Long" resultMap="KnzzGlApplyResult">
<include refid="selectKnzzGlApplyVo"/> <include refid="selectKnzzGlApplyVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertKnzzGlApply" parameterType="KnzzGlApply" useGeneratedKeys="true" keyProperty="id"> <insert id="insertKnzzGlApply" parameterType="KnzzGlApply" useGeneratedKeys="true" keyProperty="id">
insert into knzz_gl_apply insert into knzz_gl_apply
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -289,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteKnzzGlApplyByIds" parameterType="String"> <delete id="deleteKnzzGlApplyByIds" parameterType="String">
delete from knzz_gl_apply where id in delete from knzz_gl_apply where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@@ -317,4 +318,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by a.id desc order by a.id desc
</select> </select>
</mapper> </mapper>

13
srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.KnzzTufaApplyMapper"> <mapper namespace="com.srs.comprehensive.mapper.KnzzTufaApplyMapper">
<resultMap type="KnzzTufaApply" id="KnzzTufaApplyResult"> <resultMap type="KnzzTufaApply" id="KnzzTufaApplyResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="stuNo" column="stu_no" /> <result property="stuNo" column="stu_no" />
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectKnzzTufaApplyList" parameterType="KnzzTufaApply" resultMap="KnzzTufaApplyResult"> <select id="selectKnzzTufaApplyList" parameterType="KnzzTufaApply" resultMap="KnzzTufaApplyResult">
<include refid="selectKnzzTufaApplyVo"/> <include refid="selectKnzzTufaApplyVo"/>
<where> <where>
<if test="stuNo != null and stuNo != ''"> and stu_no = #{stuNo}</if> <if test="stuNo != null and stuNo != ''"> and stu_no = #{stuNo}</if>
<if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if> <if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
<if test="gender != null and gender != ''"> and gender = #{gender}</if> <if test="gender != null and gender != ''"> and gender = #{gender}</if>
@@ -98,13 +98,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leaderNo != null and leaderNo != ''"> and leader_no = #{leaderNo}</if> <if test="leaderNo != null and leaderNo != ''"> and leader_no = #{leaderNo}</if>
<if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if> <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
</where> </where>
order by id desc
</select> </select>
<select id="selectKnzzTufaApplyById" parameterType="Long" resultMap="KnzzTufaApplyResult"> <select id="selectKnzzTufaApplyById" parameterType="Long" resultMap="KnzzTufaApplyResult">
<include refid="selectKnzzTufaApplyVo"/> <include refid="selectKnzzTufaApplyVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertKnzzTufaApply" parameterType="KnzzTufaApply" useGeneratedKeys="true" keyProperty="id"> <insert id="insertKnzzTufaApply" parameterType="KnzzTufaApply" useGeneratedKeys="true" keyProperty="id">
insert into knzz_tufa_apply insert into knzz_tufa_apply
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -254,7 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteKnzzTufaApplyByIds" parameterType="String"> <delete id="deleteKnzzTufaApplyByIds" parameterType="String">
delete from knzz_tufa_apply where id in delete from knzz_tufa_apply where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@@ -283,4 +284,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
</mapper> </mapper>

13
srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.KnzzZsgApplyMapper"> <mapper namespace="com.srs.comprehensive.mapper.KnzzZsgApplyMapper">
<resultMap type="KnzzZsgApply" id="KnzzZsgApplyResult"> <resultMap type="KnzzZsgApply" id="KnzzZsgApplyResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="stuName" column="stu_name" /> <result property="stuName" column="stu_name" />
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectKnzzZsgApplyList" parameterType="KnzzZsgApply" resultMap="KnzzZsgApplyResult"> <select id="selectKnzzZsgApplyList" parameterType="KnzzZsgApply" resultMap="KnzzZsgApplyResult">
<include refid="selectKnzzZsgApplyVo"/> <include refid="selectKnzzZsgApplyVo"/>
<where> <where>
<if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if> <if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
<if test="gender != null and gender != ''"> and gender = #{gender}</if> <if test="gender != null and gender != ''"> and gender = #{gender}</if>
<if test="birthMonth != null and birthMonth != ''"> and birth_month = #{birthMonth}</if> <if test="birthMonth != null and birthMonth != ''"> and birth_month = #{birthMonth}</if>
@@ -110,13 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyFile != null and applyFile != ''"> and apply_file = #{applyFile}</if> <if test="applyFile != null and applyFile != ''"> and apply_file = #{applyFile}</if>
<if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if> <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
</where> </where>
order by id desc
</select> </select>
<select id="selectKnzzZsgApplyById" parameterType="Long" resultMap="KnzzZsgApplyResult"> <select id="selectKnzzZsgApplyById" parameterType="Long" resultMap="KnzzZsgApplyResult">
<include refid="selectKnzzZsgApplyVo"/> <include refid="selectKnzzZsgApplyVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertKnzzZsgApply" parameterType="KnzzZsgApply" useGeneratedKeys="true" keyProperty="id"> <insert id="insertKnzzZsgApply" parameterType="KnzzZsgApply" useGeneratedKeys="true" keyProperty="id">
insert into knzz_zsg_apply insert into knzz_zsg_apply
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -286,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteKnzzZsgApplyByIds" parameterType="String"> <delete id="deleteKnzzZsgApplyByIds" parameterType="String">
delete from knzz_zsg_apply where id in delete from knzz_zsg_apply where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@@ -314,4 +315,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
</mapper> </mapper>

13
srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.KnzzZzqApplyMapper"> <mapper namespace="com.srs.comprehensive.mapper.KnzzZzqApplyMapper">
<resultMap type="KnzzZzqApply" id="KnzzZzqApplyResult"> <resultMap type="KnzzZzqApply" id="KnzzZzqApplyResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="stuYearId" column="stu_year_id" /> <result property="stuYearId" column="stu_year_id" />
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectKnzzZzqApplyList" parameterType="KnzzZzqApply" resultMap="KnzzZzqApplyResult"> <select id="selectKnzzZzqApplyList" parameterType="KnzzZzqApply" resultMap="KnzzZzqApplyResult">
<include refid="selectKnzzZzqApplyVo"/> <include refid="selectKnzzZzqApplyVo"/>
<where> <where>
<if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if> <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
<if test="stuNo != null and stuNo != ''"> and stu_no = #{stuNo}</if> <if test="stuNo != null and stuNo != ''"> and stu_no = #{stuNo}</if>
<if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if> <if test="stuName != null and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
@@ -96,13 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyStatus != null and applyStatus != ''"> and apply_status = #{applyStatus}</if> <if test="applyStatus != null and applyStatus != ''"> and apply_status = #{applyStatus}</if>
<if test="applyFile != null and applyFile != ''"> and apply_file = #{applyFile}</if> <if test="applyFile != null and applyFile != ''"> and apply_file = #{applyFile}</if>
</where> </where>
order by id desc
</select> </select>
<select id="selectKnzzZzqApplyById" parameterType="Long" resultMap="KnzzZzqApplyResult"> <select id="selectKnzzZzqApplyById" parameterType="Long" resultMap="KnzzZzqApplyResult">
<include refid="selectKnzzZzqApplyVo"/> <include refid="selectKnzzZzqApplyVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertKnzzZzqApply" parameterType="KnzzZzqApply" useGeneratedKeys="true" keyProperty="id"> <insert id="insertKnzzZzqApply" parameterType="KnzzZzqApply" useGeneratedKeys="true" keyProperty="id">
insert into knzz_zzq_apply insert into knzz_zzq_apply
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -243,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteKnzzZzqApplyByIds" parameterType="String"> <delete id="deleteKnzzZzqApplyByIds" parameterType="String">
delete from knzz_zzq_apply where id in delete from knzz_zzq_apply where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@@ -272,4 +273,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
</mapper> </mapper>

3
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
View File

@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="majorId != null ">and d.major_id = #{majorId}</if> <if test="majorId != null ">and d.major_id = #{majorId}</if>
<if test="classId != null ">and c.class_id = #{classId}</if> <if test="classId != null ">and c.class_id = #{classId}</if>
</where> </where>
order by a.id asc order by a.id desc
</select> </select>
<select id="countXw" parameterType="CphSearch" resultType="SrsKnrdApply"> <select id="countXw" parameterType="CphSearch" resultType="SrsKnrdApply">
@@ -185,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="classId != null ">and c.class_id = #{classId}</if> <if test="classId != null ">and c.class_id = #{classId}</if>
</where> </where>
group by ejxyldqmyj group by ejxyldqmyj
order by a.id desc
</select> </select>

2
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml
View File

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yj != null "> and (a.bjpyyj = #{yj} or a.ejxyldqmyj = #{yj} or xsqmyj = #{yj})</if> <if test="yj != null "> and (a.bjpyyj = #{yj} or a.ejxyldqmyj = #{yj} or xsqmyj = #{yj})</if>
<if test="applyYear != null "> and a.apply_year like CONCAT('%',#{applyYear},'%')</if> <if test="applyYear != null "> and a.apply_year like CONCAT('%',#{applyYear},'%')</if>
order by a.id asc order by a.id desc
</select> </select>
<select id="selectSrsKnrdApprovalRecordByIds" resultType="SrsKnrdApprovalRecord"> <select id="selectSrsKnrdApprovalRecordByIds" resultType="SrsKnrdApprovalRecord">
select * from srs_knrd_approval_record where apply_id=#{id} select * from srs_knrd_approval_record where apply_id=#{id}

13
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTimeMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.SrsKnrdTimeMapper"> <mapper namespace="com.srs.comprehensive.mapper.SrsKnrdTimeMapper">
<resultMap type="SrsKnrdTime" id="SrsKnrdTimeResult"> <resultMap type="SrsKnrdTime" id="SrsKnrdTimeResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="stuNo" column="stu_no" /> <result property="stuNo" column="stu_no" />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSrsKnrdTimeList" parameterType="SrsKnrdTime" resultMap="SrsKnrdTimeResult"> <select id="selectSrsKnrdTimeList" parameterType="SrsKnrdTime" resultMap="SrsKnrdTimeResult">
<include refid="selectSrsKnrdTimeVo"/> <include refid="selectSrsKnrdTimeVo"/>
<where> <where>
<if test="stuNo != null and stuNo != ''"> and a.stu_no = #{stuNo}</if> <if test="stuNo != null and stuNo != ''"> and a.stu_no = #{stuNo}</if>
<if test="stuTime != null "> and a.stu_time = #{stuTime}</if> <if test="stuTime != null "> and a.stu_time = #{stuTime}</if>
<if test="fdyTime != null "> and a.fdy_time = #{fdyTime}</if> <if test="fdyTime != null "> and a.fdy_time = #{fdyTime}</if>
@@ -36,13 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if> <if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if>
<if test="term != null and term != ''"> and a.term = #{term}</if> <if test="term != null and term != ''"> and a.term = #{term}</if>
</where> </where>
order by a.id desc
</select> </select>
<select id="selectSrsKnrdTimeById" parameterType="Long" resultMap="SrsKnrdTimeResult"> <select id="selectSrsKnrdTimeById" parameterType="Long" resultMap="SrsKnrdTimeResult">
<include refid="selectSrsKnrdTimeVo"/> <include refid="selectSrsKnrdTimeVo"/>
where a.id = #{id} where a.id = #{id}
</select> </select>
<insert id="insertSrsKnrdTime" parameterType="SrsKnrdTime" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSrsKnrdTime" parameterType="SrsKnrdTime" useGeneratedKeys="true" keyProperty="id">
insert into srs_knrd_time insert into srs_knrd_time
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -84,9 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteSrsKnrdTimeByIds" parameterType="String"> <delete id="deleteSrsKnrdTimeByIds" parameterType="String">
delete from srs_knrd_time where id in delete from srs_knrd_time where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

3
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml
View File

@@ -27,6 +27,7 @@
<if test="knrdType != null and knrdType != ''">and a.knrd_type = #{knrdType}</if> <if test="knrdType != null and knrdType != ''">and a.knrd_type = #{knrdType}</if>
<if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if> <if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if>
</where> </where>
order by a.id desc
</select> </select>
<select id="selectSrsKnrdTypeById" parameterType="Long" resultMap="SrsKnrdTypeResult"> <select id="selectSrsKnrdTypeById" parameterType="Long" resultMap="SrsKnrdTypeResult">
@@ -70,4 +71,4 @@
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

2
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
View File

@@ -307,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null "> and (a.status1 = #{status} or a.status2 = #{status} or a.status3 = #{status})</if> <if test="status != null "> and (a.status1 = #{status} or a.status2 = #{status} or a.status3 = #{status})</if>
<if test="applyYear != null"> and a.apply_year like CONCAT('%',#{applyYear},'%')</if> <if test="applyYear != null"> and a.apply_year like CONCAT('%',#{applyYear},'%')</if>
</where> </where>
order by a.id asc order by a.id desc
</select> </select>
<insert id="insertSrsZxjApply" parameterType="SrsZxjApply" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSrsZxjApply" parameterType="SrsZxjApply" useGeneratedKeys="true" keyProperty="id">

14
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.SrsZxjApprovalRecordMapper"> <mapper namespace="com.srs.comprehensive.mapper.SrsZxjApprovalRecordMapper">
<resultMap type="SrsZxjApprovalRecord" id="SrsZxjApprovalRecordResult"> <resultMap type="SrsZxjApprovalRecord" id="SrsZxjApprovalRecordResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="step" column="step" /> <result property="step" column="step" />
@@ -24,19 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSrsZxjApprovalRecordList" parameterType="SrsZxjApprovalRecord" resultMap="SrsZxjApprovalRecordResult"> <select id="selectSrsZxjApprovalRecordList" parameterType="SrsZxjApprovalRecord" resultMap="SrsZxjApprovalRecordResult">
<include refid="selectSrsZxjApprovalRecordVo"/> <include refid="selectSrsZxjApprovalRecordVo"/>
<where> <where>
<if test="step != null "> and step = #{step}</if> <if test="step != null "> and step = #{step}</if>
<if test="operator != null and operator != ''"> and operator = #{operator}</if> <if test="operator != null and operator != ''"> and operator = #{operator}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="status != null and status != ''"> and status = #{status}</if>
<if test="applyId != null "> and apply_id = #{applyId}</if> <if test="applyId != null "> and apply_id = #{applyId}</if>
</where> </where>
</select> </select>
<select id="selectSrsZxjApprovalRecordById" parameterType="Long" resultMap="SrsZxjApprovalRecordResult"> <select id="selectSrsZxjApprovalRecordById" parameterType="Long" resultMap="SrsZxjApprovalRecordResult">
<include refid="selectSrsZxjApprovalRecordVo"/> <include refid="selectSrsZxjApprovalRecordVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSrsZxjApprovalRecord" parameterType="SrsZxjApprovalRecord" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSrsZxjApprovalRecord" parameterType="SrsZxjApprovalRecord" useGeneratedKeys="true" keyProperty="id">
insert into srs_zxj_approval_record insert into srs_zxj_approval_record
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -88,14 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="operator != null ">and r.operator like concat('%',#{operator},'%')</if> <if test="operator != null ">and r.operator like concat('%',#{operator},'%')</if>
<if test="status != null"> and r.status = #{status}</if> <if test="status != null"> and r.status = #{status}</if>
order by a.id asc order by a.id desc
</select> </select>
<delete id="deleteSrsZxjApprovalRecordById" parameterType="Long"> <delete id="deleteSrsZxjApprovalRecordById" parameterType="Long">
delete from srs_zxj_approval_record where id = #{id} delete from srs_zxj_approval_record where id = #{id}
</delete> </delete>
<delete id="deleteSrsZxjApprovalRecordByIds" parameterType="String"> <delete id="deleteSrsZxjApprovalRecordByIds" parameterType="String">
delete from srs_zxj_approval_record where id in delete from srs_zxj_approval_record where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@@ -107,4 +107,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

3
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml
View File

@@ -43,6 +43,7 @@
<if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if> <if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if>
<if test="term != null and term != ''">and a.term = #{term}</if> <if test="term != null and term != ''">and a.term = #{term}</if>
</where> </where>
order by a.id desc
</select> </select>
<select id="selectSrsZxjTimeById" parameterType="Long" resultMap="SrsZxjTimeResult"> <select id="selectSrsZxjTimeById" parameterType="Long" resultMap="SrsZxjTimeResult">
@@ -98,4 +99,4 @@
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

23
srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
View File

@@ -26,29 +26,34 @@ public class EJXYSJListener implements ExecutionListener {
if (userId!=null){ if (userId!=null){
delegateExecution.setVariable("approval", userId); delegateExecution.setVariable("approval", userId);
// todo 企业微信推送消息 // todo 企业微信推送消息
// --- 企业微信推送消息模块 --- /**
* 庞世斌
*/
try { try {
// 步骤 2: 【关键】使用 userId 查询对应的企业微信账号 (userName) // 步骤 2: 使用 userId 查询对应的企业微信账号 (userName)
String userName = disciplinaryMapper.getUserNameByUserId(userId); String userName = disciplinaryMapper.getUserNameByUserId(userId);
// 步骤 3: 检查 userName 是否存在 // 步骤 3: 检查是否成功获取到 userName
if (userName != null && !userName.isEmpty()) { if (userName != null && !userName.isEmpty()) {
WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class); WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
// 构造包含超链接的消息内容 // 构造包含超链接的消息内容
String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/web/#/pages/Approval/index'>请点击前往处理</a>。"; String content = "您有一条新的学生违纪审批任务待处理，" +
"<a href='http://zhxg.gxsdxy.cn/web/#/pages/Approval/index'>请点击前往处理</a>";
// 步骤 4: 【关键】使用 userName 作为接收人发送消息 // 步骤 4: 使用 userName 作为接收人发送消息
weChatUtil.sendTextMessage(userName, content); weChatUtil.sendTextMessage(userName, content);
log.info("已成功向二级学院书记(userName:{})发送企业微信审批通知。", userName); log.info("已成功向学务干事(userName:{})发送企业微信审批通知。", userName);
} else { } else {
// 如果找不到userName，记录警告日志，但流程继续 // 如果找不到userName，记录警告日志，但流程继续
log.warn("找到了二级学院书记审批人(userId:{})，但其对应的企业微信账号(userName)为空，无法发送通知。", userId); log.warn("找到了审批人(userId:{})，但其对应的企业微信账号(userName)为空，无法发送通知。", userId);
} }
} catch (Exception e) { } catch (Exception e) {
// 保证即使通知失败，流程也能继续 // 捕获所有异常，仅记录日志，确保主流程不受影响
log.error("向二级学院书记(userId:{})发送企业微信通知时出现异常。流程将继续。错误详情: {}", userId, e.getMessage(), e); log.error("向学务干事(userId:{})发送企业微信通知时出现异常，但流程将继续。错误详情: {}", userId, e.getMessage(), e);
} }
}else{ }else{
throw new RuntimeException("该二级学院书记审批人未配置"); throw new RuntimeException("该二级学院书记审批人未配置");
} }

2
srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
View File

@@ -114,7 +114,7 @@ public class RtStuQuitSchoolServiceImpl extends ServiceImpl<RtStuQuitSchoolMappe
variables.put("approval", SecurityUtils.getUserId()); variables.put("approval", SecurityUtils.getUserId());
variables.put("deptId", SecurityUtils.getDeptId()); variables.put("deptId", SecurityUtils.getDeptId());
AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_vxuubvdh:5:347504", variables); AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_vxuubvdh:13:835109", variables);
String code = ajaxResult.get("code").toString(); String code = ajaxResult.get("code").toString();
if (code.equals("200")) { if (code.equals("200")) {