DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-05-18 17:54:21 +08:00
parent 1bd55b12ec d50bbb1ce3
commit 61291891d7
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java
View File

@@ -79,6 +79,8 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService {
lqw.eq(bo.getP() != null, QcChemicalItem::getP, bo.getP()); lqw.eq(bo.getP() != null, QcChemicalItem::getP, bo.getP());
lqw.eq(bo.getS() != null, QcChemicalItem::getS, bo.getS()); lqw.eq(bo.getS() != null, QcChemicalItem::getS, bo.getS());
lqw.eq(bo.getAls() != null, QcChemicalItem::getAls, bo.getAls()); lqw.eq(bo.getAls() != null, QcChemicalItem::getAls, bo.getAls());
// 根据创建时间倒叙
lqw.orderByDesc(QcChemicalItem::getCreateTime);
return lqw; return lqw;
} }

2
klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java
View File

@@ -80,6 +80,8 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService {
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcPhysicalItem::getSurfaceQuality, bo.getSurfaceQuality()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcPhysicalItem::getSurfaceQuality, bo.getSurfaceQuality());
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcPhysicalItem::getSurfaceStructure, bo.getSurfaceStructure()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcPhysicalItem::getSurfaceStructure, bo.getSurfaceStructure());
lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcPhysicalItem::getEdgeStatus, bo.getEdgeStatus()); lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcPhysicalItem::getEdgeStatus, bo.getEdgeStatus());
// 根据创建时间倒叙
lqw.orderByDesc(QcPhysicalItem::getCreateTime);
return lqw; return lqw;
} }