采购详情根据采购类型查询全部商品

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/controller/MaterialController.java

@@ -3,14 +3,17 @@ package com.jeeplus.test.materialManagement.purchase.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
 import com.jeeplus.test.materialManagement.purchase.service.MaterialService;
 import com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto;
+import com.jeeplus.test.materialManagement.wareHouse.domain.WareHouseDetailed;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author: 王强
@@ -80,4 +83,16 @@ public class MaterialController {
     public void updateStatusById(@RequestBody MaterialInfoDto dto) {
         service.updateStatusById(dto);
     }
+
+    /**
+     * 根据采购类型查询商品
+     * @param typeId
+     * @return
+     */
+    @ApiOperation(value = "根据采购类型查询商品")
+    @GetMapping("/findTradeByTypeId")
+    public ResponseEntity findTradeByTypeId(@RequestParam String typeId) {
+        List<MaterialDetailed> res = service.findTradeByTypeId(typeId);
+        return ResponseEntity.ok(res);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/mapper/MaterialDetailedMapper.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.materialManagement.purchase.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed;
+import com.jeeplus.test.materialManagement.wareHouse.domain.WareHouseDetailed;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 
 import java.util.List;
@@ -18,4 +19,7 @@ public interface MaterialDetailedMapper extends BaseMapper<MaterialDetailed> {
     List<WorkAttachmentDto> getByAttachmentId(String id);
 
     List<String> getIdByBasicId(String id);
+
+    // 根据采购类型查询商品
+    List<MaterialDetailed> getByTypeId(String typeId);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/mapper/xml/MaterialDetailedMapper.xml

@@ -26,4 +26,19 @@
     <select id="getIdByBasicId" resultType="java.lang.String">
         select a.id from material_management_pruchase_request_detailed a where a.basic_id = #{id} and a.del_flag = 0
     </select>
+
+    <select id="getByTypeId" resultType="com.jeeplus.test.materialManagement.purchase.domain.MaterialDetailed">
+        SELECT
+            id,
+            trade_name
+        FROM
+            material_management_pruchase_request_detailed
+        WHERE
+            del_flag = '0'
+            AND procurement_type = #{typeId}
+        GROUP BY
+            trade_name
+        ORDER BY
+            create_date DESC
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/service/MaterialService.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.BeanUtils;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -409,4 +410,13 @@ public class MaterialService {
     public void updateStatusById(MaterialInfoDto dto) {
         basicMapper.updateStatusById(dto.getId(), dto.getStatus());
     }
+
+    public List<MaterialDetailed> findTradeByTypeId (String typeId) {
+        if (StringUtils.isNotBlank(typeId)) {
+            List<MaterialDetailed> materialDetailedList = detailedMapper.getByTypeId(typeId);
+            return materialDetailedList;
+        } else {
+            return new ArrayList<>();
+        }
+    }
 }