修改处分提交bug
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user