分派控制调整

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerModifyVO.java

@@ -38,4 +38,8 @@ public class PlanAssignSteerModifyVO extends PlanAssignSteerModify {
 
 	@Schema(description = "审批意见")
 	String remark;
+
+	public static final Integer RESULT_PASS = 1;
+	public static final Integer RESULT_REJECT = 2;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java

@@ -37,6 +37,9 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateUtil;
 
+import static org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO.RESULT_PASS;
+import static org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO.RESULT_REJECT;
+
 /**
  * [分派控制调整] 服务实现类
  *
@@ -322,12 +325,12 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl<PlanAssign
         }
 
         // 校验审批结果
-        if (result == null || (!PlanAssignSteerModify.ApprovalStatus.PASS.equals(result) && !PlanAssignSteerModify.ApprovalStatus.REJECT.equals(result))) {
+        if (result == null || (!RESULT_PASS.equals(result) && !RESULT_REJECT.equals(result))) {
             throw new RuntimeException("审批结果错误，1-通过，2-驳回");
         }
 
         // 审批不通过时，意见必填
-        if (PlanAssignSteerModify.ApprovalStatus.REJECT.equals(result) && Func.isEmpty(remark)) {
+        if (RESULT_REJECT.equals(result) && StrUtil.isEmpty(remark)) {
             throw new RuntimeException("审批不通过时，必须填写审批意见");
         }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanAssignSteerModifyController.java

@@ -149,19 +149,10 @@ public class PlanAssignSteerModifyController extends BladeController {
     public R audit(@RequestBody PlanAssignSteerModifyVO vo) {
 
         Long id = vo.getId();
-        if (Objects.isNull(id)) {
-            return R.fail("请选择要审批的记录");
-        }
 
         Integer result = vo.getResult();
-        if (Objects.isNull(result) || result < 1 || result > 2) {
-            return R.fail("审批结果: 1-通过, 2-驳回");
-        }
 
         String remark = vo.getRemark();
-        if (2 == result && StrUtil.isEmpty(remark)) {
-            return R.fail("请填写审批意见");
-        }
 
         return service.audit(id, result, remark);
     }