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

修改学生证完成制作发送的文案，给处分记录和解除处分添加政治面貌选项

Browse Source
This commit is contained in:
MDSMO
2025-08-20 17:05:35 +08:00
parent 3c5818dee2
commit 89176c8f32
6 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
srs-routine/src/main/java/com/srs/routine/domain/RtStuDisciplinaryApplication.java
View File

@@ -222,6 +222,14 @@ public class RtStuDisciplinaryApplication extends BaseEntity {
@Excel(name = "籍贯")
private String jg;
/**
* 政治面貌
*/
@ApiModelProperty("政治面貌")
@TableField("political_status")
@Excel(name = "政治面貌")
private String politicalStatus;
/**
* 市/县
*/

8
srs-routine/src/main/java/com/srs/routine/domain/RtStuDisciplinaryRelieve.java
View File

@@ -214,6 +214,14 @@ public class RtStuDisciplinaryRelieve extends BaseEntity {
@Excel(name = "籍贯")
private String jg;
/**
* 政治面貌
*/
@ApiModelProperty("政治面貌")
@TableField("political_status")
@Excel(name = "政治面貌")
private String politicalStatus;
/**
* 市/县
*/

47
srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryRelieveServiceImpl.java
View File

@@ -3,16 +3,20 @@ package com.srs.routine.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.core.domain.entity.SysUser;
import com.srs.common.doman.dto.ProcessResultDto;
import com.srs.common.exception.ServiceException;
import com.srs.common.utils.DateUtils;
import com.srs.common.utils.SecurityUtils;
import com.srs.common.utils.WeChatUtil;
import com.srs.flowable.service.IFlowDefinitionService;
import com.srs.routine.domain.RtStuDisciplinaryApplication;
import com.srs.routine.mapper.RtStuDisciplinaryApplicationMapper;
import com.srs.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.IdentityService;
import org.flowable.engine.TaskService;
@@ -40,6 +44,12 @@ public class RtStuDisciplinaryRelieveServiceImpl extends ServiceImpl<RtStuDiscip
@Autowired
RtStuDisciplinaryApplicationMapper rtStuDisciplinaryApplicationMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
public WeChatUtil weChatUtil;
/**
* 查询学生解除处分申请
*
@@ -208,12 +218,49 @@ public class RtStuDisciplinaryRelieveServiceImpl extends ServiceImpl<RtStuDiscip
// 保存审核结果到任务变量中
variables.put("approved", true);
// 标记是否有任务被完成
boolean taskCompleted = false;
// 完成待办任务列表
for (Task task : tasks) {
String taskId = task.getId();
String applicationId = taskService.getVariable(taskId, "relieveId").toString();
if (applicationId.equals(rtStuDisciplinaryRelieve.getRelieveId().toString())) {
taskService.complete(task.getId(), variables);
taskCompleted = true;
}
}
// 所有相关任务完成后，发送企业微信消息
if (taskCompleted) {
try {
// 获取申请人信息
String applicantName = rtStuDisciplinaryRelieve.getStuName();
String politicalStatus = rtStuDisciplinaryRelieve.getPoliticalStatus();
SysUser sysUser = new SysUser();
sysUser.setRoleId(118L);
List<SysUser> sysUsers = sysUserMapper.selectAllocatedList(sysUser);
// 提取二级学院的书记的账号
List<String> userNames = sysUsers.stream()
.map(SysUser::getUserName)
.collect(Collectors.toList());
// 只有政治面貌是团员时才发送企业微信消息
if ("团员".equals(politicalStatus)) {
// 消息内容
String messageContent = "【解除处分】" + applicantName + "的解除处分申请已通过审核。";
int batchSize = 10;
for (int i = 0; i < userNames.size(); i += batchSize) {
List<String> batch = userNames.subList(i, Math.min(i + batchSize, userNames.size()));
// 拼接成"user1|user2|user3"格式
String toUser = String.join("|", batch);
// 调用企业微信发送消息方法
weChatUtil.sendTextMessage(toUser, messageContent);
}
}
} catch (Exception e) {
log.error("发送企业微信消息失败：", e);
}
}
return dto;

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

@@ -117,7 +117,7 @@ public class RtStuMultiLevelReviewServiceImpl extends ServiceImpl<RtStuMultiLeve
if (result > 0) {
String messageContent = rtStuMultiLevelReview.getNotes();
if (messageContent == null || messageContent.trim().isEmpty()) {
messageContent = "你申请办理的学生证制作完成，长堽校区前往xxx领取，里建校区前往xxx领取";
messageContent = "你申请办理的学生证制作完成，长堽校区前往经管楼学工处1-1办公室领取，里建校区前往“一站式”学生社区大厅领取";
}
weChatUtil.sendTextMessage(rtStuMultiLevelReview.getStuNo(), messageContent);

9
srs-routine/src/main/resources/mapper/routine/RtStuDisciplinaryApplicationMapper.xml
View File

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="mz" column="mz" />
<result property="birthday" column="birthday" />
<result property="jg" column="jg" />
<result property="politicalStatus" column="political_status" />
<result property="hksz2" column="hksz2" />
<result property="dispositionService" column="disposition_service" />
<result property="letterService" column="letter_service" />
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select application_id, applicant_id, applicant_name, penalty_number, stu_no, stu_name, stu_id, penalty_type,
penalty_status, violation_date, expiration_date, evidence_upload, penalty_recommendation, violation_regulations,
submission_status, process_instance_id, deploy_id, create_by, create_time, update_by, update_time, remark, gender,
department_Name, grade_name, class_name, mz, birthday, jg, hksz2,disposition_service,letter_service,disciplinary_date from rt_stu_disciplinary_application
department_Name, grade_name, class_name, mz, birthday, jg,political_status,hksz2,disposition_service,letter_service,disciplinary_date from rt_stu_disciplinary_application
</sql>
<select id="selectRtStuDisciplinaryApplicationList" parameterType="RtStuDisciplinaryApplication" resultMap="RtStuDisciplinaryApplicationResult">
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mz != null and mz != ''"> and mz = #{mz}</if>
<if test="birthday != null and birthday != ''"> and birthday = #{birthday}</if>
<if test="jg != null and jg != ''"> and jg = #{jg}</if>
<if test="politicalStatus != null and politicalStatus != ''"> and political_status = #{politicalStatus}</if>
<if test="hksz2 != null and hksz2 != ''"> and hksz2 = #{hksz2}</if>
</where>
ORDER BY create_time desc
@@ -116,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select application_id, applicant_id, applicant_name, penalty_number, stu_no, stu_name, stu_id, penalty_type,penalty_status,
violation_date, expiration_date, evidence_upload, penalty_recommendation, violation_regulations,submission_status,
process_instance_id, deploy_id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.gender,a.department_Name,
a.grade_name, a.class_name, a.mz, a.birthday, a.jg, a.hksz2,a.disposition_service,a.letter_service,a.disciplinary_date from rt_stu_disciplinary_application a
a.grade_name, a.class_name, a.mz, a.birthday, a.jg,a.political_status,a.hksz2,a.disposition_service,a.letter_service,a.disciplinary_date from rt_stu_disciplinary_application a
LEFT JOIN sys_user b ON a.applicant_id = b.user_id
LEFT JOIN cph_teacher c ON b.user_name = c.employee_id
<where>
@@ -175,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mz != null">mz,</if>
<if test="birthday != null">birthday,</if>
<if test="jg != null">jg,</if>
<if test="politicalStatus != null">political_status,</if>
<if test="hksz2 != null">hksz2,</if>
<if test="dispositionService != null">disposition_service,</if>
<if test="letterService != null">letter_service,</if>
@@ -208,6 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mz != null">#{mz},</if>
<if test="birthday != null">#{birthday},</if>
<if test="jg != null">#{jg},</if>
<if test="politicalStatus != null">#{politicalStatus},</if>
<if test="hksz2 != null">#{hksz2},</if>
<if test="dispositionService != null">#{dispositionService},</if>
<if test="letterService != null">#{letterService},</if>
@@ -245,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mz != null">mz = #{mz},</if>
<if test="birthday != null">birthday = #{birthday},</if>
<if test="jg != null">jg = #{jg},</if>
<if test="politicalStatus != null">political_status = #{politicalStatus},</if>
<if test="hksz2 != null">hksz2 = #{hksz2},</if>
<if test="dispositionService != null">disposition_service = #{dispositionService},</if>
<if test="letterService != null">letter_service = #{letterService},</if>

10
srs-routine/src/main/resources/mapper/routine/RtStuDisciplinaryRelieveMapper.xml
View File

@@ -33,6 +33,7 @@
<result property="mz" column="mz"/>
<result property="birthday" column="birthday"/>
<result property="jg" column="jg"/>
<result property="politicalStatus" column="political_status" />
<result property="hksz2" column="hksz2"/>
<result property="relieveService" column="relieve_service"/>
</resultMap>
@@ -65,6 +66,7 @@
mz,
birthday,
jg,
political_status,
hksz2,
relieve_service,
applicant_name
@@ -107,6 +109,7 @@
<if test="mz != null and mz != ''">and mz = #{mz}</if>
<if test="birthday != null and birthday != ''">and birthday = #{birthday}</if>
<if test="jg != null and jg != ''">and jg = #{jg}</if>
<if test="politicalStatus != null and politicalStatus != ''">and political_status = #{politicalStatus}</if>
<if test="hksz2 != null and hksz2 != ''">and hksz2 = #{hksz2}</if>
<if test="relieveService != null and relieveService != ''">and relieve_service = #{relieveService}</if>
</where>
@@ -147,6 +150,7 @@
a.mz,
a.birthday,
a.jg,
a.political_status,
a.hksz2,
a.relieve_service,
a.applicant_name
@@ -187,6 +191,7 @@
<if test="mz != null and mz != ''">and a.mz = #{mz}</if>
<if test="birthday != null and birthday != ''">and a.birthday = #{birthday}</if>
<if test="jg != null and jg != ''">and a.jg = #{jg}</if>
<if test="politicalStatus != null and politicalStatus != ''">and a.political_status = #{politicalStatus}</if>
<if test="hksz2 != null and hksz2 != ''">and a.hksz2 = #{hksz2}</if>
<if test="relieveService != null and relieveService != ''">and a.relieve_service = #{relieveService}</if>
<if test="params.employeeId != null and params.employeeId != ''">and d.employee_id = #{params.employeeId}</if>
@@ -222,6 +227,7 @@
a.mz,
a.birthday,
a.jg,
a.political_status,
a.hksz2,
a.relieve_service,
a.applicant_name
@@ -262,6 +268,7 @@
<if test="mz != null and mz != ''">and a.mz = #{mz}</if>
<if test="birthday != null and birthday != ''">and a.birthday = #{birthday}</if>
<if test="jg != null and jg != ''">and a.jg = #{jg}</if>
<if test="politicalStatus != null and politicalStatus != ''">and a.political_status = #{politicalStatus}</if>
<if test="hksz2 != null and hksz2 != ''">and a.hksz2 = #{hksz2}</if>
<if test="relieveService != null and relieveService != ''">and a.relieve_service = #{relieveService}</if>
<if test="params.employeeId != null and params.employeeId != ''">and d.employee_id = #{params.employeeId}</if>
@@ -300,6 +307,7 @@
<if test="mz != null">mz,</if>
<if test="birthday != null">birthday,</if>
<if test="jg != null">jg,</if>
<if test="politicalStatus != null">political_status,</if>
<if test="hksz2 != null">hksz2,</if>
<if test="relieveService != null">relieve_service,</if>
<if test="applicantName != null">applicant_name,</if>
@@ -331,6 +339,7 @@
<if test="mz != null">#{mz},</if>
<if test="birthday != null">#{birthday},</if>
<if test="jg != null">#{jg},</if>
<if test="politicalStatus != null">#{politicalStatus},</if>
<if test="hksz2 != null">#{hksz2},</if>
<if test="relieveService != null">#{relieveService},</if>
<if test="applicantName != null">#{applicantName},</if>
@@ -366,6 +375,7 @@
<if test="mz != null">mz = #{mz},</if>
<if test="birthday != null">birthday = #{birthday},</if>
<if test="jg != null">jg = #{jg},</if>
<if test="politicalStatus != null">political_status = #{politicalStatus},</if>
<if test="hksz2 != null">hksz2 = #{hksz2},</if>
<if test="relieveService != null">relieve_service = #{relieveService},</if>
<if test="applicantName != null">applicant_name = #{applicantName},</if>