优化

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreDetailDTO.java

@@ -23,6 +23,8 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailDTO extends BaseDTO implements Serializable {
+    private String repairUserId;
+
     private String repairFormId;//关联维修工单
 
     private Integer autoId;

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreDetailMapper.java

@@ -17,6 +17,7 @@ import java.util.List;
  */
 @Component
 public interface OutStoreDetailMapper extends MyMapper<OutStoreDetail> {
+    List<OutStoreDetailVO> getSpareList(OutStoreDetailDTO detailDTO);
     /**
      * 分页查询
      * @param dto

platform-dao/src/main/resources/mapper/store/OutStoreDetailMapper.xml

@@ -220,4 +220,18 @@ outstoredetail.project_second_name,
             </if>
         </where>
     </select>
+
+    <select id="getSpareList" parameterType="com.platform.dao.dto.store.OutStoreDetailDTO"
+            resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
+        select * from t_out_store_detail detail left join t_out_store_form form on
+        form.id = detail.out_id
+        <where>
+            <if test="repairFormId!=null and repairFormId!=''">
+                and form.pick_id = #{repairFormId}
+            </if>
+            <if test="repairUserId!=null and repairUserId!=''">
+                and form.created_user_id = #{repairUserId}
+            </if>
+        </where>
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/store/OutStoreDetailController.java

@@ -136,4 +136,15 @@ public class OutStoreDetailController {
     ExcelUtil.exportResponseDict(response, ExportOutStoreDetailVO.class, BeanConverterUtil.copyListProperties(list, ExportOutStoreDetailVO.class), "出库详情");
   }
 
+  /**
+   * 获取领用列表
+   *
+   * @param outStoreDetailDTO 出库详情DTO
+   * @return R
+   */
+  @GetMapping("/getSpareList")
+  public R getSpareList(OutStoreDetailDTO outStoreDetailDTO) {
+    return new R<>(outStoreDetailService.getSpareList(outStoreDetailDTO));
+  }
+
 }

platform-service/src/main/java/com/platform/service/store/OutStoreDetailService.java

@@ -14,6 +14,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface OutStoreDetailService extends IBaseService<OutStoreDetail, OutStoreDetailDTO> {
+    List<OutStoreDetailVO> getSpareList(OutStoreDetailDTO detailDTO);
 
    /**
     * 批量删除

platform-service/src/main/java/com/platform/service/store/impl/OutStoreDetailServiceImpl.java

@@ -42,6 +42,12 @@ public class OutStoreDetailServiceImpl extends BaseServiceImpl<OutStoreDetailMap
     private SysDeptService sysDeptService;
     private SysDeptMapper deptMapper;
     private SysUserRoleService sysUserRoleService;
+
+    @Override
+    public List<OutStoreDetailVO> getSpareList(OutStoreDetailDTO detailDTO) {
+        return mapper.getSpareList(detailDTO);
+    }
+
     @Override
     public int batchDelete(List<String> ids) {
         String roleStr = sysUserRoleService.getRoleCodesByUserId();