|
|
@ -237,7 +237,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
JsonUtil.getObjectToString(bomPagination.getBomCode()) :
|
|
|
|
JsonUtil.getObjectToString(bomPagination.getBomCode()) :
|
|
|
|
String.valueOf(bomPagination.getBomCode());
|
|
|
|
String.valueOf(bomPagination.getBomCode());
|
|
|
|
// bomQueryWrapper.lambda().like(BomEntity::getBomCode,value);
|
|
|
|
// bomQueryWrapper.lambda().like(BomEntity::getBomCode,value);
|
|
|
|
bomQueryWrapper.like("t1.BOM_CODE",value);
|
|
|
|
bomQueryWrapper.like("a.BOM_CODE",value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(bomPagination.getProductName())){
|
|
|
|
if(ObjectUtil.isNotEmpty(bomPagination.getProductName())){
|
|
|
@ -246,7 +246,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
JsonUtil.getObjectToString(bomPagination.getProductName()) :
|
|
|
|
JsonUtil.getObjectToString(bomPagination.getProductName()) :
|
|
|
|
String.valueOf(bomPagination.getProductName());
|
|
|
|
String.valueOf(bomPagination.getProductName());
|
|
|
|
// bomQueryWrapper.lambda().like(BomEntity::getBomCode,value);
|
|
|
|
// bomQueryWrapper.lambda().like(BomEntity::getBomCode,value);
|
|
|
|
bomQueryWrapper.like("t4.NAME",value);
|
|
|
|
bomQueryWrapper.like("d.NAME",value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -257,13 +257,13 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
JsonUtil.getObjectToString(bomPagination.getBomName()) :
|
|
|
|
JsonUtil.getObjectToString(bomPagination.getBomName()) :
|
|
|
|
String.valueOf(bomPagination.getBomName());
|
|
|
|
String.valueOf(bomPagination.getBomName());
|
|
|
|
// bomQueryWrapper.lambda().like(BomEntity::getBomName,value);
|
|
|
|
// bomQueryWrapper.lambda().like(BomEntity::getBomName,value);
|
|
|
|
bomQueryWrapper.like("t1.BOM_NAME",value);
|
|
|
|
bomQueryWrapper.like("a.BOM_NAME",value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(bomPagination.getBomStatus())){
|
|
|
|
if(ObjectUtil.isNotEmpty(bomPagination.getBomStatus())){
|
|
|
|
bomNum++;
|
|
|
|
bomNum++;
|
|
|
|
// bomQueryWrapper.lambda().eq(BomEntity::getBomStatus,bomPagination.getBomStatus());
|
|
|
|
// bomQueryWrapper.lambda().eq(BomEntity::getBomStatus,bomPagination.getBomStatus());
|
|
|
|
bomQueryWrapper.eq("t1.BOM_STATUS",bomPagination.getBomStatus());
|
|
|
|
bomQueryWrapper.eq("a.BOM_STATUS",bomPagination.getBomStatus());
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -292,7 +292,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
intersection.add("jnpfNullList");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// bomQueryWrapper.lambda().in(BomEntity::getId, intersection);
|
|
|
|
// bomQueryWrapper.lambda().in(BomEntity::getId, intersection);
|
|
|
|
bomQueryWrapper.in("t1.id", intersection);
|
|
|
|
bomQueryWrapper.in("a.id", intersection);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//是否有高级查询
|
|
|
|
//是否有高级查询
|
|
|
|
if (StringUtil.isNotEmpty(superOp)){
|
|
|
|
if (StringUtil.isNotEmpty(superOp)){
|
|
|
@ -300,7 +300,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
allSuperIDlist.add("jnpfNullList");
|
|
|
|
allSuperIDlist.add("jnpfNullList");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<String> finalAllSuperIDlist = allSuperIDlist;
|
|
|
|
List<String> finalAllSuperIDlist = allSuperIDlist;
|
|
|
|
bomQueryWrapper.and(t->t.in("t1.id", finalAllSuperIDlist));
|
|
|
|
bomQueryWrapper.and(t->t.in("a.id", finalAllSuperIDlist));
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//是否有数据过滤查询
|
|
|
|
//是否有数据过滤查询
|
|
|
@ -309,15 +309,15 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
allRuleIDlist.add("jnpfNullList");
|
|
|
|
allRuleIDlist.add("jnpfNullList");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<String> finalAllRuleIDlist = allRuleIDlist;
|
|
|
|
List<String> finalAllRuleIDlist = allRuleIDlist;
|
|
|
|
bomQueryWrapper.and(t->t.in("t1.id", finalAllRuleIDlist));
|
|
|
|
bomQueryWrapper.and(t->t.in("a.id", finalAllRuleIDlist));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//假删除标志
|
|
|
|
//假删除标志
|
|
|
|
bomQueryWrapper.isNull("t1.f_delete_mark");
|
|
|
|
bomQueryWrapper.isNull("a.f_delete_mark");
|
|
|
|
|
|
|
|
|
|
|
|
//排序
|
|
|
|
//排序
|
|
|
|
if(StringUtil.isEmpty(bomPagination.getSidx())){
|
|
|
|
if(StringUtil.isEmpty(bomPagination.getSidx())){
|
|
|
|
// bomQueryWrapper.lambda().orderByDesc(BomEntity::getId);
|
|
|
|
// bomQueryWrapper.lambda().orderByDesc(BomEntity::getId);
|
|
|
|
bomPagination.setSidx("t1.f_creator_time");
|
|
|
|
bomPagination.setSidx("a.f_creator_time");
|
|
|
|
bomPagination.setSort("DESC");
|
|
|
|
bomPagination.setSort("DESC");
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
try {
|
|
|
|
try {
|
|
|
@ -328,7 +328,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
// bomQueryWrapper="asc".equals(bomPagination.getSort().toLowerCase())?bomQueryWrapper.orderByAsc(value):bomQueryWrapper.orderByDesc(value);
|
|
|
|
// bomQueryWrapper="asc".equals(bomPagination.getSort().toLowerCase())?bomQueryWrapper.orderByAsc(value):bomQueryWrapper.orderByDesc(value);
|
|
|
|
bomPagination.setSidx("t1." + value);
|
|
|
|
bomPagination.setSidx("a." + value);
|
|
|
|
|
|
|
|
|
|
|
|
} catch (NoSuchFieldException e) {
|
|
|
|
} catch (NoSuchFieldException e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
|