|
|
@@ -1232,16 +1232,13 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
|
procedureTotals = planProcedureTotalService.list(
|
|
|
new LambdaQueryWrapper<PlanProcedureTotal>()
|
|
|
.eq(PlanProcedureTotal::getPlanId, plan.getId())
|
|
|
- .and(wrapper -> wrapper.eq(PlanProcedureTotal::getIsTransfer, 0)
|
|
|
- .or()
|
|
|
- .eq(PlanProcedureTotal::getIsTransfer, 1)
|
|
|
- .eq(PlanProcedureTotal::getStationId, userSelect.getDepartmentId())
|
|
|
- )
|
|
|
+ .eq(PlanProcedureTotal::getStationId,userSelect.getDepartmentId())
|
|
|
);
|
|
|
}
|
|
|
//看其他工位的
|
|
|
else if (stationType==1){
|
|
|
- procedureTotals = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().eq("plan_id", plan.getId()).eq("is_transfer", 1)
|
|
|
+ procedureTotals = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>()
|
|
|
+ .eq("plan_id", plan.getId())
|
|
|
.ne("station_id", userSelect.getDepartmentId()));
|
|
|
}
|
|
|
//全部
|
yusm