From 19cc74ae4cbfb172e28e86629cc424c0051cb758 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 28 Nov 2023 18:06:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsEvaluationNotMetController.java | 6 +-- .../entity/LawsEvaluationNotMet.java | 54 +++++++++---------- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java index d1c185e4..06f3596c 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java @@ -63,7 +63,7 @@ public class LawsEvaluationNotMetController extends JeroController add(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) { lawsEvaluationNotMetService.add(lawsEvaluationNotMet); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + return Result.OK(ResultCommon.OK); } /** @@ -74,7 +74,7 @@ public class LawsEvaluationNotMetController extends JeroController edit(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) { lawsEvaluationNotMetService.editById(lawsEvaluationNotMet); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + return Result.OK(ResultCommon.OK); } @@ -109,7 +109,7 @@ public class LawsEvaluationNotMetController extends JeroController ids) { diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java index c896dc7f..faabcdf8 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java @@ -3,9 +3,7 @@ package com.jero.modules.projectLibrary.entity; import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -36,30 +34,26 @@ public class LawsEvaluationNotMet implements Serializable { @ApiModelProperty(value = "主键") private String id; - /**标准ID*/ - @Excel(name = "标准ID", width = 15) - @ApiModelProperty(value = "标准ID") - private String standardId; + /**项目ID*/ + @Excel(name = "工作令编号", width = 15, dictTable = "laws_project_library", dicText = "work_number", dicCode = "id") + @Dict(dictTable = "laws_project_library", dicText = "work_number", dicCode = "id") + @ApiModelProperty(value = "项目ID") + private String projectId; + + /**项目名称*/ + @Excel(name = "项目名称", width = 15) + @ApiModelProperty(value = "项目名称") + private String projectName; /**标准编号*/ @Excel(name = "标准编号", width = 15) @ApiModelProperty(value = "标准编号") private String standardNumber; - /**项目ID*/ - @Excel(name = "项目ID", width = 15) - @ApiModelProperty(value = "项目ID") - private String projectId; - - /**项目名称*/ - @Excel(name = "项目名称", width = 15) - @ApiModelProperty(value = "项目名称") - private String projectName; - - /**条款ID*/ - @Excel(name = "条款ID", width = 15) - @ApiModelProperty(value = "条款ID") - private String termId; + /**标准名称*/ + @Excel(name = "标准名称", width = 15) + @ApiModelProperty(value = "标准名称") + private String standardName; /**条款号*/ @Excel(name = "条款号", width = 15) @@ -72,20 +66,17 @@ public class LawsEvaluationNotMet implements Serializable { private String termName; /**责任部门ID*/ - @Excel(name = "责任部门ID", width = 15) + @Excel(name = "责任部门ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @ApiModelProperty(value = "责任部门ID") private String departmentId; /**设计工程师ID*/ - @Excel(name = "设计工程师ID", width = 15) + @Excel(name = "设计工程师", width = 15, dictTable = "sys_user",dicText = "realname",dicCode = "id") + @Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id") @ApiModelProperty(value = "设计工程师ID") private String engineerId; - /**设计工程师名字*/ - @Excel(name = "设计工程师名字", width = 15) - @ApiModelProperty(value = "设计工程师名字") - private String engineerName; - /**预计整改完成日期*/ @Excel(name = "预计整改完成日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @@ -102,7 +93,7 @@ public class LawsEvaluationNotMet implements Serializable { /**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/ @Dict(dicCode = "assess_rectification") - @Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成、5-已关闭)", width = 15) + @Excel(name = "整改状态", width = 15, dicCode = "assess_rectification") @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成、5-已关闭)") private String state; @@ -127,12 +118,15 @@ public class LawsEvaluationNotMet implements Serializable { private Date updateTime; /**所属部门*/ - @Excel(name = "所属部门", width = 15) @ApiModelProperty(value = "所属部门") private String orgCode; /**预计整改完成日期范围*/ + @TableField(exist = false) @ApiModelProperty(value = "预计整改完成日期范围") private String expectedTimeRange; + + @TableLogic + private Integer delFlag; }