yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

责任人表、培训计划表、培训记录表、案件登记表，制度管理表、处理依据表、法律法规管理表新增接口，修改接口,数据库字段调整

master
徐杰盟 2024-09-25 11:36:12 +08:00
parent 9e28c3d780
commit c97b089ce7
13 changed files with 166 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java
View File

@ -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());

6
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
View File

@ -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()));

7
src/main/java/com/gunshi/project/xyt/controller/ResPersonController.java
View File

@ -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);
}

4
src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
View File

@ -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){

6
src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java
View File

@ -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) {

2
src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java
View File

@ -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);

3
src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java
View File

@ -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);

4
src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java
View File

@ -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;

4
src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java
View File

@ -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;

50
src/main/java/com/gunshi/project/xyt/model/SzCase.java
View File

@ -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;
/**
* 案件编号

107
src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java
View File

@ -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)

2
src/main/java/com/gunshi/project/xyt/model/SzRuleByLaw.java
View File

@ -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")

105
src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java
View File

@ -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)