|
@@ -49,16 +49,15 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public String saveExamRule(BasicExamRule examRule) {
|
|
|
+ public Long saveExamRule(BasicExamRule examRule) {
|
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
|
examRule.setSchoolId(schoolId);
|
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
|
|
|
// 新增
|
|
|
if (examRule.getId() == null) {
|
|
|
- examRule.setId(SystemConstant.getDbUuid());
|
|
|
- examRule.setCreateId(sysUser.getId());
|
|
|
- examRule.setCreateTime(System.currentTimeMillis());
|
|
|
+ examRule.insertInfo(sysUser.getId());
|
|
|
+ examRule.setOrgId(sysUser.getOrgId());
|
|
|
this.save(examRule);
|
|
|
}
|
|
|
// 修改
|
|
@@ -97,24 +96,23 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
|
|
|
throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划,不能修改扩展字段");
|
|
|
}
|
|
|
}
|
|
|
- if (!basicExamRule.getReview().equals(examRule.getReview())){
|
|
|
+ if (!basicExamRule.getReview().equals(examRule.getReview())) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划,不能修改入库审核控制");
|
|
|
}
|
|
|
- if (!basicExamRule.getIncludePaper().equals(examRule.getIncludePaper())){
|
|
|
+ if (!basicExamRule.getIncludePaper().equals(examRule.getIncludePaper())) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划,不能修改包含试卷控制");
|
|
|
}
|
|
|
- if (!basicExamRule.getCustomCard().equals(examRule.getCustomCard())){
|
|
|
+ if (!basicExamRule.getCustomCard().equals(examRule.getCustomCard())) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划,不能修改客服制卡控制");
|
|
|
}
|
|
|
- if (!basicExamRule.getPrintMethod().equals(examRule.getPrintMethod())){
|
|
|
+ if (!basicExamRule.getPrintMethod().equals(examRule.getPrintMethod())) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划,不能修改印刷方式控制");
|
|
|
}
|
|
|
}
|
|
|
- examRule.setUpdateId(sysUser.getId());
|
|
|
- examRule.setUpdateTime(System.currentTimeMillis());
|
|
|
-
|
|
|
+ examRule.updateInfo(sysUser.getId());
|
|
|
+ examRule.setOrgId(sysUser.getOrgId());
|
|
|
this.updateById(examRule);
|
|
|
}
|
|
|
- return examRule.getId().toString();
|
|
|
+ return examRule.getId();
|
|
|
}
|
|
|
}
|