优化

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

@@ -82,6 +82,7 @@ public class SbModelSpareBomDTO extends BaseDTO implements Serializable {
     private Integer periodType;
     /**
      * 备件id
+     * =-备件名称
      */
     private String spareId;
     /**
@@ -123,4 +124,9 @@ public class SbModelSpareBomDTO extends BaseDTO implements Serializable {
 
     private Integer isSpecial;
 
+    // 新增字段
+    private String no; // 备件编码
+
+    private String ggxh; // 备件规格
+
 }

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartUsedDTO.java

@@ -159,4 +159,5 @@ public class SparePartUsedDTO extends BaseDTO implements Serializable {
 
     private String no; // 备件编码
 
+    private String ggxh; // 规格型号
 }

platform-dao/src/main/java/com/platform/dao/entity/sb/SbModelSpareBom.java

@@ -109,5 +109,6 @@ public class SbModelSpareBom implements Serializable {
     private String spareName; // 备件名称
     private String ggxh;  // 规格型号
     private Integer sparePeriod; // 备件寿命期限（天）
+    private String no; // 备件编码
 
 }

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

@@ -60,7 +60,7 @@
     <select id="selectLongYanVOList" parameterType="com.platform.dao.dto.store.SpareStoreDTO"
             resultType="com.platform.dao.vo.query.store.SpareStoreVO">
         select
-        spare.name as spareName,spare.no as no,spare.ggxh as ggxh from t_sb_model_spare_bom bom join t_spare_part_info spare on bom.spare_id = spare.id
+        bom.spare_name as spareName,bom.no as no,bom.ggxh as ggxh from t_sb_model_spare_bom bom
         <where>
             <if test="spareId != null">
                 and bom.spare_id = #{spareId}

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

@@ -109,7 +109,7 @@ public class SbModelSpareBomController {
     public R save(@Validated({AddGroup.class}) @RequestBody List<SbModelSpareBomDTO> sbModelSpareBomDTOList) throws Exception {
         for(SbModelSpareBomDTO sbModelSpareBomDTO:sbModelSpareBomDTOList ){
             SbModelSpareBomDTO d = new SbModelSpareBomDTO();
-            d.setSpareId(sbModelSpareBomDTO.getSpareId());
+            d.setNo(sbModelSpareBomDTO.getNo());
             if(StringUtils.isNotBlank(sbModelSpareBomDTO.getSbId())){
                 d.setSbId(sbModelSpareBomDTO.getSbId());
             }
@@ -238,8 +238,9 @@ public class SbModelSpareBomController {
   @SysLog("查询设备型号bom")
   @GetMapping("model/{modelId}")
  public R selectSpareInfoListByModelId(@PathVariable String modelId) {
-    List<SparePartInfoVO> list =  sparePartInfoService.selectSpareInfoListByModelId(modelId);
-    return new R<>(list);
+      SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
+      dto.setModelId(modelId);
+      return new R<>(sbModelSpareBomService.getModelListByDTO(dto));
   }
 
     /**