From 90a0d168dff869b7b2b65a858de083e17de50094 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 10:32:11 +0800
Subject: [PATCH] 計費策略添加審核
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java | 32 ++++++++++++++++++++++++++++++++
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml | 11 +++++++++--
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java
index a4e89d8..f6c9c95 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategy.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -50,5 +51,36 @@
@TableField("discount")
private BigDecimal discount;
+ @ApiModelProperty(value = "一级审核用户id")
+ @TableField("first_user_id")
+ private Long firstUserId;
+
+ @ApiModelProperty(value = "二级审核用户id")
+ @TableField("two_user_id")
+ private Long twoUserId;
+
+ @ApiModelProperty(value = "一级审核备注")
+ @TableField("first_remark")
+ private String firstRemark;
+
+ @ApiModelProperty(value = "二级审核备注")
+ @TableField("two_remark")
+ private String twoRemark;
+
+ @ApiModelProperty(value = "审核状态（1=待审核一级，2=待审核二级，3=审核通过，4=驳回）")
+ @TableField("audit_status")
+ private Integer auditStatus;
+
+ @ApiModelProperty(value = "一级审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("first_audit_time")
+ private LocalDateTime firstAuditTime;
+
+ @ApiModelProperty(value = "二级审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("two_audit_time")
+ private LocalDateTime twoAuditTime;
+
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
index 9dd7f64..ff7cbf7 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
@@ -9,17 +9,24 @@
<result column="`name`" property="name" />
<result column="description" property="description" />
<result column="discount" property="discount" />
+ <result column="first_user_id" property="firstUserId" />
+ <result column="two_user_id" property="twoUserId" />
+ <result column="first_remark" property="firstRemark" />
+ <result column="two_remark" property="twoRemark" />
+ <result column="audit_status" property="auditStatus" />
+ <result column="first_audit_time" property="firstAuditTime" />
+ <result column="two_audit_time" property="twoAuditTime" />
<result column="create_time" property="createTime" />
<result column="del_flag" property="delFlag" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, site_id, `name`, description, discount, create_time, del_flag
+ id, site_id, `name`, description, discount,first_user_id,two_user_id,first_remark,two_remark,audit_status,first_audit_time,two_audit_time, create_time, del_flag
</sql>
<select id="pageList" resultType="com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO">
SELECT
- id, site_id, `name`, description, discount, create_time, del_flag
+ id, site_id, `name`, description, discount,first_user_id,two_user_id,first_remark,two_remark,audit_status,first_audit_time,two_audit_time, create_time, del_flag
FROM t_accounting_strategy
<where>
<if test="query.name != null and query.name != ''">
--
Gitblit v1.7.1