2024-10-21

src/main/java/com/spring/modules/project/controller/ProjectController.java

@@ -57,13 +57,10 @@ public class ProjectController {
         return R.ok().put("rows",rows);
     }
 
-    @GetMapping("/getProjectPartList")
+    @PostMapping("/getProjectPartList")
     @ResponseBody
-    public R getProjectPartList(@RequestParam("site") String site,
-                                String testPartNo,
-                                String partDesc,
-                                String projectId){
-        List<PlmProjectPartData> rows  = projectService.getProjectPartList(site,testPartNo,partDesc,projectId);
+    public R getProjectPartList(@RequestBody PlmProjectPartData data){
+        List<PlmProjectPartData> rows  = projectService.getProjectPartList(data);
         return R.ok().put("rows", rows);
     }
     @GetMapping("/getProjectPart")

src/main/java/com/spring/modules/project/dao/ProjectDao.java

@@ -213,10 +213,7 @@ public interface ProjectDao extends BaseMapper<PlmProjectInfo> {
      */
     PlmUserRoleData getProjectUserRole(PlmUserRoleData data);
 
-    List<PlmProjectPartData> getProjectPartList(@Param("site") String site,
-                                                @Param("testPartNo") String testPartNo,
-                                                @Param("partDesc") String partDesc,
-                                                @Param("projectId") String projectId);
+    List<PlmProjectPartData> getProjectPartList(PlmProjectPartData data);
 
     List<PlmProjectPartData> getProjectPart(@Param("site") String site,
                                                 @Param("testPartNo") String testPartNo);

src/main/java/com/spring/modules/project/service/ProjectService.java

@@ -191,7 +191,7 @@ public interface ProjectService {
     PlmUserRoleData getProjectUserRole(PlmUserRoleData data);
 
 
-    List<PlmProjectPartData> getProjectPartList(String site,String testPartNo,String partDesc,String projectId);
+    List<PlmProjectPartData> getProjectPartList(PlmProjectPartData data);
     List<PlmProjectPartData> getProjectPartList(String site,String testPartNo);
 
     List<PlmProjectContactData> getPlmProjectContactString2(PlmProjectInfoData data);

src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

@@ -296,8 +296,8 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public List<PlmProjectPartData> getProjectPartList(String site,String testPartNo,String partDesc,String projectId) {
-        return projectDao.getProjectPartList(site,testPartNo,partDesc,projectId);
+    public List<PlmProjectPartData> getProjectPartList(PlmProjectPartData data) {
+        return projectDao.getProjectPartList(data);
     }
     @Override
     public List<PlmProjectPartData> getProjectPartList(String site,String testPartNo) {

src/main/resources/mapper/project/ProjectDao.xml

@@ -436,14 +436,20 @@
     left join plm_project_info ppi on vpp.site = ppi.site and vpp.project_id = ppi.project_id
     left join plm_customer_part_info pcpi on vpp.site = pcpi.site and ppi.customer_id = pcpi.customer_no and vpp.test_part_no = pcpi.part_no
     where vpp.site = #{site}
+    <if test="projectId != null and projectId != ''">
+        and vpp.project_id = #{projectId}
+    </if>
     <if test="testPartNo != null and testPartNo != ''">
         and vpp.test_part_no like #{testPartNo}
     </if>
     <if test="partDesc != null and partDesc != ''">
         and vpp.part_desc like #{partDesc}
     </if>
-    <if test="projectId != null and projectId != ''">
-        and vpp.project_id = #{projectId}
+    <if test="finalPartNo != null and finalPartNo != ''">
+        and vpp.final_part_no like #{finalPartNo}
+    </if>
+    <if test="customerPartNo != null and customerPartNo != ''">
+        and pcpi.customer_part_no like #{customerPartNo}
     </if>
 </select>
     <select id="getProjectPart" resultType="com.spring.modules.project.data.PlmProjectPartData">