Merge remote-tracking branch 'origin/master'

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -355,7 +355,7 @@ public class SaveConstans {
         /**
          * 大修任务超期提醒内容
          */
-        public static final String PLANNING_TASK_CONTENT = "【%s】年【%s】大修任务有【%s】个大修任务现已超期未完成，请各车间相关负责人及时跟进处理并调促督协尽快完成，具体任务详见附件清单。";
+        public static final String PLANNING_TASK_CONTENT = "【%s】近一年大修任务有【%s】个大修任务现已超期未完成，请各车间相关负责人及时跟进处理并调促督协尽快完成，具体任务详见附件清单。";
 
         /**
          * 设备报废申请审批通过提醒内容

cx-equipment/cx-equipment-common/pom.xml

@@ -40,19 +40,6 @@
             <version>${mysql.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>5.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>5.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

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

@@ -24,5 +24,5 @@ public interface EquLubricationTaskManagementService extends IService<EquLubrica
      */
     void wordExportLubricationTask(Map<String, Object> parameter, HttpServletResponse response);
 
-    List<EquLubricationTaskManagementDo> getListByTimeQuantum(String newDate, String oldDate);
+    List<EquLubricationTaskManagementDo> getListByTimeQuantum(int year, int month ,boolean stride);
 }

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

@@ -19,5 +19,5 @@ public interface EquMaintenanceTaskService extends IService<EquMaintenanceTaskDo
 
     List<EquMaintenanceTaskDo> getListByYearAndMonth(int year, int month);
 
-    List<EquMaintenanceTaskDo> getListByTimeQuantum(String newDate, String oldDate);
+    List<EquMaintenanceTaskDo> getListByTimeQuantum(int year, int month,boolean stride);
 }

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

@@ -52,14 +52,13 @@ public interface EquipmentSendNotifyService {
 
     /**
      * 大修任务发送消息提醒
-     * @param planyear
      * @param belongfactory
      * @param taskquantity
      * @param taskId
      * @param userId
      * @param fileItemId
      */
-    void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId,List<String> userId,String fileItemId);
+    void sendPlanningTasksNotify(String belongfactory, Integer taskquantity, String taskId,List<String> userId,String fileItemId);
 
     /**
      * 设备报废通知提醒
@@ -100,4 +99,9 @@ public interface EquipmentSendNotifyService {
      *
      */
     R endUnfinishedTaskNotify();
+
+    /**
+     * 删除大修计划任务发送移动端的超期任务提醒
+     */
+    void deletePlanningTasksNotify();
 }

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

@@ -100,12 +100,24 @@ public class EquLubricationTaskManagementServiceImpl extends ServiceImpl<EquLubr
     }
 
     @Override
-    public List<EquLubricationTaskManagementDo> getListByTimeQuantum(String newDate, String oldDate) {
+    public List<EquLubricationTaskManagementDo> getListByTimeQuantum(int year, int month, boolean stride) {
         LambdaQueryWrapper<EquLubricationTaskManagementDo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(EquLubricationTaskManagementDo::getTaskstatus, Arrays.asList(10,20,70))
-                .lt(BaseDo::getCreatedate,newDate)
-                .gt(BaseDo::getCreatedate,oldDate)
+                // .lt(BaseDo::getCreatedate, year)
+                // .gt(BaseDo::getCreatedate, month)
                 .eq(BaseDo::getDeleted,0);
+
+        //跨月
+        queryWrapper.and(stride,query ->query
+                .eq(EquLubricationTaskManagementDo::getYear,year)
+                .lt(EquLubricationTaskManagementDo::getMonth,month)
+                .or()
+                .eq(EquLubricationTaskManagementDo::getYear,year-1)
+                .ge(EquLubricationTaskManagementDo::getMonth,month));
+        //月末
+        queryWrapper.and(!stride,query -> query
+                .eq(EquLubricationTaskManagementDo::getYear,year)
+                .eq(EquLubricationTaskManagementDo::getMonth,month));
         return lubricationTaskManagementMapperDao.selectList(queryWrapper);
     }
 }

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

