licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加为空判断，防止其他界面调用时出错

Browse Source
This commit is contained in:
think 2025-01-14 13:44:37 +08:00
parent ce8aa43d07
commit a41df38db2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
View File

@ -77,12 +77,15 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
/*if(reqVO.getUncompletedDesign() != null && reqVO.getUncompletedDesign()){ /*if(reqVO.getUncompletedDesign() != null && reqVO.getUncompletedDesign()){
query.and(QueryWrapper -> QueryWrapper.apply("COALESCE(z.progress, 0) < {0}", 100).ne(PlanDO::getStatus, ProjectPlanStatusEnum.TERMINATE.getCode())); query.and(QueryWrapper -> QueryWrapper.apply("COALESCE(z.progress, 0) < {0}", 100).ne(PlanDO::getStatus, ProjectPlanStatusEnum.TERMINATE.getCode()));
}*/ }*/
if(reqVO.getPgType()==0){ if(reqVO.getPgType() != null){
query.and(QueryWrapper -> QueryWrapper.apply("z.progress < {0}" , 100).or().apply("z.progress is null")); if(reqVO.getPgType()==0){
}else{ query.and(QueryWrapper -> QueryWrapper.apply("z.progress < {0}" , 100).or().apply("z.progress is null"));
query.and(QueryWrapper -> QueryWrapper.apply("z.progress >= {0}" , 100)); }else{
query.and(QueryWrapper -> QueryWrapper.apply("z.progress >= {0}" , 100));
}
} }
return selectPage(reqVO, query); return selectPage(reqVO, query);
} }