ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 项目库-未符合项

Browse Source
This commit is contained in:
lijiarao
2023-11-28 18:06:28 +08:00
parent 0cbfaa8d2b
commit 19cc74ae4c
2 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+3 -3
View File
@@ -63,7 +63,7 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
@PostMapping(value = "/add")
public Result<T> 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<LawsEvaluatio
@PostMapping(value = "/edit")
public Result<T> 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<LawsEvaluatio
throw new JeroBootException(ResultCommon.CANNOT_CLOSE);
}
lawsEvaluationNotMetService.batchClose(ids);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
return Result.OK(ResultCommon.OK);
}
private boolean check(List<String> ids) {
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
+24 -30
View File
@@ -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;
}