[工作流模块]页面和流程处理

src/main/java/com/tykj/workflowcore/workflow_editer/entity/FlowsInfo.java

@@ -75,6 +75,5 @@ public class FlowsInfo extends BaseEntity {
     * @params: 部署id
     */
     private String deployId;
-    @ApiModelProperty("是否删除")
-    private Integer deleted = 0;
+
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/FormPage.java

 package com.tykj.workflowcore.workflow_editer.entity;
 
+import com.tykj.workflowcore.base.entity.BaseEntity;
 import com.tykj.workflowcore.model_layer.annotatiion.WorkFlowCoreNoScan;
 import com.tykj.workflowcore.workflow_editer.vo.InFormPageVo;
 import com.tykj.workflowcore.workflow_editer.vo.OutFormPageVo;
@@ -8,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 import org.springframework.beans.BeanUtils;
 
 import javax.persistence.*;
@@ -26,8 +29,10 @@ import java.util.Date;
 @NoArgsConstructor
 @Entity
 @WorkFlowCoreNoScan
+@SQLDelete(sql = "update flows_info set deleted = 1 where id = ?")
+@Where(clause = "deleted = 0")
 @Api("表单页面")
-public class FormPage {
+public class FormPage extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/tykj/workflowcore/workflow_editer/service/FormPageService.java

@@ -45,7 +45,7 @@ public interface FormPageService {
      * 根据页面id删除页面
      * @param id 页面id
      */
-    void deletePage(@PathVariable("id") Long id);
+    void deletePage(Long id);
 
     /**
      * 查询全部页面

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/FormPageServiceImpl.java

@@ -60,8 +60,10 @@ public class FormPageServiceImpl implements FormPageService {
     }
 
     @Override
-    public void deletePage(@PathVariable("id") Long id) {
-        formPageMapper.deleteById(id);
+    public void deletePage(Long id) {
+        FormPage formPage = formPageMapper.findById(id).get();
+        formPage.setDeleted(1);
+        formPageMapper.save(formPage);
     }
 
     @Override