1. 在静态和动态实体类中添加验证审批状态方法,用于批量验证审批状态中

2. 在任务状态修改函数中,添加更新动静态规则审批状态方法,用以更新规则审批状态为使用中/已审批
3. 在部分Mapper的update函数中修改modify_time为NOW()
4. 修复部分NullPointerException bug
5. 在新建任务时立刻检查所有规则的审批状态,必须为已审批才可以添加到任务中
6. 在taskService中添加更新动静态规则审批状态函数。该函数不能用于除已审批/使用中的其他审批状态更新
This commit is contained in:
EnderByEndera
2024-04-24 14:15:08 +08:00
parent 10d95b1417
commit 0526a1322b
17 changed files with 242 additions and 48 deletions

View File

@@ -57,7 +57,7 @@ public class StaticRuleService {
public Integer newStaticRuleObject(StaticRuleObject object) {
object.setStaticRuleCreateTime(LocalDateTime.now());
object.setStaticRuleAuditStatus(0);
object.setAuditStatus(0);
/*
待开发:设置静态规则对象的创建用户、用户所属部门等属性
*/
@@ -114,7 +114,7 @@ public class StaticRuleService {
throw new IllegalArgumentException("未知的静态规则ID");
}
if (!staticRuleObject.getStaticRuleAuditStatus().equals(AuditStatusEnum.AUDITED.getNum())) {
if (!staticRuleObject.getAuditStatus().equals(AuditStatusEnum.AUDITED.getNum())) {
throw new IllegalStateException("无法修改该静态规则,因为其审核状态未处于" + AuditStatusEnum.AUDITED);
}
@@ -125,7 +125,7 @@ public class StaticRuleService {
//判断当前静态规则是否能够修改---是否存在任务选择的静态规则??
//按id查询该静态规则的used_task_id字段如果不为空则不能修改
object.setStaticRuleModifyTime(LocalDateTime.now());
object.setStaticRuleAuditStatus(AuditStatusEnum.PENDING.getNum());
object.setAuditStatus(AuditStatusEnum.PENDING.getNum());
//修改静态规则
return staticRuleMapper.updateStaticRule(id, object);
}
@@ -200,7 +200,7 @@ public class StaticRuleService {
return;
}
if (Objects.equals(staticRuleObject.getStaticRuleAuditStatus(), AuditStatusEnum.USING.getNum())) {
if (Objects.equals(staticRuleObject.getAuditStatus(), AuditStatusEnum.USING.getNum())) {
throw new IllegalArgumentException("当前静态规则正在使用,无法删除");
}
staticRuleMapper.deleteStaticRuleById(id);