@@ -65,12 +65,21 @@ public class EquMaintenanceTaskServiceImpl extends ServiceImpl<EquMaintenanceTas
     }
 
     @Override
-    public List<EquMaintenanceTaskDo> getListByTimeQuantum(String newDate, String oldDate) {
+    public List<EquMaintenanceTaskDo> getListByTimeQuantum(int year, int month, boolean stride) {
         LambdaQueryWrapper<EquMaintenanceTaskDo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(EquMaintenanceTaskDo::getTaskstate, Arrays.asList("10","30","70"))
-                .lt(EquMaintenanceTaskDo::getCreatedate,newDate)
-                .ge(EquMaintenanceTaskDo::getCreatedate,oldDate)
                 .eq(EquMaintenanceTaskDo::getDeleted,0);
+        //跨月
+        queryWrapper.and(stride,query ->query
+                        .eq(EquMaintenanceTaskDo::getPlanyear,year)
+                        .lt(EquMaintenanceTaskDo::getMonth,month)
+                        .or()
+                        .eq(EquMaintenanceTaskDo::getPlanyear,year-1)
+                        .ge(EquMaintenanceTaskDo::getMonth,month));
+        //月末
+        queryWrapper.and(!stride,query -> query
+                .eq(EquMaintenanceTaskDo::getPlanyear,year)
+                .eq(EquMaintenanceTaskDo::getMonth,month));
         return maintenanceTaskDao.selectList(queryWrapper);
     }
 }

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

@@ -148,6 +148,10 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
         List<SysDictDo> taskByType = sysDictService.getDictsByType("task_state");
         List<SysDictDo> ynByType = sysDictService.getDictsByType("srm_yn");
         List<EquOverhaulPlanningTasksVo> equOverhaulPlanningTasksDos = equOverhaulPlanningTasksMapperDao.selectAllOverdueTaskQuantity();
