ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2025-01-14 16:11:03 +08:00
parent f3a48ca345 3f6af65763
commit d44b511988
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
View File

@@ -55,8 +55,8 @@ public class PqDevParam {
private String manufacturer; private String manufacturer;
@ApiModelProperty(value = "出厂日期", required = true) @ApiModelProperty(value = "出厂日期", required = true)
@NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL) //@NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
@DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR) //@DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
private String createDate; private String createDate;
@ApiModelProperty(value = "设备序列号", required = true) @ApiModelProperty(value = "设备序列号", required = true)
@@ -190,7 +190,7 @@ public class PqDevParam {
private String manufacturer; private String manufacturer;
@ApiModelProperty("检测计划ID") @ApiModelProperty("检测计划ID")
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR) //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR)
private String planId; private String planId;
@ApiModelProperty("检测状态列表") @ApiModelProperty("检测状态列表")

5
device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
View File

@@ -249,8 +249,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
@Override @Override
public List<PqDev> listByPlanId(PqDevParam.QueryParam param) { public List<PqDev> listByPlanId(PqDevParam.QueryParam param) {
if(StrUtil.isBlank(param.getPlanId())){
return Collections.emptyList();
}
List<PqDev> pqDevList = this.lambdaQuery() List<PqDev> pqDevList = this.lambdaQuery()
.eq(StrUtil.isNotBlank(param.getPlanId()), PqDev::getPlanId, param.getPlanId()) .eq(PqDev::getPlanId, param.getPlanId())
.like(StrUtil.isNotBlank(param.getName()), PqDev::getName, param.getName()) .like(StrUtil.isNotBlank(param.getName()), PqDev::getName, param.getName())
.in(ObjectUtil.isNotEmpty(param.getCheckStateList()), PqDev::getCheckState, param.getCheckStateList()) .in(ObjectUtil.isNotEmpty(param.getCheckStateList()), PqDev::getCheckState, param.getCheckStateList())
.eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult()) .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())