diff --git a/src/main/java/com/spring/common/utils/QueryPage.java b/src/main/java/com/spring/common/utils/QueryPage.java index e6996a22..353f387a 100644 --- a/src/main/java/com/spring/common/utils/QueryPage.java +++ b/src/main/java/com/spring/common/utils/QueryPage.java @@ -9,6 +9,11 @@ public class QueryPage { @TableField(exist = false) private int page; + @TableField(exist = false) + private int limit2; + @TableField(exist = false) + private int page2; + public int getLimit() { return limit; } @@ -24,4 +29,20 @@ public class QueryPage { public void setPage(int page) { this.page = page; } + + public int getLimit2() { + return limit2; + } + + public void setLimit2(int limit2) { + this.limit2 = limit2; + } + + public int getPage2() { + return page2; + } + + public void setPage2(int page2) { + this.page2 = page2; + } } diff --git a/src/main/java/com/spring/modules/project/controller/ProjectController.java b/src/main/java/com/spring/modules/project/controller/ProjectController.java index a577de5a..b6cc8933 100644 --- a/src/main/java/com/spring/modules/project/controller/ProjectController.java +++ b/src/main/java/com/spring/modules/project/controller/ProjectController.java @@ -191,8 +191,8 @@ public class ProjectController { @PostMapping(value="/getProjectInfoPartList") @ResponseBody public R getProjectInfoPartList(@RequestBody PlmProjectInfoData data){ - List rows = projectService.getProjectInfoPartList(data); - return R.ok().put("rows", rows); + PageUtils page = projectService.getProjectInfoPartList(data); + return R.ok().put("page", page); } /** diff --git a/src/main/java/com/spring/modules/project/dao/ProjectDao.java b/src/main/java/com/spring/modules/project/dao/ProjectDao.java index 4a9c60cb..70b34012 100644 --- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java +++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java @@ -122,7 +122,7 @@ public interface ProjectDao extends BaseMapper { * @return List * @throw */ - List getProjectInfoPartList(PlmProjectInfoData data); + IPage getProjectInfoPartList(Page bomManagementVoPage, @Param("query") PlmProjectInfoData data); PlmProjectPartData checkProjectInfoPartList(PlmProjectPartData data); diff --git a/src/main/java/com/spring/modules/project/service/ProjectService.java b/src/main/java/com/spring/modules/project/service/ProjectService.java index 0f0a12c9..545d6faa 100644 --- a/src/main/java/com/spring/modules/project/service/ProjectService.java +++ b/src/main/java/com/spring/modules/project/service/ProjectService.java @@ -124,7 +124,7 @@ public interface ProjectService { * @return List * @throw */ - List getProjectInfoPartList(PlmProjectInfoData data); + PageUtils getProjectInfoPartList(PlmProjectInfoData data); /** * @Description TODO diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java index 5c64b73f..8e1d5af4 100644 --- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java @@ -246,8 +246,9 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public List getProjectInfoPartList(PlmProjectInfoData data){ - return projectDao.getProjectInfoPartList(data); + public PageUtils getProjectInfoPartList(PlmProjectInfoData data){ + IPage projectInfoPartList = projectDao.getProjectInfoPartList(new Page(data.getPage2(), data.getLimit2()), data); + return new PageUtils(projectInfoPartList); } @Override diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index 1fd91cfa..05292a5d 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -294,7 +294,7 @@ LEFT JOIN part as b on a.site = b.site and a.test_part_no = b.part_no left join plm_project_info as c on a.site = c.site and a.project_id = c.project_id left join plm_customer_part_info as d on c.site = d.site and c.customer_id = d.customer_no and a.test_part_no = d.part_no - where a.site = #{site} and a.project_id = #{projectId} + where a.site = #{query.site} and a.project_id = #{query.projectId} @@ -608,7 +608,10 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_ pci.potential_revenue_of_year, pci.customer_status, pci.customer_description, - dbo.plm_get_dictDataLabel('plm_customer_information_important_customer', pci.important_customer, ppi.site) as important_customer + dbo.plm_get_dictDataLabel('plm_customer_information_important_customer', pci.important_customer, ppi.site) as important_customer, + pci.customer_industry, + pci.customer_group, + pci.customer_type from plm_project_info ppi left join dbo.plm_customer_information pci on ppi.site = pci.site and ppi.final_customer_id = pci.customer_no where ppi.site = #{site}