+        if (equOverhaulPlanningTasksDos.size()>0){
+            //提前删除大修任务超期提醒
+            equipmentSendNotifyService.deletePlanningTasksNotify();
+        }
         for (EquOverhaulPlanningTasksVo planningTasksVo:equOverhaulPlanningTasksDos){
             if (planningTasksVo.getTaskquantity()>0){
                 List<EquOverhaulPlanningTasksVo> tasksVos = equOverhaulPlanningTasksMapperDao.selectTasksByFactoryId(planningTasksVo.getTenantid());
@@ -198,7 +202,7 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
                         userId = useDeptRoleUserIds.stream().distinct().collect(Collectors.toList());
                     }
                     try {
-                        equipmentSendNotifyService.sendPlanningTasksNotify(planningTasksVo.getPlanyear(),planningTasksVo.getBelongfactory(),planningTasksVo.getTaskquantity(), planningTasksVo.getId(),userId,fileItemId);
+                        equipmentSendNotifyService.sendPlanningTasksNotify(planningTasksVo.getBelongfactory(),planningTasksVo.getTaskquantity(), planningTasksVo.getId(),userId,fileItemId);
                     }catch (Exception e){
                         ExceptionUtils.printExceptionDetail(e,"发送消息异常");
                     }

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

@@ -10,6 +10,7 @@ import com.rongwei.bscommon.sys.utils.ExceptionUtils;
 import com.rongwei.bscommon.sys.utils.StringUtil;
 import com.rongwei.bsentity.domain.EquWarrantyProviderDo;
 import com.rongwei.rwadmincommon.system.domain.*;
+import com.rongwei.rwadmincommon.system.service.SysDictService;
 import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -43,11 +44,15 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
     @Autowired
     private EquWarrantyProviderService equWarrantyProviderService;
 
+    @Autowired
+    private SysDictService sysDictService;
+
     @Autowired
     private CommonDao commonDao;
 
     @Override
     public R importEquWarrantyProvider(MultipartFile file) {
+        List<SysDictDo> ynByType = sysDictService.getDictsByType("srm_yn");
         try {
             // 查询所有工厂数据
             List<SysOrganizationVo> factoryList = commonDao.getAllFactoryNameAndId();
@@ -76,20 +81,13 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
                 String phone = row.getCell(6) == null ? "" : row.getCell(6).toString().trim();
                 String factory = row.getCell(7) == null ? "" : row.getCell(7).toString().trim();
                 String dept = row.getCell(8) == null ? "" : row.getCell(8).toString().trim();
-                if (StringUtils.isNotBlank(code)){
-                    code = StringUtil.formatDecimal(code);
-                }else {
+                if (StringUtils.isBlank(code)){
                     stringBuilder.append("保修商编号必填");
                 }
                 if (StringUtils.isBlank(name)){
                     stringBuilder.append("保修商名称必填");
                 }
-                if (StringUtils.isNotBlank(zuscc)){
-                    if (StringUtil.isScience(zuscc)){
-                        BigDecimal formatAccount = new BigDecimal(zuscc);
-                        zuscc = formatAccount.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
-                    }
-                }else {
+                if (StringUtils.isBlank(zuscc)){
                     stringBuilder.append("统一社会信用代码必填");
                 }
                 boolean containFactory = factorys.contains(factory);
@@ -112,47 +110,60 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
                         stringBuilder.append("表格中当前工厂下已存在该统一社会信用代码，不可重复录入");
                     }
                 }
-                if (StringUtils.isNotBlank(phone)){
-                    if (StringUtil.isScience(phone)){
-                        BigDecimal formatPhone = new BigDecimal(phone);
-                        phone = formatPhone.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
-                    }
-                }
-                SysDictDo sysDictDo = commonDao.getDictValueByNameAndType(isPrivately,"srm_yn");
-                if (sysDictDo!= null){
-                    isPrivately = sysDictDo.getValue();
-                }
                 if (StringUtils.isNotBlank(factory)){
                     List<SysOrganizationVo> resultList = factoryList.stream().filter(p -> p.getFullname().equals(factory)).collect(Collectors.toList());
-                    factoryId = resultList.get(0).getId();
-                    if (StringUtil.isBlank(factoryId)){
-                        stringBuilder.append("所属工厂填写有误");
-                    }
-                    //当前用户所属工厂、【保修商名称】作唯一校验
-                    if (StringUtils.isNotBlank(name)){
-                        QueryWrapper<EquWarrantyProviderDo> entity = new QueryWrapper<EquWarrantyProviderDo>().eq("DELETED", 0).eq("WARRANTYPROVIDER",name).eq("TENANTID",factoryId).last("limit 1");
-                        EquWarrantyProviderDo providerNameDo = equWarrantyProviderService.getOne(entity);
-                        if (providerNameDo!= null){
-                            stringBuilder.append(String.format("在%s中%s已存在，不可重复导入",factory,name));
+                    if (resultList.size()>0){
+                        factoryId = resultList.get(0).getId();
+                        //当前用户所属工厂、【保修商名称】作唯一校验
+                        if (StringUtils.isNotBlank(name)){
+                            QueryWrapper<EquWarrantyProviderDo> entity = new QueryWrapper<EquWarrantyProviderDo>().eq("DELETED", 0).eq("WARRANTYPROVIDER",name).eq("TENANTID",factoryId).last("limit 1");
+                            EquWarrantyProviderDo providerNameDo = equWarrantyProviderService.getOne(entity);
+                            if (providerNameDo!= null){
+                                stringBuilder.append(String.format("在%s中%s已存在，不可重复导入",factory,name));
+                            }
                         }
-                    }
-                    //当前用户所属工厂、【统一社会信用代码】作唯一校验
-                    if (StringUtils.isNotBlank(zuscc)){
-                        QueryWrapper<EquWarrantyProviderDo> entity = new QueryWrapper<EquWarrantyProviderDo>().eq("DELETED", 0).eq("ZUSCC",zuscc).eq("TENANTID",factoryId).last("limit 1");
-                        EquWarrantyProviderDo providerZusccDo = equWarrantyProviderService.getOne(entity);
-                        if (providerZusccDo!= null){
-                            stringBuilder.append(String.format("在%s中%s保修商已存在，不可重复导入",factory,zuscc));
+                        //当前用户所属工厂、【统一社会信用代码】作唯一校验
+                        if (StringUtils.isNotBlank(zuscc)){
+                            if (StringUtil.isScience(zuscc)){
+                                BigDecimal formatAccount = new BigDecimal(zuscc);
+                                zuscc = formatAccount.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
+                            }
+                            QueryWrapper<EquWarrantyProviderDo> entity = new QueryWrapper<EquWarrantyProviderDo>().eq("DELETED", 0).eq("ZUSCC",zuscc).eq("TENANTID",factoryId).last("limit 1");
+                            EquWarrantyProviderDo providerZusccDo = equWarrantyProviderService.getOne(entity);
+                            if (providerZusccDo!= null){
+                                stringBuilder.append(String.format("在%s中%s保修商已存在，不可重复导入",factory,zuscc));
+                            }
                         }
+                    }else {
+                        stringBuilder.append("所属工厂填写有误");
                     }
                 }else {
                     stringBuilder.append("所属工厂必填");
                 }
-                if (StringUtils.isNotBlank(dept)){
-                    deptId = commonDao.getIdByFactoryIdAndDept(factoryId,dept);
-                }
                 if (StringUtil.isNotBlank(stringBuilder)) {
                     allStrBuilder.append("第").append(i + 1).append("行").append(stringBuilder).append("<br>");
                 }else {
+                    //处理数据
+                    if (StringUtil.isScience(code)){
+                        BigDecimal formatAccount = new BigDecimal(code);
+                        code = formatAccount.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
+                    }else {
+                        code = StringUtil.formatDecimal(code);
+                    }
+                    if (StringUtils.isNotBlank(phone)){
+                        if (StringUtil.isScience(phone)){
+                            BigDecimal formatPhone = new BigDecimal(phone);
+                            phone = formatPhone.setScale(0,BigDecimal.ROUND_HALF_UP).toPlainString();
+                        }
+                    }
+                    if (org.apache.commons.lang.StringUtils.isNotBlank(isPrivately)) {
+                        String isPrivatelyDictName = isPrivately;
+                        isPrivately = ynByType.stream().filter(dictDo -> isPrivatelyDictName.contains(dictDo.getName()))
+                                .map(SysDictDo::getValue).collect(Collectors.joining(","));
+                    }
+                    if (StringUtils.isNotBlank(dept)){
+                        deptId = commonDao.getIdByFactoryIdAndDept(factoryId,dept);
+                    }
                     equWarrantyProviderDo.setId(SecurityUtil.getUUID())
                             .setWarrantyprovidercode(code)
                             .setWarrantyprovider(name)

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

@@ -26,6 +26,7 @@ import com.rongwei.rwcommoncomponent.file.service.SysFileItemService;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import com.rongwei.safecommon.fegin.CXCommonFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.SaveConstans;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -44,7 +45,8 @@ import static com.rongwei.safecommon.utils.SaveConstans.FileName.PLANNING_TASK_F
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
-import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.*;
+import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.EDMS;
+import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.WMS;
 
 /**
  * @author shangmi
@@ -216,13 +218,13 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
     }
 
     @Override
-    public void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId, List<String> userId, String fileItemId) {
+    public void sendPlanningTasksNotify(String belongfactory, Integer taskquantity, String taskId, List<String> userId, String fileItemId) {
+        String taskContent = String.format(PLANNING_TASK_CONTENT, belongfactory, taskquantity);
         String notifyId = SecurityUtil.getUUID();
         String formatFileNameAndId = PLANNING_TASK_FILE_NAME + "-;-" + fileItemId;
-        CXCommonUtils.deleteSendNotify("mobilePlanningTask", null);
         // 发送消息提醒
         CXCommonUtils.sendNotify(notifyId, PLANNING_TASK_TITLE,
-                String.format(PLANNING_TASK_CONTENT, planyear, belongfactory, taskquantity), formatFileNameAndId
+                taskContent, formatFileNameAndId
                 , userId.stream().distinct().collect(Collectors.toList()), taskId, MOBILE_PLANNING_TASK, true);
         SysFileItemDo sysFileItemDo = new SysFileItemDo();
         sysFileItemDo.setId(fileItemId);
@@ -361,15 +363,17 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         Calendar calendar = Calendar.getInstance();
         Date date = new Date();
         calendar.setTime(date);
+        int month = calendar.get(Calendar.MONTH)+1;
+        int year = calendar.get(Calendar.YEAR);
         calendar.set(Calendar.DAY_OF_MONTH,1);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String newDate = simpleDateFormat.format(calendar.getTime());
-        calendar.set(Calendar.MONTH, -11);
-        String oldDate = simpleDateFormat.format(calendar.getTime());
+        // calendar.set(Calendar.MONTH, -11);
+        // String oldDate = simpleDateFormat.format(calendar.getTime());
         // 查询距近一年时间内未完成保养/润滑任务
-        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(newDate, oldDate);
+        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(year, month, true);
         List<EquLubricationTaskManagementDo> lubricationTaskManagementDoList = equLubricationTaskManagementService
-                .getListByTimeQuantum(newDate, oldDate);
+                .getListByTimeQuantum(year, month,true );
         if (maintenanceTaskDoList.size() + lubricationTaskManagementDoList.size() == 0) {
             return R.ok();
         }
@@ -447,13 +451,15 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         calendar.setTime(date);
         String newDate = simpleDateFormat.format(date);
-        // int sky = calendar.get(Calendar.DAY_OF_MONTH)-1;
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        String oldDate = simpleDateFormat.format(calendar.getTime());
+        // // int sky = calendar.get(Calendar.DAY_OF_MONTH)-1;
+        // calendar.set(Calendar.DAY_OF_MONTH, 1);
+        // String oldDate = simpleDateFormat.format(calendar.getTime());
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH)+1;
         // 查询距近一年时间内未完成保养/润滑任务
-        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(newDate, oldDate);
+        List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(year, month, false);
         List<EquLubricationTaskManagementDo> lubricationTaskManagementDoList = equLubricationTaskManagementService
-                .getListByTimeQuantum(newDate, oldDate);
+                .getListByTimeQuantum(year, month, false );
         if (maintenanceTaskDoList.size() + lubricationTaskManagementDoList.size() == 0) {
             return R.ok();
         }
@@ -500,7 +506,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
 
             byte[] byteArray = byteArrayOutputStream.toByteArray();
 
-            MultipartFile multipartFile = new MockMultipartFile("file", newDate + "-保养/润滑月末未完成.xlsx", "application/vnd.ms-excel", byteArray);
+            MultipartFile multipartFile = new MockMultipartFile("file", newDate + "-保养/润滑月末未完成.xlsx", SaveConstans.ContentType.XLSX, byteArray);
 
             // 消息提醒id
             String noticeId = SecurityUtil.getUUID();
@@ -519,6 +525,11 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         return R.ok();
     }
 
+    @Override
+    public void deletePlanningTasksNotify() {
+        CXCommonUtils.deleteSendNotify("mobilePlanningTask", null);
+    }
+
 
     /**
      * 润滑任务导出数据迁移

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();