设备之系统——保养检修 V3 OPT

注解完善
变量名优化
格式代码

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -75,12 +75,12 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
     @Override
     @Transactional
-    public R saveTask(TaskCreatorDTO taskCreator){
+    public R saveTask(TaskCreatorDTO taskCreator) {
         // 查询主表信息
         EquMaintenanceScheduleDo maintenanceSchedule = maintenanceScheduleService.getMaintenanceSiteByList(taskCreator);
         // 查询子表信息
         Integer month = Integer.parseInt(taskCreator.getMonth());
-        List<EquMaintenancePartDo> maintenancePartList = maintenancePartService.getMasterIdAndMonthByList(maintenanceSchedule.getId(), month,null);
+        List<EquMaintenancePartDo> maintenancePartList = maintenancePartService.getMasterIdAndMonthByList(maintenanceSchedule.getId(), month, null);
         // 查询是否有生成过任务
         List<EquMaintenanceTaskDo> maintenanceSiteList = maintenanceTaskService.getMaintenanceSite(taskCreator);
         // 判断所有部位是否都有生成过任务
@@ -95,18 +95,18 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         // 通过主表ID查询备品备件信息
         List<EquPartsSetoutStandardDo> partsSetoutStandardList = partsSetoutStandardService.getMasterIdByList(maintenancePartList.stream().map(EquMaintenancePartDo::getMaintenancestandid).collect(Collectors.toList()));
         // 转移数据
-        List<EquMaintenanceTaskDo> equMaintenanceTaskDos = dataTransfer(maintenancePartList, maintenanceSchedule,month);
+        List<EquMaintenanceTaskDo> equMaintenanceTaskDos = dataTransfer(maintenancePartList, maintenanceSchedule, month);
         List<EquPartsSetoutTaskDo> partsSetoutTaskDoList = sparePartsConversion(partsSetoutStandardList, equMaintenanceTaskDos);
         // 插入
         int number = maintenanceTaskService.insertBatch(equMaintenanceTaskDos);
-        if(partsSetoutTaskDoList.size()!=0){
+        if (partsSetoutTaskDoList.size() != 0) {
             partsSetoutTaskService.batchSave(partsSetoutTaskDoList);
         }
         maintenanceScheduleService.updatePlannedstatusByIds(Collections.singletonList(maintenanceSchedule.getId()), PlannedStatusEnum.PUBLISHED_TASK);
         // 判断是否全部插入成功
-        if (number == equMaintenanceTaskDos.size()){
+        if (number == equMaintenanceTaskDos.size()) {
             return R.ok();
-        }else {
+        } else {
             return R.ok("数据添加不完整,请核对数据!");
         }
     }
@@ -118,39 +118,38 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * @return {@link R}
      * @date 2023/11/29 14:01
      * @author shangmi
-     *
      */
     @Override
     @Transactional
     public R batchSavePlans(BatchCreateDTO batchCreate) {
-        //该设备分类下的所以部位保养标准
+        // 该设备分类下的所以部位保养标准
         List<EquMaintenanceStandardDo> partsSetoutStandardList = maintenanceStandardService.getPlanTypeByList(batchCreate.getEquipmentId());
-        if(partsSetoutStandardList.size()==0){
+        if (partsSetoutStandardList.size() == 0) {
             return R.error("选中的设备没有保养标准！");
         }
-        //明细表数组
+        // 明细表数组
         List<EquMaintenancePartDo> equMaintenancePartList = new ArrayList<>();
 
-        //获取设备ID并拆分
+        // 获取设备ID并拆分
         List<String> equipmentId = Arrays.asList(batchCreate.getEquipmentId().split(","));
-        //设备计划数组
-        List<EquMaintenanceScheduleDo> maintenancePartList = maintenanceScheduleService.getYearAndEquipmentByList(equipmentId,batchCreate);
+        // 设备计划数组
+        List<EquMaintenanceScheduleDo> maintenancePartList = maintenanceScheduleService.getYearAndEquipmentByList(equipmentId, batchCreate);
         List<EquMaintenanceScheduleDo> maintenanceScheduleDos = new ArrayList<>();
-        if (maintenancePartList.size()!=0){
+        if (maintenancePartList.size() != 0) {
             maintenanceScheduleDos = maintenancePartList.stream().filter(info ->
                     equipmentId.contains(info.getEquipmentid())
             ).collect(Collectors.toList());
         }
-        //判断是否选中的设备以全部生成
-        if (equipmentId.size()==maintenanceScheduleDos.size()){
-            return R.error("选中的设备已全部生成过"+batchCreate.getYear()+"年的保养计划，请勿重复生成！");
+        // 判断是否选中的设备以全部生成
+        if (equipmentId.size() == maintenanceScheduleDos.size()) {
+            return R.error("选中的设备已全部生成过" + batchCreate.getYear() + "年的保养计划，请勿重复生成！");
         }
-        //如果有重复则添加警告
+        // 如果有重复则添加警告
         StringBuilder wrongData = new StringBuilder();
-        if (maintenanceScheduleDos.size()!=0){
-            for (int i=0;i<maintenanceScheduleDos.size();i++){
+        if (maintenanceScheduleDos.size() != 0) {
+            for (int i = 0; i < maintenanceScheduleDos.size(); i++) {
                 wrongData.append(maintenanceScheduleDos.get(i).getEquipmentname());
-                if (i!=maintenanceScheduleDos.size()-1){
+                if (i != maintenanceScheduleDos.size() - 1) {
                     wrongData.append("、");
                 }
             }
@@ -158,16 +157,16 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         }
         List<AspCheckItems> aspCheckItems = new ArrayList<>(aspCheckItemsService.listByIds(equipmentId));
         List<EquMaintenanceScheduleDo> maintenanceScheduleList = aspCheckItems.stream().map(info -> {
-            //数据转换（设备——计划）
+            // 数据转换（设备——计划）
             EquMaintenanceScheduleDo maintenanceScheduleDo = dataShiftFacilityToPlan(info, batchCreate.getYear());
-            equMaintenancePartList.addAll(dataShiftSpareStandToPlan(partsSetoutStandardList,maintenanceScheduleDo.getId()));
+            equMaintenancePartList.addAll(dataShiftSpareStandToPlan(partsSetoutStandardList, maintenanceScheduleDo.getId()));
             return maintenanceScheduleDo;
         }).collect(Collectors.toList());
         maintenanceScheduleService.saveBatchList(maintenanceScheduleList);
         maintenancePartService.saveBatchList(equMaintenancePartList);
-        if (wrongData.length()==0){
+        if (wrongData.length() == 0) {
             return R.ok();
-        }else {
+        } else {
             return R.error(wrongData.toString());
         }
     }
@@ -179,7 +178,6 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * @return {@link R}
      * @date 2023/11/30 17:36
      * @author shangmi
-     *
      */
     @Override
     @Transactional
@@ -187,32 +185,32 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
         Date newDate = new Date();
         SysUserVo currentUser = CommonUtils.getCurrentUser();
-        //获得指定年——工厂下所以计划及其备件信息
-        List<EquMaintenanceScheduleDo> maintenanceScheduleOldList = maintenanceScheduleService.getYearAndTenantIdByList(planYearCopy.getOldYear(),planYearCopy.getTenantId());
+        // 获得指定年——工厂下所以计划及其备件信息
+        List<EquMaintenanceScheduleDo> maintenanceScheduleOldList = maintenanceScheduleService.getYearAndTenantIdByList(planYearCopy.getOldYear(), planYearCopy.getTenantId());
         List<EquMaintenanceScheduleDo> maintenanceScheduleNewList = maintenanceScheduleService.getYearAndTenantIdByList(planYearCopy.getNewYear(), planYearCopy.getTenantId());
         List<EquMaintenanceScheduleDo> maintenanceScheduleList = maintenanceScheduleOldList;
-        if (maintenanceScheduleNewList.size()!=0){
-            //获取不重复数据（去重）
-            maintenanceScheduleList = Stream.concat(maintenanceScheduleOldList.stream(),maintenanceScheduleNewList.stream())
-                    .collect(Collectors.groupingBy(info->info.getEquipmentid()+info.getPlantype(),Collectors.counting()))
+        if (maintenanceScheduleNewList.size() != 0) {
+            // 获取不重复数据（去重）
+            maintenanceScheduleList = Stream.concat(maintenanceScheduleOldList.stream(), maintenanceScheduleNewList.stream())
+                    .collect(Collectors.groupingBy(info -> info.getEquipmentid() + info.getPlantype(), Collectors.counting()))
                     .entrySet().stream()
-                    .filter(info -> info.getValue()==1)
+                    .filter(info -> info.getValue() == 1)
                     .map(Map.Entry::getKey)
-                    .map(info -> Stream.concat(maintenanceScheduleOldList.stream(),maintenanceScheduleNewList.stream())
-                            .filter(item -> (item.getEquipmentid()+item.getPlantype()).equals(info))
+                    .map(info -> Stream.concat(maintenanceScheduleOldList.stream(), maintenanceScheduleNewList.stream())
+                            .filter(item -> (item.getEquipmentid() + item.getPlantype()).equals(info))
                             .findFirst().orElse(null))
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
         }
-        if (maintenanceScheduleList.size()==0){
-            return R.error(PlantEnum.nameOf(planYearCopy.getTenantId())+"已存在"+ planYearCopy.getNewYear()+"年的保养计划记录，不可重复生成");
+        if (maintenanceScheduleList.size() == 0) {
+            return R.error(PlantEnum.nameOf(planYearCopy.getTenantId()) + "已存在" + planYearCopy.getNewYear() + "年的保养计划记录，不可重复生成");
         }
 
         List<EquMaintenancePartDo> masterIdByList = maintenancePartService.getMasterIdByList(maintenanceScheduleList.stream().map(EquMaintenanceScheduleDo::getId).collect(Collectors.toList()));
-        //计划备件信息
+        // 计划备件信息
         List<EquMaintenancePartDo> maintenancePartList = new ArrayList<>();
-        //赋值
-        maintenanceScheduleList.forEach(info ->{
+        // 赋值
+        maintenanceScheduleList.forEach(info -> {
             List<EquMaintenancePartDo> collect = masterIdByList.stream().filter(item -> item.getMasterid().equals(info.getId())).collect(Collectors.toList());
             info.setId(SecurityUtil.getUUID())
                     .setPlanyear(planYearCopy.getNewYear())
@@ -224,7 +222,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setModifydate(newDate)
                     .setPlannedstatus(PlannedStatusEnum.UNLOCKED.getValue());
 
-            collect.forEach(item ->{
+            collect.forEach(item -> {
                 item.setId(SecurityUtil.getUUID())
                         .setMasterid(info.getId())
                         .setCreateusername(currentUser.getName())
@@ -237,30 +235,29 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             maintenancePartList.addAll(collect);
 
         });
-        boolean b = maintenanceScheduleService.saveBatch(maintenanceScheduleList,100);
-        maintenancePartService.saveBatch(maintenancePartList,100);
-        if (b){
+        boolean b = maintenanceScheduleService.saveBatch(maintenanceScheduleList, 100);
+        maintenancePartService.saveBatch(maintenancePartList, 100);
+        if (b) {
             return R.ok();
-        }else {
+        } else {
             return R.error("数据添加不完整,请核对数据!");
         }
     }
 
     /**
-     *  Excel导入
+     * Excel导入
      *
      * @param multipartFile 二进制文件内
      * @return {@link R}
      * @date 2023/12/11 11:14
      * @author shangmi
-     *
      */
     @Override
     public R uploadStandardSave(MultipartFile multipartFile) throws IOException {
         Date date = new Date();
         EquMaintenanceStandardListener standardListener = new EquMaintenanceStandardListener();
         // 解析Excel
-        EasyExcel.read(multipartFile.getInputStream(), EquMaintenanceStandardTemplate.class,standardListener).sheet().headRowNumber(4).doRead();
+        EasyExcel.read(multipartFile.getInputStream(), EquMaintenanceStandardTemplate.class, standardListener).sheet().headRowNumber(4).doRead();
         // 解析有误信息
         List<String> errorData = standardListener.getErrorData();
         // 解析数据
@@ -279,25 +276,25 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
         // 拼接返回错误数据
-        if (maintenanceStandardDoList.size()!=0){
-            jointErrorData(maintenanceStandardDoList,errorData);
+        if (maintenanceStandardDoList.size() != 0) {
+            jointErrorData(maintenanceStandardDoList, errorData);
         }
         // 判断是否又错误数据
-        if (errorData.size()!=0){
+        if (errorData.size() != 0) {
             return R.error(JSON.toJSONString(errorData));
         }
         SysUserVo currentUser = CommonUtils.getCurrentUser();
         // 生成流水号
-        for (EquMaintenanceStandardDo maintenanceStandard : newMaintenanceStandardList){
+        for (EquMaintenanceStandardDo maintenanceStandard : newMaintenanceStandardList) {
             SysSerialVo sysSerialVo = new SysSerialVo();
             String plantSimp = PlantEnum.addrOf(maintenanceStandard.getTenantid());
-            sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_"+plantSimp);
+            sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_" + plantSimp);
             // sysSerialVo.setResetrule("date:yyyy");
-            sysSerialVo.setRuleTemplateStr(plantSimp +"-BYBZ-@{serialNumber:#00000}");
+            sysSerialVo.setRuleTemplateStr(plantSimp + "-BYBZ-@{serialNumber:#00000}");
             R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
-            if ("200".equals(serialNumberCode.getCode())){
+            if ("200".equals(serialNumberCode.getCode())) {
                 Object data = serialNumberCode.getData();
-                maintenanceStandard.setStandardid(JSONObject.parseObject(JSONObject.toJSONString(data),Map.class).get("code").toString());
+                maintenanceStandard.setStandardid(JSONObject.parseObject(JSONObject.toJSONString(data), Map.class).get("code").toString());
             }
             maintenanceStandard.setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1])
                     .setCreatedate(date)
@@ -305,7 +302,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setCreateuserid(currentUser.getId())
                     .setModifyuserid(currentUser.getId());
         }
-        maintenanceStandardService.saveBatch(newMaintenanceStandardList,200);
+        maintenanceStandardService.saveBatch(newMaintenanceStandardList, 200);
         return R.ok("导入成功");
     }
 
@@ -315,14 +312,14 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         Date date = new Date();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
-        calendar.add(Calendar.MONTH,+1);
-        int month =calendar.get(Calendar.MONTH)+1;
+        calendar.add(Calendar.MONTH, +1);
+        int month = calendar.get(Calendar.MONTH) + 1;
         int year = calendar.get(Calendar.YEAR);
         List<EquMaintenancePartDo> masterIdAndMonthByList = maintenancePartService.getMasterIdAndMonthByList(null, month, year);
         // 获取主表ID
         List<String> masterIds = new ArrayList<>(masterIdAndMonthByList.stream()
                 .collect(Collectors.groupingBy(EquMaintenancePartDo::getMasterid)).keySet());
-        if (masterIds.size()==0){
+        if (masterIds.size() == 0) {
             return R.ok();
         }
         // 通过主表ID查询部位表
@@ -332,12 +329,12 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         List<EquPartsSetoutStandardDo> partsSetoutStandardList = partsSetoutStandardService.getMasterIdByList(masterIdAndMonthByList.stream().map(EquMaintenancePartDo::getMaintenancestandid).collect(Collectors.toList()));
         // 转移数据
         List<EquMaintenanceTaskDo> newMaintenanceTaskList = new ArrayList<>();
-        for (EquMaintenanceScheduleDo maintenanceScheduleDo:maintenanceScheduleList){
+        for (EquMaintenanceScheduleDo maintenanceScheduleDo : maintenanceScheduleList) {
             List<EquMaintenancePartDo> maintenancePartDos = masterIdAndMonthByList.stream().filter(info -> info.getMasterid().equals(maintenanceScheduleDo.getId())).collect(Collectors.toList());
-            newMaintenanceTaskList.addAll(dataTransfer(maintenancePartDos, maintenanceScheduleDo,month));
+            newMaintenanceTaskList.addAll(dataTransfer(maintenancePartDos, maintenanceScheduleDo, month));
         }
         // 通过年月查询存在的任务
-        List<EquMaintenanceTaskDo> oldMaintenanceSite = maintenanceTaskService.getListByYearAndMonth(year,month);
+        List<EquMaintenanceTaskDo> oldMaintenanceSite = maintenanceTaskService.getListByYearAndMonth(year, month);
         // 去重重复任务
         List<EquMaintenanceTaskDo> equMaintenanceTaskList = Stream.concat(oldMaintenanceSite.stream(), newMaintenanceTaskList.stream())
                 .collect(Collectors.groupingBy(info -> info.getEquipmentid() + info.getMaintenancesite(), Collectors.counting()))
@@ -354,16 +351,16 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         // 插入
         int number = maintenanceTaskService.insertBatch(equMaintenanceTaskList);
         partsSetoutTaskService.batchSave(partsSetoutTaskDoList);
-        if (month==12){
+        if (month == 12) {
             List<EquMaintenanceScheduleDo> maintenancePartYearAll = maintenanceScheduleService.getYearByList(year);
             maintenanceScheduleService.updatePlannedstatusByIds(maintenancePartYearAll.stream().map(EquMaintenanceScheduleDo::getId).collect(Collectors.toList()), PlannedStatusEnum.PUBLISHED_TASK_ALL);
-        }else {
+        } else {
             maintenanceScheduleService.updatePlannedstatusByIds(masterIds, PlannedStatusEnum.PUBLISHED_TASK);
         }
         // 判断是否全部插入成功
-        if (number == equMaintenanceTaskList.size()){
+        if (number == equMaintenanceTaskList.size()) {
             return R.ok();
-        }else {
+        } else {
             return R.ok("数据添加不完整,请核对数据!");
         }
     }
@@ -377,12 +374,11 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * @return
      * @date 2023/12/8 16:43
      * @author shangmi
-     *
      */
 
-    public void jointErrorData(List<EquMaintenanceStandardDo> maintenanceStandardList,List<String> errorData){
-        maintenanceStandardList.forEach(info ->{
-            errorData.add(PlantEnum.nameOf(info.getTenantid())+",已存在了"+EquipmentTypeEnum.typeOf(Integer.valueOf(info.getEquipmenttype()))+"-"+MaintenanceTypeEnum.typeOf(info.getMaintenancetype())+"-"+info.getMaintenancesite()+"部位"+info.getMaintenancecontext()+"的保养标准内容，不可重复导入，请检查");
+    public void jointErrorData(List<EquMaintenanceStandardDo> maintenanceStandardList, List<String> errorData) {
+        maintenanceStandardList.forEach(info -> {
+            errorData.add(PlantEnum.nameOf(info.getTenantid()) + ",已存在了" + EquipmentTypeEnum.typeOf(Integer.valueOf(info.getEquipmenttype())) + "-" + MaintenanceTypeEnum.typeOf(info.getMaintenancetype()) + "-" + info.getMaintenancesite() + "部位" + info.getMaintenancecontext() + "的保养标准内容，不可重复导入，请检查");
         });
 
     }
@@ -391,19 +387,18 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * 详细库转移（标准——计划明细）
      *
      * @param partsSetoutStandardList 标准库备品备件
-     * @param id    主表ID
+     * @param id                      主表ID
      * @return {@link Collection<? extends  EquMaintenancePartDo>}
      * @date 2023/11/29 16:21
      * @author shangmi
-     *
      */
 
     private Collection<? extends EquMaintenancePartDo> dataShiftSpareStandToPlan(List<EquMaintenanceStandardDo> partsSetoutStandardList, String id) {
         Date newDate = new Date();
         // SysUserVo currentUser = CommonUtils.getCurrentUser();
-        return partsSetoutStandardList.stream().map(info ->{
+        return partsSetoutStandardList.stream().map(info -> {
             EquMaintenancePartDo maintenancePart = new EquMaintenancePartDo();
-            BeanUtils.copyProperties(info,maintenancePart);
+            BeanUtils.copyProperties(info, maintenancePart);
             maintenancePart.setId(SecurityUtil.getUUID())
                     .setCreatedate(newDate)
                     // .setCreateusername(currentUser.getName())
@@ -430,38 +425,38 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * @return {@link List<EquMaintenanceTaskDo>}
      * @date 2023/11/27 17:55 创建时间
      * @author shangmi
-     *
      */
 
     public List<EquMaintenanceTaskDo> dataTransfer(
             List<EquMaintenancePartDo> maintenancePartList,
             EquMaintenanceScheduleDo maintenanceSchedule,
-            Integer month){
+            Integer month) {
         Date newDate = new Date();
         // SysUserVo currentUser = CommonUtils.getCurrentUser();
         List<EquMaintenanceTaskDo> maintenanceTaskList = new ArrayList<>();
+        // 遍历计划部位
         for (EquMaintenancePartDo maintenancePart : maintenancePartList) {
             SysSerialVo sysSerialVo = new SysSerialVo();
             // String plantSimp = PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
             String plantSimp = PlantEnum.addrOf(maintenancePart.getTenantid());
-            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_"+ plantSimp);
+            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_" + plantSimp);
             sysSerialVo.setResetrule("date:yyyy");
             sysSerialVo.setIfautomaticreset("y");
-            sysSerialVo.setRuleTemplateStr(plantSimp +"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}-@{serialNumber:#00000}");
+            sysSerialVo.setRuleTemplateStr(plantSimp + "-" + maintenanceSchedule.getPlantype() + "-@{date:yyyyMM}-@{serialNumber:#00000}");
+            // 获取流水号
             R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
             EquMaintenanceTaskDo equMaintenanceTask = new EquMaintenanceTaskDo();
-            BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);
-            BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
+            BeanUtils.copyProperties(maintenanceSchedule, equMaintenanceTask);
+            BeanUtils.copyProperties(maintenancePart, equMaintenanceTask);
             equMaintenanceTask.setId(SecurityUtil.getUUID())
                     .setMonth(month.toString())
                     .setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
                     .setCreatedate(newDate)
                     .setModifydate(newDate)
                     .setTenantid(maintenancePart.getTenantid());
-            if ("200".equals(serialNumberCode.getCode())){
-
+            if ("200".equals(serialNumberCode.getCode())) {
                 Object data = serialNumberCode.getData();
-                equMaintenanceTask.setTaskid(JSONObject.parseObject(JSONObject.toJSONString(data),Map.class).get("code").toString());
+                equMaintenanceTask.setTaskid(JSONObject.parseObject(JSONObject.toJSONString(data), Map.class).get("code").toString());
             }
             maintenanceTaskList.add(equMaintenanceTask);
         }
@@ -471,28 +466,27 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
 
     /**
-     *转移子表数据
+     * 转移子表数据
      *
      * @param partsSetoutStandardList 标准库备品备件
-     * @param equMaintenanceTaskDos 任务信息
+     * @param equMaintenanceTaskDos   任务信息
      * @return {@link List<EquPartsSetoutTaskDo>}
      * @date 2023/11/28 19:16
      * @author shangmi
-     *
      */
 
     public List<EquPartsSetoutTaskDo> sparePartsConversion(
             List<EquPartsSetoutStandardDo> partsSetoutStandardList,
-            List<EquMaintenanceTaskDo> equMaintenanceTaskDos){
+            List<EquMaintenanceTaskDo> equMaintenanceTaskDos) {
         Date newDate = new Date();
         SysUserVo currentUser = CommonUtils.getCurrentUser();
-        //遍历赛选出标准库备品备件主表ID和任务表标准库ID对应的字段并塞入任务表备品备件库中
+        // 遍历赛选出标准库备品备件主表ID和任务表标准库ID对应的字段并塞入任务表备品备件库中
         return equMaintenanceTaskDos.stream().map(info -> partsSetoutStandardList.stream()
                 .filter(item -> item.getMasterid().equals(info.getMaintenancestandid()))
                 .map(item -> {
                     EquPartsSetoutTaskDo equPartsSetoutTaskDo = new EquPartsSetoutTaskDo();
                     BeanUtils.copyProperties(item, equPartsSetoutTaskDo);
-                    //更换主表ID
+                    // 更换主表ID
                     equPartsSetoutTaskDo.setMasterid(info.getId())
                             .setId(SecurityUtil.getUUID())
                             .setCreateuserid(currentUser.getId())
@@ -501,27 +495,28 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                             .setModifyuserid(currentUser.getId())
                             .setModifyusername(currentUser.getName())
                             .setModifydate(newDate)
-                    .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+                            .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
                     return equPartsSetoutTaskDo;
                 }).collect(Collectors.toList())).flatMap(Collection::stream).distinct().collect(Collectors.toList());
     }
 
     /**
+     * 去重复
      *
-     *  去重复
-     * @param maintenancePartList 任务表
-     * @param maintenanceSiteList 计划表
+     * @param maintenancePartList 部位表
+     * @param maintenanceTaskList 任务表
      * @return {@link List<EquMaintenancePartDo>}
      * @date 2023/11/27 18:14
      * @author shangmi
-     *
      */
     public List<EquMaintenancePartDo> removeDuplicates(
             List<EquMaintenancePartDo> maintenancePartList,
-            List<EquMaintenanceTaskDo> maintenanceSiteList){
-        List<String> maintenanceSite = maintenanceSiteList.stream()
+            List<EquMaintenanceTaskDo> maintenanceTaskList) {
+        // 获取任务表中存在的保养部位
+        List<String> maintenanceSite = maintenanceTaskList.stream()
                 .map(EquMaintenanceTaskDo::getMaintenancesite)
                 .collect(Collectors.toList());
+        // 对部位表进行去重
         return maintenancePartList.stream().filter(info ->
                 !maintenanceSite.contains(info.getMaintenancesite())
         ).collect(Collectors.toList());
@@ -534,10 +529,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * @return {@link EquMaintenanceStandardDo}
      * @date 2023/11/29 15:24
      * @author shangmi
-     *
      */
 
-    public EquMaintenanceScheduleDo dataShiftFacilityToPlan(AspCheckItems aspCheckItem,Integer year){
+    public EquMaintenanceScheduleDo dataShiftFacilityToPlan(AspCheckItems aspCheckItem, Integer year) {
         EquMaintenanceScheduleDo maintenanceSchedule = new EquMaintenanceScheduleDo();
         Date newDate = new Date();
         // SysUserVo currentUser = CommonUtils.getCurrentUser();