diff --git a/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java b/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java index cff5f56..022f7a2 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java @@ -41,14 +41,14 @@ public class MentenceInfoCountController extends AbstractCommonFileController { return R.ok(byPage); } - @Operation(summary = "根据时间统计隐患数目") + @Operation(summary = "根据时间统计 隐患 数目") @PostMapping("/count12") public R> count12(@RequestBody MonthRangeSo monthRangeSo){ List list = mentenceFarmerRecordService.count12(monthRangeSo); return R.ok(list); } - @Operation(summary = "根据时间统计隐患类型数目") + @Operation(summary = "根据时间统计 隐患类型 数目") @PostMapping("/countType") public R> countType(@RequestBody MonthRangeSo monthRangeSo){ Map map = mentenceFarmerRecordService.countType(monthRangeSo); diff --git a/src/main/java/com/gunshi/project/hsz/model/MentenceTemplate.java b/src/main/java/com/gunshi/project/hsz/model/MentenceTemplate.java index d4d13cb..539f958 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentenceTemplate.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentenceTemplate.java @@ -4,6 +4,8 @@ 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.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.project.hsz.validate.markers.Insert; import com.gunshi.project.hsz.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; @@ -19,6 +21,7 @@ import java.util.List; @TableName("mentence_template") public class MentenceTemplate { @TableId + @JsonSerialize(using = ToStringSerializer.class) private Long id; @TableField("name") @@ -27,7 +30,7 @@ public class MentenceTemplate { private String name; @TableField("type") - @Schema(description = "模板类型") + @Schema(description = "模板类型 0 养护记录 1 验收记录") @NotNull(message = "模板类型不能为空",groups = {Insert.class, Update.class}) private Integer type;