guomengjiao il y a 3 jours
Parent
commit
60f99de5f9

+ 4 - 0
ruoyi-info/src/main/java/com/ruoyi/info/service/domain/ServiceProduct.java

@@ -52,6 +52,10 @@ public class ServiceProduct extends BaseEntity {
      * 服务单位
      */
     private String serviceUnit;
+    /**
+     * 服务单位时长
+     */
+    private Integer serviceUnitDuration;
     /**
      * 服务说明
      */

+ 12 - 4
ruoyi-info/src/main/java/com/ruoyi/info/service/domain/bo/ServiceProductBo.java

@@ -1,20 +1,21 @@
 package com.ruoyi.info.service.domain.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
 /**
  * 服务业务对象 tb_service_product
  *
@@ -82,6 +83,13 @@ public class ServiceProductBo extends BaseEntity {
     @NotBlank(message = "服务单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serviceUnit;
 
+    /**
+     * 服务单位时长
+     */
+    @ApiModelProperty("服务单位时长")
+    @NotNull(message = "服务单位时长不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer serviceUnitDuration;
+
     /**
      * 服务说明
      */

+ 7 - 0
ruoyi-info/src/main/java/com/ruoyi/info/service/domain/vo/ServiceProductVo.java

@@ -79,6 +79,13 @@ public class ServiceProductVo {
     private String serviceUnit;
     private String serviceUnitName;
 
+    /**
+     * 服务单位时长
+     */
+    @ExcelProperty(value = "服务单位时长")
+    @ApiModelProperty("服务单位时长")
+    private Integer serviceUnitDuration;
+
     /**
      * 服务说明
      */

+ 1 - 0
ruoyi-info/src/main/resources/mapper/service/ServiceProductMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="originalPrice" column="original_price"/>
         <result property="costPrice" column="cost_price"/>
         <result property="serviceUnit" column="service_unit"/>
+        <result property="serviceUnitDuration" column="service_unit_duration"/>
         <result property="serviceDescription" column="service_description"/>
         <result property="serviceNotice" column="service_notice"/>
         <result property="status" column="status"/>