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

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

@@ -112,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="xgNo != null and xgNo != ''"> and xg_no = #{xgNo}</if>
<if test="applyStatus != null and applyStatus != ''"> and apply_status = #{applyStatus}</if>
</where>
order by id desc
</select>
<select id="selectKnzzGlApplyById" parameterType="Long" resultMap="KnzzGlApplyResult">

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

@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leaderNo != null and leaderNo != ''"> and leader_no = #{leaderNo}</if>
<if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
</where>
order by id desc
</select>
<select id="selectKnzzTufaApplyById" parameterType="Long" resultMap="KnzzTufaApplyResult">

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

@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyFile != null and applyFile != ''"> and apply_file = #{applyFile}</if>
<if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
</where>
order by id desc
</select>
<select id="selectKnzzZsgApplyById" parameterType="Long" resultMap="KnzzZsgApplyResult">

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

@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyStatus != null and applyStatus != ''"> and apply_status = #{applyStatus}</if>
<if test="applyFile != null and applyFile != ''"> and apply_file = #{applyFile}</if>
</where>
order by id desc
</select>
<select id="selectKnzzZzqApplyById" parameterType="Long" resultMap="KnzzZzqApplyResult">

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="classId != null ">and c.class_id = #{classId}</if>
</where>
order by a.id asc
order by a.id desc
</select>
<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>
</where>
group by ejxyldqmyj
order by a.id desc
</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="applyYear != null "> and a.apply_year like CONCAT('%',#{applyYear},'%')</if>
order by a.id asc
order by a.id desc
</select>
<select id="selectSrsKnrdApprovalRecordByIds" resultType="SrsKnrdApprovalRecord">
select * from srs_knrd_approval_record where apply_id=#{id}

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

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if>
<if test="term != null and term != ''"> and a.term = #{term}</if>
</where>
order by a.id desc
</select>
<select id="selectSrsKnrdTimeById" parameterType="Long" resultMap="SrsKnrdTimeResult">

1
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="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if>
</where>
order by a.id desc
</select>
<select id="selectSrsKnrdTypeById" parameterType="Long" resultMap="SrsKnrdTypeResult">

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="applyYear != null"> and a.apply_year like CONCAT('%',#{applyYear},'%')</if>
</where>
order by a.id asc
order by a.id desc
</select>
<insert id="insertSrsZxjApply" parameterType="SrsZxjApply" useGeneratedKeys="true" keyProperty="id">

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

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="operator != null ">and r.operator like concat('%',#{operator},'%')</if>
<if test="status != null"> and r.status = #{status}</if>
order by a.id asc
order by a.id desc
</select>
<delete id="deleteSrsZxjApprovalRecordById" parameterType="Long">
delete from srs_zxj_approval_record where id = #{id}

1
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="term != null and term != ''">and a.term = #{term}</if>
</where>
order by a.id desc
</select>
<select id="selectSrsZxjTimeById" parameterType="Long" resultMap="SrsZxjTimeResult">

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){
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 = "您有一条新的学生违纪审批任务待处理，<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);
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("该二级学院书记审批人未配置");
}

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("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();
if (code.equals("200")) {