Просмотр исходного кода

白名单列表增加到期时间和状态

dzx 1 год назад
Родитель
Сommit
1b6de30775

+ 8 - 0
src/main/java/com/xjrsoft/module/base/vo/WhitelistManagementPageVo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
+
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -95,4 +97,10 @@ public class WhitelistManagementPageVo {
 
     @ApiModelProperty("班主任")
     private String teacher;
+
+    @ApiModelProperty("是否临时性的(1:是 0:否)")
+    private Integer isTemporary;
+
+    @ApiModelProperty("临时使用结束时间")
+    private LocalDate endTime;
 }

+ 1 - 1
src/main/resources/mapper/base/WhitelistManagement.xml

@@ -4,7 +4,7 @@
                 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.base.mapper.WhitelistManagementMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.base.dto.WhitelistManagementPageDto" resultType="com.xjrsoft.module.base.vo.WhitelistManagementPageVo">
-        SELECT t.id, t.credential_number as credentialNumber, t.name, t.phone,
+        SELECT t.id, t.credential_number as credentialNumber, t.name, t.phone,t.is_temporary,t.end_time,
             CASE
                WHEN t1.gender = 'SB1001' THEN '男'
                WHEN t1.gender = 'SB1002' THEN '女'