From b3070afd8c427223fa661513c523aea06ce4bbcf Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 22 十一月 2024 15:13:46 +0800
Subject: [PATCH] 项目计划初始化
---
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 23 ++++++-----
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 6 +--
business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java | 4 -
business/src/main/java/com/ycl/domain/entity/ProjectPlanExamineRecord.java | 13 +++++-
business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java | 3 -
business/src/main/java/com/ycl/domain/vo/ProjectPlanExamineRecordVO.java | 17 ++++++--
business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml | 6 +++
business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java | 22 +++++++----
business/src/main/java/com/ycl/domain/query/ProjectPlanExamineRecordQuery.java | 6 ++
9 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
index 5aadef2..3c36314 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -1,20 +1,21 @@
package com.ycl.controller;
-import com.ycl.common.base.Result;
-import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
-import com.ycl.domain.form.ProjectPlanExamineRecordForm;
-import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
-import com.ycl.service.ProjectPlanExamineRecordService;
+import com.ycl.common.group.Add;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import com.ycl.service.ProjectPlanExamineRecordService;
+import com.ycl.common.base.Result;
+import com.ycl.domain.form.ProjectPlanExamineRecordForm;
+import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
/**
* 椤圭洰瀹℃牳璁板綍琛� 鍓嶇鎺у埗鍣�
@@ -26,7 +27,7 @@
@RequiredArgsConstructor
@Api(value = "椤圭洰瀹℃牳璁板綍琛�", tags = "椤圭洰瀹℃牳璁板綍琛ㄧ鐞�")
@RestController
-@RequestMapping("/api/project-plan-examine-record")
+@RequestMapping("/project-plan-examine-record")
public class ProjectPlanExamineRecordController {
private final ProjectPlanExamineRecordService projectPlanExamineRecordService;
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectPlanExamineRecord.java b/business/src/main/java/com/ycl/domain/entity/ProjectPlanExamineRecord.java
index 9f6c861..67bce8a 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanExamineRecord.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectPlanExamineRecord.java
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.time.LocalDateTime;
-
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
+
+import java.time.LocalDateTime;
/**
* 椤圭洰瀹℃牳璁板綍琛�
@@ -68,5 +67,13 @@
/** 寤舵湡缁撴潫鏃堕棿 */
private LocalDateTime delayEndTime;
+ @TableField("gmt_create_time")
+ /** 鍒涘缓鏃堕棿 */
+ private LocalDateTime gmtCreateTime;
+
+ @TableField("gmt_update_time")
+ /** 淇敼鏃堕棿 */
+ private LocalDateTime gmtUpdateTime;
+
}
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java b/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java
index f792303..4ba11d6 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java
@@ -1,18 +1,16 @@
package com.ycl.domain.form;
-
-import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
-import com.ycl.domain.entity.ProjectPlanExamineRecord;
+import com.ycl.common.group.Add;
import com.ycl.system.domain.base.AbsForm;
+import com.ycl.domain.entity.ProjectPlanExamineRecord;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.beans.BeanUtils;
-import org.springframework.lang.NonNull;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -73,6 +71,14 @@
@ApiModelProperty("寤舵湡缁撴潫鏃堕棿")
private Date delayEndTime;
+ @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private Date gmtCreateTime;
+
+ @NotNull(message = "淇敼鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("淇敼鏃堕棿")
+ private Date gmtUpdateTime;
+
public static ProjectPlanExamineRecord getEntityByForm(@NonNull ProjectPlanExamineRecordForm form, ProjectPlanExamineRecord entity) {
if(entity == null) {
entity = new ProjectPlanExamineRecord();
diff --git a/business/src/main/java/com/ycl/domain/query/ProjectPlanExamineRecordQuery.java b/business/src/main/java/com/ycl/domain/query/ProjectPlanExamineRecordQuery.java
index 6b56c46..255c5a2 100644
--- a/business/src/main/java/com/ycl/domain/query/ProjectPlanExamineRecordQuery.java
+++ b/business/src/main/java/com/ycl/domain/query/ProjectPlanExamineRecordQuery.java
@@ -1,8 +1,12 @@
package com.ycl.domain.query;
-
import com.ycl.system.domain.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectPlanExamineRecordVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectPlanExamineRecordVO.java
index f8eab36..8cdcc4f 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectPlanExamineRecordVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectPlanExamineRecordVO.java
@@ -1,14 +1,13 @@
package com.ycl.domain.vo;
-
-import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.system.domain.base.AbsVo;
+import com.ycl.domain.entity.ProjectPlanExamineRecord;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.beans.BeanUtils;
-import org.springframework.lang.NonNull;
-
import java.util.Date;
/**
@@ -69,6 +68,14 @@
@ApiModelProperty("寤舵湡缁撴潫鏃堕棿")
private Date delayEndTime;
+ /** 鍒涘缓鏃堕棿 */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private Date gmtCreateTime;
+
+ /** 淇敼鏃堕棿 */
+ @ApiModelProperty("淇敼鏃堕棿")
+ private Date gmtUpdateTime;
+
public static ProjectPlanExamineRecordVO getVoByEntity(@NonNull ProjectPlanExamineRecord entity, ProjectPlanExamineRecordVO vo) {
if(vo == null) {
vo = new ProjectPlanExamineRecordVO();
diff --git a/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java b/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
index 3a8736d..80ab560 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
@@ -3,10 +3,8 @@
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
import com.ycl.domain.vo.ProjectPlanExamineRecordVO;
-import com.ycl.domain.form.ProjectPlanExamineRecordForm;
-import java.util.List;
+import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java b/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
index 85ff607..c2018d1 100644
--- a/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
+++ b/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
@@ -1,11 +1,10 @@
package com.ycl.service;
+import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.common.base.Result;
-import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.form.ProjectPlanExamineRecordForm;
import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
-
import java.util.List;
/**
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
index 5f124ab..9ad060e 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -1,19 +1,17 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.common.base.Result;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
-import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.service.ProjectPlanExamineRecordService;
-
+import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.domain.form.ProjectPlanExamineRecordForm;
import com.ycl.domain.vo.ProjectPlanExamineRecordVO;
import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
-
+import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index 2e4cb87..b9469a5 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
@@ -16,6 +16,8 @@
<result column="event_type" property="eventType" />
<result column="delay_start_time" property="delayStartTime" />
<result column="delay_end_time" property="delayEndTime" />
+ <result column="gmt_create_time" property="gmtCreateTime" />
+ <result column="gmt_update_time" property="gmtUpdateTime" />
</resultMap>
@@ -38,6 +40,8 @@
TPPER.event_type,
TPPER.delay_start_time,
TPPER.delay_end_time,
+ TPPER.gmt_create_time,
+ TPPER.gmt_update_time,
TPPER.id
FROM
t_project_plan_examine_record TPPER
@@ -60,6 +64,8 @@
TPPER.event_type,
TPPER.delay_start_time,
TPPER.delay_end_time,
+ TPPER.gmt_create_time,
+ TPPER.gmt_update_time,
TPPER.id
FROM
t_project_plan_examine_record TPPER
--
Gitblit v1.8.0