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
@@ -70,4 +71,4 @@
#{id}
-
\ No newline at end of file
+
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
index 539fabf..54ccb48 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
@@ -307,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (a.status1 = #{status} or a.status2 = #{status} or a.status3 = #{status}) and a.apply_year like CONCAT('%',#{applyYear},'%')
- order by a.id asc
+ 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"
-
+ and step = #{step} and operator = #{operator} and status = #{status} and apply_id = #{applyId}
-
+
where id = #{id}
-
+
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
@@ -98,4 +99,4 @@
#{id}
-
\ No newline at end of file
+
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
index 8f48c95..b3dac44 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
@@ -26,29 +26,34 @@ public class EJXYSJListener implements ExecutionListener {
if (userId!=null){
delegateExecution.setVariable("approval", userId);
// todo 企业微信推送消息
-// --- 企业微信推送消息模块 ---
+ /**
+ * 庞世斌
+ */
try {
- // 步骤 2: 【关键】使用 userId 查询对应的企业微信账号 (userName)
+ // 步骤 2: 使用 userId 查询对应的企业微信账号 (userName)
String userName = disciplinaryMapper.getUserNameByUserId(userId);
- // 步骤 3: 检查 userName 是否存在
+ // 步骤 3: 检查是否成功获取到 userName
if (userName != null && !userName.isEmpty()) {
WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
// 构造包含超链接的消息内容
- String content = "您有一条新的学生违纪审批任务待处理,请点击前往处理。";
+ String content = "您有一条新的学生违纪审批任务待处理," +
+ "请点击前往处理";
- // 步骤 4: 【关键】使用 userName 作为接收人发送消息
+ // 步骤 4: 使用 userName 作为接收人发送消息
weChatUtil.sendTextMessage(userName, content);
- log.info("已成功向二级学院书记(userName:{})发送企业微信审批通知。", userName);
+ log.info("已成功向学务干事(userName:{})发送企业微信审批通知。", userName);
+
} else {
// 如果找不到userName,记录警告日志,但流程继续
- log.warn("找到了二级学院书记审批人(userId:{}),但其对应的企业微信账号(userName)为空,无法发送通知。", userId);
+ log.warn("找到了审批人(userId:{}),但其对应的企业微信账号(userName)为空,无法发送通知。", userId);
}
} catch (Exception e) {
- // 保证即使通知失败,流程也能继续
- log.error("向二级学院书记(userId:{})发送企业微信通知时出现异常。流程将继续。错误详情: {}", userId, e.getMessage(), e);
+ // 捕获所有异常,仅记录日志,确保主流程不受影响
+ log.error("向学务干事(userId:{})发送企业微信通知时出现异常,但流程将继续。错误详情: {}", userId, e.getMessage(), e);
}
+
}else{
throw new RuntimeException("该二级学院书记审批人未配置");
}
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
index f09faf8..4a47cf1 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
@@ -114,7 +114,7 @@ public class RtStuQuitSchoolServiceImpl extends ServiceImpl