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

08-21-修复合规性手续搜索

Browse Source
This commit is contained in:
青云
2025-08-21 19:52:58 +08:00
parent ba58be3857
commit f7870182ba
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
View File

@ -104,7 +104,8 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
lqw.eq(bo.getPlanTheStartTime() != null, BusFormalitiesAreConsolidated::getPlanTheStartTime, bo.getPlanTheStartTime()); lqw.eq(bo.getPlanTheStartTime() != null, BusFormalitiesAreConsolidated::getPlanTheStartTime, bo.getPlanTheStartTime());
lqw.eq(StringUtils.isNotBlank(bo.getHead()), BusFormalitiesAreConsolidated::getHead, bo.getHead()); lqw.eq(StringUtils.isNotBlank(bo.getHead()), BusFormalitiesAreConsolidated::getHead, bo.getHead());
// lqw.eq(bo.getActualCompletionTime() != null, BusFormalitiesAreConsolidated::getActualCompletionTime, bo.getActualCompletionTime()); // lqw.eq(bo.getActualCompletionTime() != null, BusFormalitiesAreConsolidated::getActualCompletionTime, bo.getActualCompletionTime());
lqw.apply(bo.getActualCompletionTime() != null,"DATE_FORMAT(actual_completion_time,'%Y-%m-%d')"); // lqw.apply(bo.getActualCompletionTime() != null,"DATE_FORMAT(actual_completion_time,'%Y-%m-%d')");
lqw.apply(bo.getActualCompletionTime() != null, "DATE_FORMAT(actual_completion_time,'%Y-%m-%d') = '" + bo.getActualCompletionTime() + "'");
lqw.eq(StringUtils.isNotBlank(bo.getProcessingStatus()), BusFormalitiesAreConsolidated::getProcessingStatus, bo.getProcessingStatus()); lqw.eq(StringUtils.isNotBlank(bo.getProcessingStatus()), BusFormalitiesAreConsolidated::getProcessingStatus, bo.getProcessingStatus());
return lqw; return lqw;
} }

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/utils/TreeUtil.java
View File

@ -61,6 +61,9 @@ public class TreeUtil {
setChildren1(node, list); setChildren1(node, list);
} }
} }
if (result.isEmpty()){
return list;
}
return result; return result;
} }