xgxt_sd/zhxg_java
16
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:
weishengyou
2025-12-30 10:48:03 +08:00
parent ecda360755 b0d0ba88fa
commit 4b4f25f813
15 changed files with 450 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,11 +147,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) {
@@ -170,10 +170,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);
}
@@ -223,9 +223,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("未找到相关处分文号信息");
}
}
@@ -302,9 +302,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);
}
}