Переглянути джерело

feature 解决人员没有去重的问题

xiahan 1 рік тому
батько
коміт
fc18d8fb8d

+ 8 - 3
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationPlanServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.rongwei.safecommon.utils.CXCommonUtils.streamCodeGeneration;
 
@@ -323,11 +324,15 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
         equLubricationTaskManagementDo.setEquipment(equLubricationPlanDo.getEquipment());
         equLubricationTaskManagementDo.setEquipmentnumber(equLubricationPlanDo.getEquipmentnumber());
         equLubricationTaskManagementDo.setLubricator(equLubricationTaskDetailDos.stream()
-                .map(EquLubricationPlanDetailDo::getLubricator).distinct().collect(Collectors.joining(",")));
+                .map(info->info.getLubricator().split(","))
+                .flatMap(Arrays::stream)
+               .distinct().collect(Collectors.joining(",")));
 //        equLubricationTaskManagementDo.setCompletedate();
         equLubricationTaskManagementDo.setTaskstatus(TASK_STATUS_TO_BE_COMPLETED);
-        equLubricationTaskManagementDo.setLubricatorid(equLubricationTaskDetailDos.stream().
-                map(EquLubricationPlanDetailDo::getLubricatorid).distinct().collect(Collectors.joining(",")));
+        equLubricationTaskManagementDo.setLubricatorid(equLubricationTaskDetailDos.stream()
+                .map(info->info.getLubricatorid().split(","))
+                .flatMap(Arrays::stream)
+               .distinct().collect(Collectors.joining(",")));
         equLubricationTaskManagementDo.setEquipmentid(equLubricationPlanDo.getEquipmentid());
         equLubricationTaskManagementDo.setEquipmentworkshopid(equLubricationPlanDo.getEquipmentworkshopid());
         equLubricationTaskManagementDo.setEquipmentworkshop(equLubricationPlanDo.getEquipmentworkshop());