完善

platform-dao/src/main/java/com/platform/dao/enums/CustomFieldTemplateDataStatusEnum.java

@@ -28,7 +28,7 @@ public enum CustomFieldTemplateDataStatusEnum {
     /**
      * 审批拒绝
      */
-    FAIL(3);
+    FAIL(4);
     private Integer value;
 
 }

platform-service/src/main/java/com/platform/service/customize/BaseFormCheckService.java

@@ -90,7 +90,7 @@ public interface BaseFormCheckService {
      * 审核拒绝的数据更新
      * @param actAuditRequest
      */
-    void doRefuse(ActAuditRequest actAuditRequest);
+    String doRefuse(ActAuditRequest actAuditRequest);
 
     /**
      * 审核完成的数据更新

platform-service/src/main/java/com/platform/service/customize/BaseFormCheckServiceAbstract.java

@@ -122,7 +122,8 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
                 instance = runtimeService.startProcessInstanceByKey(actAuditRequest.getAuditModelKey(), actAuditRequest.getId(), map);
                 actAuditRequest.setProcessInstanceId(instance.getId());
             } else {
-                runtimeService.startProcessInstanceById(actAuditRequest.getProcessInstanceId(), actAuditRequest.getId(), map);
+                runtimeService.startProcessInstanceById(instanceExist.getProcessDefinitionId(), actAuditRequest.getId(), map);
+                //runtimeService.startProcessInstanceById(actAuditRequest.getProcessInstanceId(), actAuditRequest.getId(), map);
             }
         }
         // 第一个审批人为发起人，为自动审批。557501
@@ -375,13 +376,14 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
     }
 
     @Override
-    public void doRefuse(ActAuditRequest actAuditRequest) {
+    public String doRefuse(ActAuditRequest actAuditRequest) {
         CustomFieldTemplateData updInfo = getById(actAuditRequest.getId());
         updInfo.setStatus(ActivitiFormStatusEnum.REFUSE.getValue());
         JSONObject jsonObject = JSON.parseObject(updInfo.getData());
         jsonObject.put("status",ActivitiFormStatusEnum.REFUSE.getValue());
         updInfo.setData(JsonUtils.objectToJson(jsonObject));
         customFieldTemplateDataMapper.updateByPrimaryKeySelective(updInfo);
+        return updInfo.getObjId();
     }
 
     @Override

platform-service/src/main/java/com/platform/service/customize/impl/SbAllocateCheckServiceImpl.java

@@ -52,8 +52,8 @@ public class SbAllocateCheckServiceImpl extends BaseFormCheckServiceAbstract {
     }
 
     @Override
-    public void doRefuse(ActAuditRequest actAuditRequest) {
-        super.doRefuse(actAuditRequest);
+    public String doRefuse(ActAuditRequest actAuditRequest) {
+        return super.doRefuse(actAuditRequest);
     }
 
     @Override

platform-service/src/main/java/com/platform/service/customize/impl/SbScrapCheckServiceImpl.java

@@ -116,8 +116,13 @@ public class SbScrapCheckServiceImpl extends BaseFormCheckServiceAbstract {
      * @param actAuditRequest
      */
     @Override
-    public void doRefuse(ActAuditRequest actAuditRequest) {
-        super.doRefuse(actAuditRequest);
+    public String doRefuse(ActAuditRequest actAuditRequest) {
+        String sbId = super.doRefuse(actAuditRequest);
+        SbInfo sbInfo = new SbInfo();
+        sbInfo.setStatus(SbInfoStatusEnum.IN_STOP.getValue());
+        sbInfo.setId(sbId);
+        sbInfoMapper.updateByPrimaryKeySelective(sbInfo);
+        return sbId;
     }
 
     /**

platform-service/src/main/java/com/platform/service/customize/impl/SbStopCheckServiceImpl.java

@@ -104,8 +104,8 @@ public class SbStopCheckServiceImpl extends BaseFormCheckServiceAbstract {
     }
 
     @Override
-    public void doRefuse(ActAuditRequest actAuditRequest) {
-        super.doRefuse(actAuditRequest);
+    public String doRefuse(ActAuditRequest actAuditRequest) {
+        return super.doRefuse(actAuditRequest);
     }
 
     @Override