|
|
@@ -342,10 +342,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
|
}
|
|
|
List<ProdProcedure> procedureList = prodProcedureMapper.selectList(
|
|
|
new QueryWrapper<ProdProcedure>()
|
|
|
- .select("DISTINCT version_number")
|
|
|
.lambda()
|
|
|
.eq(plan.getProductId() != null, ProdProcedure::getProductId, plan.getProductId())
|
|
|
- .eq(user.getCompanyId()!=null,ProdProcedure::getCompanyId,user.getCompanyId()).orderByAsc(ProdProcedure::getSeq)
|
|
|
+ .eq(user.getCompanyId()!=null,ProdProcedure::getCompanyId,user.getCompanyId()).groupBy(ProdProcedure::getVersionNumber).orderByAsc(ProdProcedure::getSeq)
|
|
|
|
|
|
);
|
|
|
if(plan.getPlanType()==0){
|
Min