From 32f01d908cc6fd15f6337150a197c2954bd8ba46 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 26 十一月 2024 12:08:48 +0800
Subject: [PATCH] 流程类型管理
---
business/src/main/resources/mapper/FlowableTypeMapper.xml | 12 ++++++
business/src/main/java/com/ycl/domain/entity/FlowableType.java | 43 +++++++++++++++++----
business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java | 4 +
business/src/main/java/com/ycl/service/FlowableTypeService.java | 1
business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java | 4 ++
business/src/main/java/com/ycl/controller/FlowableTypeController.java | 21 +++++++---
6 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/FlowableTypeController.java b/business/src/main/java/com/ycl/controller/FlowableTypeController.java
index 3541bf4..4512a0d 100644
--- a/business/src/main/java/com/ycl/controller/FlowableTypeController.java
+++ b/business/src/main/java/com/ycl/controller/FlowableTypeController.java
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.common.base.Result;
+import com.ycl.common.constant.UserConstants;
+import com.ycl.common.core.controller.BaseController;
+import com.ycl.common.core.domain.AjaxResult;
+import com.ycl.common.core.domain.entity.SysMenu;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.domain.entity.FlowableType;
@@ -21,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
+import java.util.Date;
import java.util.List;
/**
@@ -31,7 +36,7 @@
@Api(value = "宸ヤ綔娴佸垎绫�", tags = "宸ヤ綔娴佸垎绫荤鐞�")
@RestController
@RequestMapping("/flowable_type")
-public class FlowableTypeController {
+public class FlowableTypeController extends BaseController {
private final FlowableTypeService flowableTypeService;
@@ -39,6 +44,10 @@
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
// @PreAuthorize("hasAuthority('flowableType:add')")
public Result add(@RequestBody @Validated(Add.class) FlowableType form) {
+ form.setCreateBy(getUsername());
+ form.setCreateTime(new Date());
+ form.setUpdateBy(getUsername());
+ form.setUpdateTime(new Date());
flowableTypeService.save(form);
return Result.ok();
}
@@ -60,13 +69,11 @@
}
- @GetMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ @GetMapping("/list")
// @PreAuthorize("hasAuthority('flowableType:page')")
- public Result page(AbsQuery query) {
- IPage<FlowableType> page = PageUtil.getPage(query, FlowableType.class);
- flowableTypeService.page(page);
- return Result.ok().data(page.getRecords()).total(page.getTotal());
+ public Result list(FlowableType flowableType) {
+ List<FlowableType> list = flowableTypeService.selectTypeList(flowableType);
+ return Result.ok().data(list);
}
}
diff --git a/business/src/main/java/com/ycl/domain/entity/FlowableType.java b/business/src/main/java/com/ycl/domain/entity/FlowableType.java
index fa18704..e5f4cae 100644
--- a/business/src/main/java/com/ycl/domain/entity/FlowableType.java
+++ b/business/src/main/java/com/ycl/domain/entity/FlowableType.java
@@ -1,21 +1,25 @@
package com.ycl.domain.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.common.core.domain.BaseEntity;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
+import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 娴佺▼鍒嗙被
*/
@Data
@TableName("t_flowable_type")
-public class FlowableType extends AbsEntity {
+public class FlowableType implements Serializable {
private static final long serialVersionUID = 1L;
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Integer id;
@TableField(value = "name")
private String name;
@@ -23,17 +27,40 @@
@TableField(value = "parent_id")
private Integer parentId;
- @TableField(value = "level")
- private Integer level;
+ @TableField(value = "order_num")
+ private Integer orderNum;
- @TableField(value = "leaf")
- private Boolean leaf;
+// @TableField(value = "level")
+// private Integer level;
+//
+// @TableField(value = "leaf")
+// private Boolean leaf;
+ /**
+ * 鑿滃崟鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @TableField(value = "status")
+ private String status;
+
+ /** 鍒涘缓鑰� */
@TableField(value = "create_by")
private String createBy;
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /** 鏇存柊鑰� */
@TableField(value = "update_by")
private String updateBy;
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "update_time")
+ private Date updateTime;
+ /** 澶囨敞 */
+ @TableField(value = "remark")
+ private String remark;
}
diff --git a/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java b/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java
index 428a7ee..d867543 100644
--- a/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java
+++ b/business/src/main/java/com/ycl/mapper/FlowableTypeMapper.java
@@ -4,8 +4,10 @@
import com.ycl.domain.entity.FlowableType;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
@Mapper
public interface FlowableTypeMapper extends BaseMapper<FlowableType> {
-
+ List<FlowableType> selectTypeList(FlowableType flowableType);
}
diff --git a/business/src/main/java/com/ycl/service/FlowableTypeService.java b/business/src/main/java/com/ycl/service/FlowableTypeService.java
index 924b6e9..41f3f0f 100644
--- a/business/src/main/java/com/ycl/service/FlowableTypeService.java
+++ b/business/src/main/java/com/ycl/service/FlowableTypeService.java
@@ -9,4 +9,5 @@
public interface FlowableTypeService extends IService<FlowableType> {
+ List<FlowableType> selectTypeList(FlowableType flowableType);
}
diff --git a/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java
index c871d79..1996b65 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowableTypeServiceImpl.java
@@ -20,4 +20,8 @@
@RequiredArgsConstructor
public class FlowableTypeServiceImpl extends ServiceImpl<FlowableTypeMapper, FlowableType> implements FlowableTypeService {
+ @Override
+ public List<FlowableType> selectTypeList(FlowableType flowableType) {
+ return baseMapper.selectTypeList(flowableType);
+ }
}
diff --git a/business/src/main/resources/mapper/FlowableTypeMapper.xml b/business/src/main/resources/mapper/FlowableTypeMapper.xml
index 456f26d..5fc2af2 100644
--- a/business/src/main/resources/mapper/FlowableTypeMapper.xml
+++ b/business/src/main/resources/mapper/FlowableTypeMapper.xml
@@ -53,5 +53,17 @@
WHERE
TP.deleted = 0
</select>
+ <select id="selectTypeList" parameterType="com.ycl.domain.entity.FlowableType" resultType="com.ycl.domain.entity.FlowableType">
+ select * from t_flowable_type
+ <where>
+ <if test="name != null and name != ''">
+ AND name like concat('%', #{name}, '%')
+ </if>
+ <if test="status != null and status != ''">
+ AND status = #{status}
+ </if>
+ </where>
+ order by parent_id, order_num
+ </select>
</mapper>
--
Gitblit v1.8.0