|
|
|
|
@ -11,6 +11,7 @@ import org.springblade.core.mp.support.Query; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.desk.basic.constant.BaseCol; |
|
|
|
|
import org.springblade.desk.basic.service.IPlatingService; |
|
|
|
|
import org.springblade.desk.quality.constant.CycleTestTaskConst; |
|
|
|
|
import org.springblade.desk.quality.mapper.CycleTestMapper; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.CycleTest; |
|
|
|
|
@ -50,6 +51,10 @@ public class CycleTestService2 { |
|
|
|
|
private ICycleTestStandardService standardService; |
|
|
|
|
@Resource |
|
|
|
|
private CycleTestStandardService2 standardService2; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private IPlatingService platingService; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private IUserClient userClient; |
|
|
|
|
@Resource |
|
|
|
|
@ -184,5 +189,15 @@ public class CycleTestService2 { |
|
|
|
|
CycleTestTaskConst.DICT_TEST_PIECE, |
|
|
|
|
"" + vo.getTestType()).getData() |
|
|
|
|
); |
|
|
|
|
// 多个 镀种名称
|
|
|
|
|
{ |
|
|
|
|
StringBuilder names = new StringBuilder(); |
|
|
|
|
List<Long> idList = Func.toLongList(vo.getPlateIds()); |
|
|
|
|
idList.forEach(id -> { |
|
|
|
|
names.append(platingService.getById(id).getPlating()); |
|
|
|
|
names.append(","); |
|
|
|
|
}); |
|
|
|
|
vo.setPlateNames(names.toString()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|