优化

platform-dao/src/main/java/com/platform/dao/dto/sb/SbModelSpareBomDTO.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbModelSpareBomDTO extends BaseDTO implements Serializable {
+    private boolean cover;
     private List<String> notSpareIds;
     private List<String> spareIds;
     private List<String> sbIds;

platform-dao/src/main/java/com/platform/dao/vo/sb/SbModelSpareBomVO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbModelSpareBomVO extends BaseVO implements Serializable {
+    private String ggxh;
 
     /**
      * 预计更换日期

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -371,10 +371,10 @@ sb.check_type
             <include refid="deptSql"/>
         </if>
         <if test="notSbIds != null and notSbIds.size > 0">
-            AND sb.id not in
-            <foreach item="item" index="index" collection="notSbIds" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
+        <foreach collection="notSbIds" item="item">
+            and sb.id !=#{item}
+        </foreach>
+
         </if>
 
     </select>

platform-dao/src/main/resources/mapper/sb/SbModelSpareBomMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.platform.dao.mapper.sb.SbModelSpareBomMapper">
 
     <sql id="Left_Column">
-        bom.id, bom.period, bom.period_type, bom.num, bom.model_id, bom.sb_id, bom.sb_part_id,
+        bom.id, bom.period, bom.period_type, bom.num, bom.model_id, bom.sb_id, bom.sb_part_id,bom.ggxh,
         bom.check_date,
         bom.next_check_date,
         bom.change_num,

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -685,8 +685,8 @@ public class SbInfoController {
 
     @GetMapping("/get/synchronous/sb")
     public R getSynchronousSb(SbInfoDTO dto, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-        List<String> spareIds = dto.getSpareIds();
-        return new R(sbInfoService.getSynchronousSb(spareIds,pageNum,pageSize));
+//        List<String> spareIds = dto.getSpareIds();
+        return new R(sbInfoService.getSynchronousSb(dto,pageNum,pageSize));
     }
 
 

platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -25,7 +25,7 @@ import java.util.Map;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
-    AbstractPageResultBean<SbInfoVO> getSynchronousSb(List<String> spareIds,Integer pageNum,Integer pageSize);
+    AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbInfoDTO dto,Integer pageNum,Integer pageSize);
 
     AbstractPageResultBean<YiBiaoHisroryVO> getPositionNoHistory(SbChangeRecordDTO dto,Integer pageNum,Integer pageSize);
 

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -142,11 +142,15 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final FillGatherTaskDetailMapper fillGatherTaskDetailMapper;
 
     @Override
-    public AbstractPageResultBean<SbInfoVO> getSynchronousSb(List<String> spareIds,Integer pageNum,Integer pageSize) {
-        SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
-        dto.setSpareIds(spareIds);
-        List<SbModelSpareBomVO> list = sbModelSpareBomMapper.selectVOList(dto);
+    public AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbInfoDTO dto,Integer pageNum,Integer pageSize) {
+        SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
+        sbModelSpareBomDTO.setSbId(dto.getId());
+
+//        SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
+//        dto.setSpareIds(spareIds);
+        List<SbModelSpareBomVO> list = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
         List<String> needIds = new ArrayList<>();
+        List<String> notSbIds = new ArrayList<>();
         if (list!=null &&list.size()>0) {
             List<String> sbIds = list.stream().map(SbModelSpareBomVO::getSbId).collect(Collectors.toList());
             List<String> distinctSbIds = list.stream().map(SbModelSpareBomVO::getSbId).distinct().collect(Collectors.toList());
@@ -157,16 +161,21 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                             count++;
                         }
                     }
-                    if (count<spareIds.size()){
+                    if (count<list.size()){
                         needIds.add(disSbId);
+                    }else {
+                        notSbIds.add(disSbId);
                     }
                 }
         }
 
         List<String> sbIds = list.stream().map(SbModelSpareBomVO::getSbId).distinct().collect(Collectors.toList());
         SbInfoDTO sbInfoDTO = new SbInfoDTO();
+
         sbInfoDTO.setNotSbIds(sbIds);
+
         List<SbInfoVO> sbInfoVOs = mapper.selectVOList(sbInfoDTO);
+
         sbInfoDTO.setNotSbIds(null);
         List<SbInfoVO> infoVOS = new ArrayList<>();
         if (needIds!=null&&needIds.size()>0) {

platform-service/src/main/java/com/platform/service/sb/impl/SbModelSpareBomServiceImpl.java

@@ -21,9 +21,11 @@ import com.platform.dao.entity.check.CheckProjectStandardRelation;
 import com.platform.dao.entity.check.CheckStandard;
 import com.platform.dao.entity.part.PartInfo;
 import com.platform.dao.entity.purchase.PurchaseDemandPlanList;
+import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbModelSpareBom;
 import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
 import com.platform.dao.mapper.check.CheckProjectStandardRelationMapper;
+import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
@@ -61,15 +63,28 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
     private final  SparePartInfoService sparePartInfoService;
     private PartInfoService partInfoService;
     private SbModelSpareBomMapper sbModelSpareBomMapper;
+    private SbInfoMapper sbInfoMapper;
 
     @Override
     public void synchronousAdd(SbModelSpareBomDTO dto) {
         List<String> sbIds = dto.getSbIds();
-        List<SparePartInfoDTO> sparePartInfoDTOS = dto.getSparePartInfoList();
+        SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
+        sbModelSpareBomDTO.setSbId(dto.getSbId());
+        List<SbModelSpareBomVO> sbModelSpareBomVOS = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
+        List<SparePartInfoDTO> sparePartInfoDTOS = new ArrayList<>();
+        for (SbModelSpareBomVO vo:sbModelSpareBomVOS){
+            SparePartInfoDTO sparePartInfoDTO = new SparePartInfoDTO();
+            sparePartInfoDTO.setId(vo.getSpareId());
+            sparePartInfoDTO.setNo(vo.getNo());
+            sparePartInfoDTO.setGgxh(vo.getGgxh());
+            sparePartInfoDTOS.add(sparePartInfoDTO);
+        }
         List<String> spareIds = sparePartInfoDTOS.stream().map(SparePartInfoDTO::getId).collect(Collectors.toList());
         Weekend<SbModelSpareBom> weekend = new Weekend(SbModelSpareBom.class);
         WeekendCriteria<SbModelSpareBom,Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(SbModelSpareBom::getSpareId,spareIds);
+        if (dto.isCover()) {
+            weekendCriteria.andIn(SbModelSpareBom::getSpareId, spareIds);
+        }
         weekendCriteria.andIn(SbModelSpareBom::getSbId,sbIds);
         sbModelSpareBomMapper.deleteByExample(weekend);
         List<SbModelSpareBom> boms = new ArrayList<>();