优化

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbModelSpareBomMapper.java

@@ -2,6 +2,7 @@ package com.platform.dao.mapper.sb;
 
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
@@ -25,6 +26,8 @@ import java.util.List;
  */
 @Component
 public interface SbModelSpareBomMapper extends MyMapper<SbModelSpareBom> {
+    List<SbModelSpareBomVO> getSpareList(SbInfoDTO sbInfoDTO);
+
     void updateBatch2(@Param("list") List<String> list,@Param("oldOrNew") Integer oldOrNew,@Param("sbId") String sbId);
     /**
      * 分页查询

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSpareBomVO.java

@@ -0,0 +1,62 @@
+package com.platform.dao.vo.export.sb;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Description 设备基础信息导出VO
+ * @Author liuyu
+ * @Date 2021-04-21 21:05:46
+ * @Version Copyright (c) 2021,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportSpareBomVO implements Serializable {
+
+//    /**
+//     * 主键
+//     */
+//    @Excel(name = "主键")
+//    private String id;
+    /**
+     * 设备编号
+     */
+    @Excel(name = "备件编号",orderNum = "1")
+    private String no;
+    /**
+     * 设备位号
+     */
+    @Excel(name = "备件名称",orderNum = "1")
+    private String spareName;
+    /**
+     * 生产商
+     */
+    @Excel(name = "备件规格",orderNum = "1")
+    private String ggxh;
+    /**
+     * 设备名称
+     */
+    @Excel(name = "备件数量",orderNum = "1")
+    private Integer num;
+    /**
+     * 是否强检1：强检，2：非强检
+     */
+    @Excel(name = "设备名称",orderNum = "1")
+    private String sbName;
+    /**
+     * 设备名称
+     */
+    @Excel(name = "设备位号",orderNum = "1")
+    private String positionNo;
+    /**
+     * 设备位号
+     */
+    @Excel(name = "设备位置",orderNum = "1")
+    private String positionName;
+
+
+}

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

@@ -23,6 +23,14 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbModelSpareBomVO extends BaseVO implements Serializable {
+    private Integer status;
+    private String sbName;
+
+    private String positionNo;
+
+    private String positionName;
+
+
     /**
      * 0:未知，1：新厂，2：老厂
      */

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

@@ -155,4 +155,24 @@
         </foreach>
             </if>
     </update>
+
+    <select id="getSpareList" parameterType="com.platform.dao.dto.sb.SbInfoDTO"
+            resultType="com.platform.dao.vo.sb.SbModelSpareBomVO">
+        SELECT sb.id as id,sb.status as status, sb.name AS sbName,sb.position_no AS positionNo,position.name AS positionName,bom.num AS num,bom.spare_name AS spareName,bom.ggxh AS ggxh,bom.no AS no FROM t_sb_info sb
+LEFT JOIN t_sb_position POSITION ON sb.position_id = position.id
+inner JOIN t_sb_model_spare_bom bom ON bom.sb_id = sb.id
+<where>
+    <if test="typeId!=null and typeId!=''">
+        and sb.type_id = #{typeId}
+    </if>
+    <if test="positionId!=null and postionId!=''">
+        and sb.postion_id = #{positionId}
+    </if>
+    <if test="keyword!=null and keyword!=''">
+        and (sb.name like concat('%',#{keyword},'%')
+        or sb.position_no like concat('%',#{keyword},'%')
+        bom.spare_name like concat('%',#{keyword},'%'))
+    </if>
+</where>
+    </select>
 </mapper>

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

@@ -10,6 +10,7 @@ import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.lubricationmanage.LubricationPlanStandardRelationDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.entity.lubricationmanage.LubricationPlanStandardRelation;
@@ -21,8 +22,11 @@ import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.lubricationmanage.ExportLubricationPlanStandardRelationVO;
+import com.platform.dao.vo.export.sb.ExportSbInfoVO;
 import com.platform.dao.vo.export.sb.ExportSbModelSpareBomVO;
+import com.platform.dao.vo.export.sb.ExportSpareBomVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.lubricationmanage.LubricationPlanStandardRelationService;
@@ -327,4 +331,22 @@ public class SbModelSpareBomController {
         return new R<>();
     }
 
+
+    @SysLog("备件列表")
+    @GetMapping("/spare/getSpareList")
+    public R getSpareList(SbInfoDTO sbInfoDTO,@RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+
+        AbstractPageResultBean<SbModelSpareBomVO> list =  sbModelSpareBomService.getSpareList(sbInfoDTO,pageNum,pageSize);
+        return new R<>(list);
+    }
+
+    @GetMapping("/export/spareBom")
+    @SysLog("备件bom信息导出")
+//    @PreAuthorize("@pms.hasPermission('sb-infos-export')")
+    public void export(HttpServletResponse response, SbInfoDTO sbInfoDTO,@RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        AbstractPageResultBean<SbModelSpareBomVO> list =  sbModelSpareBomService.getSpareList(sbInfoDTO,pageNum,pageSize);
+
+        ExcelUtil.exportResponseDict(response, ExportSpareBomVO.class, BeanConverterUtil.copyListProperties(list.getRows(), ExportSpareBomVO.class), "备件bom基础信息");
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.platform.service.sb;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
 import com.platform.dao.dto.lubricationmanage.LubricationPlanStandardRelationDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbModelDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
@@ -26,6 +27,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SbModelSpareBomService extends IBaseService<SbModelSpareBom, SbModelSpareBomDTO> {
+ AbstractPageResultBean<SbModelSpareBomVO> getSpareList(SbInfoDTO sbInfoDTO,Integer pageNum,Integer pageSize);
 
  void synchronousAdd(SbModelSpareBomDTO dto);
 

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

@@ -10,10 +10,12 @@ import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.SecurityUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
+import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
 import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
 import com.platform.dao.dto.part.PartInfoDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
@@ -65,6 +67,12 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
     private SbModelSpareBomMapper sbModelSpareBomMapper;
     private SbInfoMapper sbInfoMapper;
 
+    @Override
+    public AbstractPageResultBean<SbModelSpareBomVO> getSpareList(SbInfoDTO sbInfoDTO,Integer pageNum,Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        return new MyVOPage<>(mapper.getSpareList(sbInfoDTO));
+    }
+
     @Override
     public void synchronousAdd(SbModelSpareBomDTO dto) {
         List<String> sbIds = dto.getSbIds();