diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java index be33bd0..b05ff97 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java @@ -97,7 +97,7 @@ public class FilesCustomizeClassifyController extends BaseController { * @param kyFilesCustomizeClassify * @return */ - @SysLog(title = "档案自定义分类管理", businessType = OperaType.QUERY, module = "档案自定义分类管理->修改档案自定义分类管理", details = "修改档案自定义分类管理") + @SysLog(title = "档案自定义分类管理", businessType = OperaType.QUERY, module = "档案自定义分类管理->删除档案自定义分类管理", details = "删除档案自定义分类管理") @RequiresPermissions("files:customize:del") @PostMapping("/delKyFilesCustomizeClassify") public AjaxResult delKyFilesCustomizeClassify(@Validated @RequestBody KyFilesCustomizeClassify kyFilesCustomizeClassify) diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java index 5a0b1ed..4288f9c 100644 --- a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java @@ -1,5 +1,8 @@ package com.bonus.system.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import javax.validation.constraints.Size; import java.util.Date; @@ -27,11 +30,15 @@ public class KyFilesCustomizeClassify { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** @@ -74,7 +81,7 @@ public class KyFilesCustomizeClassify { public void setCustomizeClassifyName(String customizeClassifyName) { this.customizeClassifyName = customizeClassifyName; } - @Size(min = 0, max = 255, message = "分类描述超过64个字符") + @Size(min = 0, max = 255, message = "分类描述超过255个字符") public String getClassifyDesc() { return classifyDesc; } diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java index 11f196b..87333cc 100644 --- a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java @@ -1,6 +1,8 @@ package com.bonus.system.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.Size; import java.util.Date; @@ -39,11 +41,15 @@ public class KyFilesMultiClassify { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** diff --git a/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml index e52e025..dd2c9ab 100644 --- a/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into da_ky_files_customize_classify (customize_classify_name,classify_desc,create_time,update_time,create_user_id,create_user_name,update_user_id,update_user_name) - values (#{customizeClassifyName},#{classifyDesc},#{classifyDesc},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName}) + values (#{customizeClassifyName},#{classifyDesc},#{classifyDesc},#{createTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName})