feature 甘特图合并逻辑修改

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceHistoryImpl.java

@@ -1,42 +1,10 @@
 package com.rongwei.bscommon.sys.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.*;
-import com.rongwei.bscommon.sys.service.*;
-import com.rongwei.bscommon.sys.utils.ApsUtils;
-import com.rongwei.bsentity.domain.*;
-import com.rongwei.bsentity.vo.ApsProductDetailVo;
-import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateBlankReq;
-import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateOrderReq;
-import com.rongwei.bsentity.vo.DeleteOrderVo;
-import com.rongwei.rwadmincommon.system.vo.SysUserVo;
-import com.rongwei.rwcommon.base.BaseDo;
-import com.rongwei.rwcommon.base.R;
-import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.rwcommon.vo.MailDo;
-import com.rongwei.safecommon.fegin.CXCommonFeginClient;
-import com.rongwei.safecommon.utils.CXCommonUtils;
-import com.rongwei.safecommon.utils.SaveConstans;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.rongwei.bscommon.sys.dao.ApsProductionOrderHistoryDao;
+import com.rongwei.bscommon.sys.service.ApsProductionOrderHistoryService;
+import com.rongwei.bsentity.domain.ApsProductionOrderHistoryDo;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.rongwei.safecommon.utils.SaveConstans.DatePattern.DATE_PATTERN_YMD;
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
 
 /**
  *

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/GanttServiceImpl.java

@@ -339,10 +339,10 @@ public class GanttServiceImpl implements GanttService {
         LinkedHashMap<String, List<GanttVos>> processMap = apsProcessOperationProcessEquDos.stream().collect(Collectors.groupingBy(GanttVos::getProcessdeviceid,
                     LinkedHashMap::new, Collectors.toList()));
         for (Map.Entry<String, List<GanttVos>> deviceEntry : processMap.entrySet()) {
-            // 对数据按照 计划开始时间+计划结束时间 分组
+            // 对数据按照 计划开始时间 分组
             LinkedHashMap<String, List<GanttVos>> planDataMap = deviceEntry.getValue().stream().collect(Collectors.groupingBy(info -> {
                         if (COMBINED_PROCESSING.equals(info.getProcessway())) {
-                            return info.getPlanstartdate().toString() + info.getPlanenddate().toString();
+                            return info.getPlanstartdate().toString();
                         }
                         return info.getUuid();
                     },