diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java index 09ae23d..4458b28 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java @@ -65,6 +65,7 @@ public class PersonnelPlanController extends AbstractCommonFileController{ } dto.setId(IdWorker.getId()); + dto.setCreateTime(new Date()); boolean result = service.save(dto); if (result){ fileService.saveFile(dto.getFiles(), getGroupId(), dto.getId().toString()); @@ -87,6 +88,11 @@ public class PersonnelPlanController extends AbstractCommonFileController{ if (dto.getStm().compareTo(dto.getEtm()) >= 0){ throw new IllegalArgumentException("开始时间不能大于结束时间"); } + + dto.setCreateTime(null); + dto.setCreateBy(null); + dto.setCreateName(null); + dto.setUpdateTime(new Date()); boolean result = service.updateById(dto); if (result){ fileService.saveFile(dto.getFiles(), getGroupId(), dto.getId().toString()); diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java index 5f8224c..5d312ce 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java @@ -73,6 +73,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ throw new IllegalArgumentException("培训计划不存在"); } dto.setId(IdWorker.getId()); + dto.setCreateTime(new Date()); boolean result = service.save(dto); if (result){ @@ -99,6 +100,11 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ if (planService.lambdaQuery().eq(PersonnelPlan::getId, dto.getPlanId()).count() == 0) { throw new IllegalArgumentException("培训计划不存在"); } + + dto.setCreateTime(null); + dto.setCreateBy(null); + dto.setCreateName(null); + dto.setUpdateTime(new Date()); boolean result = service.updateById(dto); if (result){ fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId())); diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResPersonController.java b/src/main/java/com/gunshi/project/xyt/controller/ResPersonController.java index cde7f65..72d6c6e 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResPersonController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResPersonController.java @@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -51,7 +52,9 @@ public class ResPersonController { throw new IllegalArgumentException("当前责任类型名字重复"); } + dto.setCreateTime(new Date()); dto.setId(IdWorker.getId()); + boolean result = service.save(dto); return R.ok(result ? dto : null); } @@ -67,6 +70,10 @@ public class ResPersonController { if (query.count() > 0){ throw new IllegalArgumentException("当前责任类型名字重复"); } + dto.setCreateTime(null); + dto.setCreateBy(null); + dto.setCreateName(null); + dto.setUpdateTime(new Date()); boolean result = service.updateById(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java index 74c2a19..30a9c36 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java @@ -86,7 +86,9 @@ public class SzCaseController extends AbstractCommonFileController{ } dto.setCreateTime(null); - dto.setId(null); + dto.setCreateBy(null); + dto.setCreateName(null); + dto.setUpdateTime(new Date()); boolean result = service.updateById(dto); if (result){ diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java b/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java index bd1d1c6..63a4ce8 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java @@ -27,7 +27,7 @@ import java.util.Objects; * author: xusan * date: 2024-07-08 17:40:37 */ -@Tag(name = "案件登记表") +@Tag(name = "制度管理表") @RestController @RequestMapping(value = "/SzRegulatoryFramework") public class SzRegulatoryFrameworkController extends AbstractCommonFileController { @@ -72,8 +72,10 @@ public class SzRegulatoryFrameworkController extends AbstractCommonFileControlle throw new IllegalArgumentException("当前名称已存在"); } + dto.setCreateBy(null); + dto.setCreateName(null); + dto.setUpdateTime(new Date()); dto.setCreateTime(null); - dto.setId(null); boolean result = service.updateById(dto); if (result) { diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java b/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java index 32b7045..e8f2895 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java @@ -49,7 +49,6 @@ public class SzRuleByLawController extends AbstractCommonFileController { dto.setId(IdWorker.getId()); dto.setCreateTime(new Date()); - boolean result = service.save(dto); @@ -72,7 +71,6 @@ public class SzRuleByLawController extends AbstractCommonFileController { throw new IllegalArgumentException("当前名称已存在"); } - dto.setId(null); dto.setCreateTime(null); dto.setCreateBy(null); dto.setCreateName(null); diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java index 775c11e..5c420c2 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java @@ -68,7 +68,8 @@ public class SzTreatmentBasisController{ } dto.setCreateTime(null); - dto.setId(null); + dto.setCreateBy(null); + dto.setCreateName(null); dto.setUpdateTime(new Date()); boolean result = service.updateById(dto); diff --git a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java index 6f03ea7..6652f18 100644 --- a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java +++ b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java @@ -16,6 +16,7 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -28,10 +29,11 @@ import java.util.List; * @author XuSan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Schema(description="培训计划表") @Data @TableName("public.personnel_plan") -public class PersonnelPlan implements Serializable { +public class PersonnelPlan extends CommUpdate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java index e8c7919..f76a59e 100644 --- a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java +++ b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -27,10 +28,11 @@ import java.util.List; * @author XuSan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Schema(description="培训记录表") @Data @TableName("public.personnel_plan_log") -public class PersonnelPlanLog implements Serializable { +public class PersonnelPlanLog extends CommUpdate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gunshi/project/xyt/model/SzCase.java b/src/main/java/com/gunshi/project/xyt/model/SzCase.java index c0892af..0de9b35 100644 --- a/src/main/java/com/gunshi/project/xyt/model/SzCase.java +++ b/src/main/java/com/gunshi/project/xyt/model/SzCase.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.math.BigDecimal; @@ -28,10 +29,11 @@ import java.util.List; * @author XuSan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Schema(description="案件登记表") @Data @TableName("public.sz_case") -public class SzCase implements Serializable { +public class SzCase extends CommUpdate implements Serializable { private static final long serialVersionUID = 1L; @@ -44,29 +46,29 @@ public class SzCase implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long id; - /** - * 填报人Id - */ - @TableField(value="create_by") - @Schema(description="填报人Id") - @NotNull(message = "填报人Id不能为空",groups = {Insert.class, Update.class}) - @JsonSerialize(using = ToStringSerializer.class) - private Long createBy; - - /** - * 填报人名字 - */ - @TableField(value="create_name") - @Schema(description="填报人名字") - @Size(max = 30,message = "填报人名字最大长度要小于 30") - @NotBlank(message = "填报人名字不能为空",groups = {Insert.class, Update.class}) - private String createName; - - @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) - @NotNull(message = "填报时间不能为空") - @TableField(value="create_time") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date createTime; +// /** +// * 填报人Id +// */ +// @TableField(value="create_by") +// @Schema(description="填报人Id") +// @NotNull(message = "填报人Id不能为空",groups = {Insert.class, Update.class}) +// @JsonSerialize(using = ToStringSerializer.class) +// private Long createBy; +// +// /** +// * 填报人名字 +// */ +// @TableField(value="create_name") +// @Schema(description="填报人名字") +// @Size(max = 30,message = "填报人名字最大长度要小于 30") +// @NotBlank(message = "填报人名字不能为空",groups = {Insert.class, Update.class}) +// private String createName; +// +// @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) +// @NotNull(message = "填报时间不能为空") +// @TableField(value="create_time") +// @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") +// private Date createTime; /** * 案件编号 diff --git a/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java b/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java index e0c5615..85c35f4 100644 --- a/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java +++ b/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; 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.core.dateformat.DateFormatString; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,9 +13,9 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -27,10 +25,11 @@ import java.util.List; * @author XuSan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Schema(description="制度管理表") @Data @TableName("public.sz_regulatory_framework") -public class SzRegulatoryFramework implements Serializable { +public class SzRegulatoryFramework extends CommUpdate implements Serializable { private static final long serialVersionUID = 1L; @@ -71,56 +70,56 @@ public class SzRegulatoryFramework implements Serializable { private Integer type; - /** - * 创建人Id - */ - @TableField(value="create_by") - @Schema(description="填报人Id") - @NotNull(message = "填报人Id不能为空",groups = {Insert.class, Update.class}) - @JsonSerialize(using = ToStringSerializer.class) - private Long createBy; - - /** - * 创建人名字 - */ - @TableField(value="create_name") - @Schema(description="填报人名字") - @Size(max = 30,message = "填报人名字最大长度要小于 30") - @NotBlank(message = "填报人名字不能为空",groups = {Insert.class, Update.class}) - private String createName; - - /** - * 创建人时间 - */ - @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) - @NotNull(message = "填报时间不能为空") - @TableField(value="create_time") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date createTime; - - /** - * 更新人Id - */ - @TableField(value="update_by") - @Schema(description="更新人Id") - @JsonSerialize(using = ToStringSerializer.class) - private Long updateBy; - - /** - * 更新人名字 - */ - @TableField(value="update_name") - @Schema(description="更新人名字") - @NotBlank(message = "更新人名字不能为空",groups = {Insert.class, Update.class}) - private String updateName; - - /** - * 更新时间 - */ - @Schema(description="更新时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) - @TableField(value="update_time") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date updateTime; +// /** +// * 创建人Id +// */ +// @TableField(value="create_by") +// @Schema(description="填报人Id") +// @NotNull(message = "填报人Id不能为空",groups = {Insert.class, Update.class}) +// @JsonSerialize(using = ToStringSerializer.class) +// private Long createBy; +// +// /** +// * 创建人名字 +// */ +// @TableField(value="create_name") +// @Schema(description="填报人名字") +// @Size(max = 30,message = "填报人名字最大长度要小于 30") +// @NotBlank(message = "填报人名字不能为空",groups = {Insert.class, Update.class}) +// private String createName; +// +// /** +// * 创建人时间 +// */ +// @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) +// @NotNull(message = "填报时间不能为空") +// @TableField(value="create_time") +// @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") +// private Date createTime; +// +// /** +// * 更新人Id +// */ +// @TableField(value="update_by") +// @Schema(description="更新人Id") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long updateBy; +// +// /** +// * 更新人名字 +// */ +// @TableField(value="update_name") +// @Schema(description="更新人名字") +// @NotBlank(message = "更新人名字不能为空",groups = {Insert.class, Update.class}) +// private String updateName; +// +// /** +// * 更新时间 +// */ +// @Schema(description="更新时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) +// @TableField(value="update_time") +// @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") +// private Date updateTime; @TableField(exist = false) diff --git a/src/main/java/com/gunshi/project/xyt/model/SzRuleByLaw.java b/src/main/java/com/gunshi/project/xyt/model/SzRuleByLaw.java index 33526ba..cf1820b 100644 --- a/src/main/java/com/gunshi/project/xyt/model/SzRuleByLaw.java +++ b/src/main/java/com/gunshi/project/xyt/model/SzRuleByLaw.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -27,6 +28,7 @@ import java.util.List; * @author XuSan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Schema(description="法律法规管理表") @Data @TableName("public.sz_rule_by_law") diff --git a/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java b/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java index 8a0e397..4ca63c7 100644 --- a/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java +++ b/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; 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.core.dateformat.DateFormatString; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; @@ -17,7 +15,6 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -30,7 +27,7 @@ import java.util.List; @Schema(description="处理依据表") @Data @TableName("public.sz_treatment_basis") -public class SzTreatmentBasis implements Serializable { +public class SzTreatmentBasis extends CommUpdate implements Serializable { private static final long serialVersionUID = 1L; @@ -51,32 +48,32 @@ public class SzTreatmentBasis implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long pId; - /** - * 创建人Id - */ - @TableField(value="create_by") - @Schema(description="填报人Id") - @NotNull(message = "填报人Id不能为空",groups = {Insert.class, Update.class}) - @JsonSerialize(using = ToStringSerializer.class) - private Long createBy; - - /** - * 创建人名字 - */ - @TableField(value="create_name") - @Schema(description="填报人名字") - @Size(max = 30,message = "填报人名字最大长度要小于 30") - @NotBlank(message = "填报人名字不能为空",groups = {Insert.class, Update.class}) - private String createName; - - /** - * 创建人时间 - */ - @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) - @NotNull(message = "填报时间不能为空") - @TableField(value="create_time") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date createTime; +// /** +// * 创建人Id +// */ +// @TableField(value="create_by") +// @Schema(description="填报人Id") +// @NotNull(message = "填报人Id不能为空",groups = {Insert.class, Update.class}) +// @JsonSerialize(using = ToStringSerializer.class) +// private Long createBy; +// +// /** +// * 创建人名字 +// */ +// @TableField(value="create_name") +// @Schema(description="填报人名字") +// @Size(max = 30,message = "填报人名字最大长度要小于 30") +// @NotBlank(message = "填报人名字不能为空",groups = {Insert.class, Update.class}) +// private String createName; +// +// /** +// * 创建人时间 +// */ +// @Schema(description="填报时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) +// @NotNull(message = "填报时间不能为空") +// @TableField(value="create_time") +// @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") +// private Date createTime; /** * 状态 @@ -121,30 +118,30 @@ public class SzTreatmentBasis implements Serializable { private String penalties; - /** - * 更新人Id - */ - @TableField(value="update_by") - @Schema(description="更新人Id") - @NotNull(message = "更新人Id不能为空",groups = {Insert.class, Update.class}) - @JsonSerialize(using = ToStringSerializer.class) - private Long updateBy; - - /** - * 更新人名字 - */ - @TableField(value="update_name") - @Schema(description="更新人名字") - @Size(max = 30,message = "更新人名字最大长度要小于 30") - private String updateName; - - /** - * 更新时间 - */ - @Schema(description="更新时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) - @TableField(value="update_time") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date updateTime; +// /** +// * 更新人Id +// */ +// @TableField(value="update_by") +// @Schema(description="更新人Id") +// @NotNull(message = "更新人Id不能为空",groups = {Insert.class, Update.class}) +// @JsonSerialize(using = ToStringSerializer.class) +// private Long updateBy; +// +// /** +// * 更新人名字 +// */ +// @TableField(value="update_name") +// @Schema(description="更新人名字") +// @Size(max = 30,message = "更新人名字最大长度要小于 30") +// private String updateName; +// +// /** +// * 更新时间 +// */ +// @Schema(description="更新时间 格式：" + DateFormatString.YYYY_MM_DD_HH_MM_SS) +// @TableField(value="update_time") +// @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") +// private Date updateTime; @TableField(exist = false)