新增sop信息明细表

sop-business/src/main/java/com/qmth/sop/business/entity/TBQualityProblemApply.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.base.BaseEntity;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.FlowApprovePassEnum;
 import com.qmth.sop.common.enums.InfluenceDegreeEnum;
 import com.qmth.sop.common.enums.QualityProblemReasonEnum;
 import com.qmth.sop.common.enums.QualityProblemTypeEnum;
@@ -92,6 +93,11 @@ public class TBQualityProblemApply extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "流程表单")
     private String formProperties;
 
+    @ApiModelProperty(value = "流程审批")
+    @TableField(exist = false)
+    @NotNull(message = "流程审批不能为空")
+    private FlowApprovePassEnum flowApprove;
+
     public TBQualityProblemApply() {
 
     }
@@ -116,6 +122,14 @@ public class TBQualityProblemApply extends BaseEntity implements Serializable {
         this.userIds = !CollectionUtils.isEmpty(userIdList) ? StringUtils.join(userIdList, SystemConstant.LIST_JOIN_SPLIT) : null;
     }
 
+    public FlowApprovePassEnum getFlowApprove() {
+        return flowApprove;
+    }
+
+    public void setFlowApprove(FlowApprovePassEnum flowApprove) {
+        this.flowApprove = flowApprove;
+    }
+
     public List<Long> getUserIdList() {
         return userIdList;
     }

sop-server/src/main/java/com/qmth/sop/server/api/TBProjectExchangeController.java

@@ -45,6 +45,9 @@ public class TBProjectExchangeController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
+        if (tbProjectExchange.getFlowApprove() != FlowApprovePassEnum.START && tbProjectExchange.getFlowApprove() != FlowApprovePassEnum.DRAFT) {
+            throw ExceptionResultEnum.PARAMS_ERROR.exception("流程审批只能为提交或草稿");
+        }
         return ResultUtil.ok(tbProjectExchangeService.saveProjectExchange(tbProjectExchange));
     }
 

sop-server/src/main/java/com/qmth/sop/server/api/TBQualityProblemApplyController.java

@@ -7,9 +7,7 @@ import com.qmth.sop.business.bean.result.TBQualityProblemApplyResult;
 import com.qmth.sop.business.entity.TBQualityProblemApply;
 import com.qmth.sop.business.service.TBQualityProblemApplyService;
 import com.qmth.sop.common.contant.SystemConstant;
-import com.qmth.sop.common.enums.InfluenceDegreeEnum;
-import com.qmth.sop.common.enums.QualityProblemReasonEnum;
-import com.qmth.sop.common.enums.QualityProblemTypeEnum;
+import com.qmth.sop.common.enums.*;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -64,6 +62,9 @@ public class TBQualityProblemApplyController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
+        if (tbQualityProblemApply.getFlowApprove() != FlowApprovePassEnum.START && tbQualityProblemApply.getFlowApprove() != FlowApprovePassEnum.DRAFT) {
+            throw ExceptionResultEnum.PARAMS_ERROR.exception("流程审批只能为提交或草稿");
+        }
         return ResultUtil.ok(tBQualityProblemApplyService.saveTBQualityProblemApply(tbQualityProblemApply));
     }