lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改展示

Browse Source
This commit is contained in:
lcj
2025-03-18 17:29:23 +08:00
parent 52c8ab0f20
commit f645df71ba
32 changed files with 261 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
View File

@ -95,4 +95,10 @@ public class BusMachineryDetailVo implements Serializable {
@ExcelProperty(value = "机械主键id")
private Long machineryId;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java
View File

@ -8,6 +8,7 @@ import org.dromara.machinery.domain.BusMachinery;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@ -66,5 +67,10 @@ public class BusMachineryVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java
View File

@ -10,7 +10,7 @@ import org.dromara.materials.domain.BusCompany;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@ -64,5 +64,10 @@ public class BusCompanyVo implements Serializable {
@ExcelProperty(value = "资质情况")
private String qualification;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
View File

@ -114,5 +114,10 @@ public class BusMaterialsInventoryVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.materials.domain.BusMaterials;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
@ -99,5 +100,10 @@ public class BusMaterialsVo implements Serializable {
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
private String status;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.project.domain.BusConstructionUser;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@ -238,5 +239,10 @@ public class BusConstructionUserVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java
View File

@ -8,6 +8,7 @@ import org.dromara.project.domain.BusContractor;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
@ -73,5 +74,10 @@ public class BusContractorVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.project.domain.BusProjectTeamMember;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@ -69,5 +70,10 @@ public class BusProjectTeamMemberVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java
View File

@ -61,5 +61,10 @@ public class BusProjectTeamVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.project.domain.BusProject;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@ -156,4 +157,10 @@ public class BusProjectVo implements Serializable {
@ExcelDictFormat(readConverterExp = "1=显示,2=隐藏")
private String showHidden;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusUserProjectRelevancyVo.java
View File

@ -8,6 +8,7 @@ import org.dromara.project.domain.BusUserProjectRelevancy;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@ -48,4 +49,10 @@ public class BusUserProjectRelevancyVo implements Serializable {
@ExcelProperty(value = "项目详情")
private BusProjectVo project;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

13
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
View File

@ -100,7 +100,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
BusProject project = new BusProject();
BeanUtils.copyProperties(dto, project);
// 数据校验
validEntityBeforeSave(project);
validEntityBeforeSave(project, true);
// 写入数据库
boolean save = this.save(project);
if (!save) {
@ -136,7 +136,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
BusProject project = new BusProject();
BeanUtils.copyProperties(req, project);
// 数据校验
validEntityBeforeSave(project);
validEntityBeforeSave(project, false);
// 权限校验
validPermission(project);
// 判断是否存在
@ -151,11 +151,14 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BusProject entity) {
private void validEntityBeforeSave(BusProject entity, Boolean create) {
// TODO 做一些数据校验,如唯一约束
String projectName = entity.getProjectName();
if (StringUtils.isBlank(projectName)) {
throw new ServiceException("项目名称不能为空", HttpStatus.BAD_REQUEST);
// 新增项目参数验证
if (create) {
if (StringUtils.isBlank(projectName)) {
throw new ServiceException("项目名称不能为空", HttpStatus.BAD_REQUEST);
}
}
}