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

Compare commits

base: xgxt_sd:2573d4bebdeacd025a0af209eb5226d5f2f251df
Branches Tags
xgxt_sd:main
...
compare: xgxt_sd:1c9cb5be8e225e1bf5730c9364de79cd21819fd0
Branches Tags
xgxt_sd:main

2 Commits
2573d4bebd ... 1c9cb5be8e

Author SHA1 Message Date
18154758993
1c9cb5be8e Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_java 
# Conflicts:
#	srs-admin/src/main/resources/application.yml
 2025-12-29 10:51:36 +08:00
18154758993
59162701ae 修改处分提交bug 2025-12-29 10:51:06 +08:00
2 changed files with 28 additions and 27 deletions
Expand all files Collapse all files

34
srs-admin/src/main/resources/application.yml
View File

@@ -8,7 +8,7 @@ srs:
copyrightYear: 2023
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/srs/uploadPath，Linux配置 /home/srs/uploadPath）#D:/srs/uploadPath
# 文件路径 示例( Windows配置D:/srs/uploadPath,Linux配置 /home/srs/uploadPath)#D:/srs/uploadPath
profile: /usr/local/java/srs/uploadPath #/usr/local/java/srs/uploadPath
#profile: D:/srs/uploadPath #/srs/uploadPath
# 获取ip地址开关
@@ -20,7 +20,7 @@ srs:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080 正式：8085 测试：8088
# 服务器的HTTP端口,默认为8080 正式:8085 测试:8088
port: 8085
servlet:
# 应用的访问路径
@@ -28,12 +28,12 @@ server:
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# 连接数满后的排队数，默认为100
# 连接数满后的排队数,默认为100
accept-count: 1000
threads:
# tomcat最大线程数，默认为200
# tomcat最大线程数,默认为200
max: 800
# Tomcat启动初始化的线程数，默认值10
# Tomcat启动初始化的线程数,默认值10
min-spare: 100
# 日志配置
@@ -54,7 +54,7 @@ user:
password:
# 密码最大错误次数
maxRetryCount: 5
# 密码锁定时间（默认10分钟）
# 密码锁定时间(默认10分钟)
lockTime: 10
# Spring配置
@@ -64,8 +64,8 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
# active: druid #正式环境
active: dev #测试环境
active: druid #正式环境
# active: dev #测试环境
# 文件上传
servlet:
multipart:
@@ -81,15 +81,15 @@ spring:
# redis 配置
redis:
# 地址
# host: localhost #正式环境redis
host: 47.112.118.149 #测试开发地址
# 端口，默认为6379
host: localhost #正式环境redis
# host: 47.112.118.149 #测试开发地址
# 端口,默认为6379
port: 6379
# 数据库索引
database: 0
# 密码SSSS
password: Houpuyfb #测试开发密码
# password: #正式环境密码
# password: Houpuyfb #测试开发密码
password: #正式环境密码
# 连接超时时间
timeout: 10s
lettuce:
@@ -100,7 +100,7 @@ spring:
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
# #连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms
# token配置
@@ -109,14 +109,14 @@ token:
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
# 令牌有效期(默认30分钟)
expireTime: 43200
# MyBatis配置
#mybatis:
# # 搜索指定包别名
# typeAliasesPackage: com.srs.**.domain
# # 配置mapper的扫描，找到所有的mapper.xml映射文件
# # 配置mapper的扫描,找到所有的mapper.xml映射文件
# mapperLocations: classpath*:mapper/**/*Mapper.xml
# # 加载全局的配置文件
# configLocation: classpath:mybatis/mybatis-config.xml
@@ -149,7 +149,7 @@ swagger:
xss:
# 过滤开关
enabled: false
# 排除链接（多个用逗号分隔）
# 排除链接(多个用逗号分隔)
excludes: /system/notify/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*,/stureg/intenetin/*

21
srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryApplicationServiceImpl.java
View File

@@ -145,11 +145,11 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
rtStuDisciplinaryApplication.setUpdateTime(DateUtils.getNowDate());
rtStuDisciplinaryApplication.setUpdateBy(SecurityUtils.getUsername());
//if (rtStuDisciplinaryApplication.getViolationDate() != null) {
if (rtStuDisciplinaryApplication.getDisciplinaryDate() != null) {
// 设置 处分到期时间
//rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getViolationDate()));
rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getDisciplinaryDate()));
// }
}
if (rtStuDisciplinaryApplication.getSubmissionStatus() != null && rtStuDisciplinaryApplication.getSubmissionStatus() == 1) {
@@ -168,10 +168,10 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
rtStuDisciplinaryApplication.setUpdateTime(DateUtils.getNowDate());
rtStuDisciplinaryApplication.setUpdateBy(SecurityUtils.getUsername());
//if (rtStuDisciplinaryApplication.getViolationDate() != null) {
// 设置 处分到期时间
//rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getViolationDate()));
rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getDisciplinaryDate()));
// }
// 设置 处分到期时间
//rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getViolationDate()));
rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getDisciplinaryDate()));
// }
return rtStuDisciplinaryApplicationMapper.updateRtStuDisciplinaryApplication(rtStuDisciplinaryApplication);
}
@@ -221,9 +221,9 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
@Override
public StuDisciplinaryPenaltyNumber getStuDisciplinaryApplicationByPenaltyNumber(Long penaltyNumber) {
StuDisciplinaryPenaltyNumber stuDisciplinaryPenaltyNumber = rtStuDisciplinaryApplicationMapper.selectStuDisciplinaryApplicationByPenaltyNumber(penaltyNumber);
if (stuDisciplinaryPenaltyNumber != null){
if (stuDisciplinaryPenaltyNumber != null) {
return stuDisciplinaryPenaltyNumber;
}else{
} else {
throw new ServiceException("未找到相关处分文号信息");
}
}
@@ -300,9 +300,10 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
}
}
@Override
public String getviolationDate(String stuNo){
return rtStuDisciplinaryApplicationMapper.getviolationDate(stuNo);
public String getviolationDate(String stuNo) {
return rtStuDisciplinaryApplicationMapper.getviolationDate(stuNo);
}
}