【CHG】修改日期返回格式

railway-business/src/main/java/com/railway/business/safetool/domain/SecExperiment.java

@@ -1,5 +1,6 @@
 package com.railway.business.safetool.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,12 +36,15 @@ public class SecExperiment extends BaseEntity{
     private Long schedledId;
 
     @ApiModelProperty(value = "截止时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
     @ApiModelProperty(value = "送检日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date scheduledTime;
 
     @ApiModelProperty(value = "送检日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expDate;
 
     @ApiModelProperty(value = "状态，0待实验，1已实验")
@@ -51,18 +55,4 @@ public class SecExperiment extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
-    public SecExperiment() {
-    }
-
 }

railway-business/src/main/java/com/railway/business/safetool/domain/SecExperimentTool.java

@@ -5,10 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotNull;
 /**
  * 送检记录工具表
  * @author lijie 2021-12-25
@@ -19,7 +16,7 @@ import javax.validation.constraints.NotNull;
 public class SecExperimentTool extends BaseEntity{
 
     @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
+    private Long id;
 
     @ApiModelProperty(value = "安全工具id")
     private Long toolId;
@@ -28,24 +25,10 @@ public class SecExperimentTool extends BaseEntity{
     private String isok;
 
     @ApiModelProperty(value = "送检记录id")
-    private Date expId;
+    private Long expId;
 
     @ApiModelProperty(value = "del_flag")
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
-    public SecExperimentTool() {
-    }
-
 }

railway-business/src/main/java/com/railway/business/safetool/domain/SecScheduled.java

@@ -1,5 +1,6 @@
 package com.railway.business.safetool.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +28,7 @@ public class SecScheduled extends BaseEntity {
   protected Long labId;
 
   @ApiModelProperty(value = "计划送检日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
   protected Date scheduledTime;
 
   @ApiModelProperty(value = "状态，0待送检，1已送检")

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecExpEndParmVo.java

@@ -2,10 +2,8 @@ package com.railway.business.safetool.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
 import java.io.Serializable;
-import java.util.List;
+import lombok.Data;
 
 /**
  * 完成实验
@@ -17,7 +15,7 @@ public class SecExpEndParmVo implements Serializable {
 
 
     @ApiModelProperty(value = "id")
-    private String id;
+    private Long id;
 
 
 }

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecExpListParmVo.java

@@ -14,12 +14,14 @@ import java.io.Serializable;
 @ApiModel("送检记录列表查询参数")
 public class SecExpListParmVo implements Serializable {
 
-    //用户所在单位
+    /**
+     * 用户所在单位
+     */
     @ApiModelProperty(value = "实验室ID")
     private String labId;
 
     @ApiModelProperty(value = "送检车间ID")
-    private String deptId;
+    private Long deptId;
 
     @ApiModelProperty(value = "排序ASC DESC")
     private String orderby;

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecExpNQParmVo.java

@@ -2,23 +2,22 @@ package com.railway.business.safetool.domain.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 /**
  * 实验不合格安全工具
+ *
  * @author lijie 2021-12-04
  */
 @Data
 @ApiModel("实验不合格安全工具")
 public class SecExpNQParmVo implements Serializable {
 
+  @ApiModelProperty(value = "id")
+  private Long id;
 
-    @ApiModelProperty(value = "id")
-    private String id;
-    @ApiModelProperty(value = "是否合格")
-    private String isok;
-
+  @ApiModelProperty(value = "是否合格")
+  private String isok;
 
 }

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecExpToolsVo.java

@@ -20,7 +20,7 @@ public class SecExpToolsVo implements Serializable {
     protected String toolCode;
 
     @ApiModelProperty(value = "id")
-    protected String id;
+    protected Long id;
 
     @ApiModelProperty(value = "是否合格")
     protected String isok;

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecScheduledToolDetailVo.java

@@ -1,5 +1,6 @@
 package com.railway.business.safetool.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -32,6 +33,7 @@ public class SecScheduledToolDetailVo implements Serializable {
   private String labName;
 
   @ApiModelProperty(value = "计划送检日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
   protected Date scheduledTime;
 
   @ApiModelProperty(value = "工具主键")

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecScheduledToolVo.java

@@ -24,7 +24,7 @@ public class SecScheduledToolVo implements Serializable {
   protected String toolCode;
 
   @ApiModelProperty(value = "id")
-  protected String id;
+  protected Long id;
 
   @ApiModelProperty(value = "名称")
   private String toolName;

railway-business/src/main/java/com/railway/business/safetool/mapper/SecExperimentToolMapper.java

@@ -24,7 +24,7 @@ public interface SecExperimentToolMapper {
     /**
     * 删除
     */
-    int delete(@Param("id") String id);
+    int delete(@Param("id") Long id);
 
     /**
     * 更新
@@ -34,7 +34,7 @@ public interface SecExperimentToolMapper {
     /**
     * 获取单个
     */
-    SecExperimentTool getInfo(@Param("id") String id);
+    SecExperimentTool getInfo(@Param("id") Long id);
 
     /**
     * 查询列表

railway-business/src/main/java/com/railway/business/safetool/service/ISecExperimentToolService.java

@@ -19,7 +19,7 @@ public interface ISecExperimentToolService{
     /**
     * 删除
     */
-    int delete(String[] ids);
+    int delete(Long[] ids);
 
     /**
     * 更新
@@ -29,7 +29,7 @@ public interface ISecExperimentToolService{
     /**
     * 获取单个
     */
-    SecExperimentTool getInfo(String id);
+    SecExperimentTool getInfo(Long id);
 
     /**
     * 查询列表

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentToolServiceImpl.java

@@ -38,9 +38,9 @@ public class SecExperimentToolServiceImpl implements ISecExperimentToolService {
 	* 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
+	public int delete(Long[] ids) {
 		int r =0;
-		for (String id : ids) {
+		for (Long id : ids) {
 			int j= secExperimentToolMapper.delete(id);
 			r = r + j;
 		}
@@ -62,7 +62,7 @@ public class SecExperimentToolServiceImpl implements ISecExperimentToolService {
 	* 获取单个
 	*/
 	@Override
-	public SecExperimentTool getInfo(String id) {
+	public SecExperimentTool getInfo(Long id) {
 		return secExperimentToolMapper.getInfo(id);
 	}