|
|
@@ -301,7 +301,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
301
|
301
|
String depotId = object.optString("depotId");
|
|
302
|
302
|
|
|
303
|
303
|
if("" != equipmentId+"" && equipmentId != 0){
|
|
304
|
|
- ew.eq("equipment_id", equipmentId);
|
|
|
304
|
+ //ew.eq("equipment_id", equipmentId);
|
|
|
305
|
+ ew.and(x -> x.eq("equipment_id", equipmentId).eq("result", 1).or().eq("equipment_id", equipmentId).eq("result", 2));
|
|
305
|
306
|
}else{
|
|
306
|
307
|
if (StringUtils.isNotBlank(type)) {
|
|
307
|
308
|
if(type.equals("xz") || type.equals("sswx") || type.equals("sbly")){
|