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 6b203b27..348ab358 100644 --- a/src/main/java/com/spring/modules/project/controller/ProjectController.java +++ b/src/main/java/com/spring/modules/project/controller/ProjectController.java @@ -7,6 +7,7 @@ import com.spring.modules.factory.entity.Site; import com.spring.modules.factory.entity.vo.SiteVo; import com.spring.modules.factory.service.SiteService; import com.spring.modules.project.data.*; +import com.spring.modules.project.entity.PlmProjectInfo; import com.spring.modules.project.service.ProjectService; import com.spring.modules.sampleManagement.entity.BiAddress; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,22 @@ public class ProjectController { return R.ok().put("page", page); } + /** + * @Description 查询项目集合 + * @date 2023/12/22 + * @author zelian_wu + * @return + */ + @GetMapping("/searchProjectInfoList") + @ResponseBody + public R searchProjectInfoList(String site, + String projectId, + String projectName, + String customerId){ + List rows = projectService.projectInfoListSearch(site,projectId,projectName,customerId); + return R.ok().put("rows",rows); + } + @GetMapping("/getProjectPartList") @ResponseBody public R getProjectPartList(@RequestParam("site") String site, 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 40424561..30ca476a 100644 --- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java +++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java @@ -1,8 +1,10 @@ package com.spring.modules.project.dao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.modules.project.data.*; +import com.spring.modules.project.entity.PlmProjectInfo; import com.spring.modules.project.entity.PlmProjectTeam; import com.spring.modules.sampleManagement.entity.BiAddress; import org.apache.ibatis.annotations.Mapper; @@ -13,7 +15,7 @@ import java.util.List; @Mapper @Repository -public interface ProjectDao { +public interface ProjectDao extends BaseMapper { /** * @Description 查询项目清单 diff --git a/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java b/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java index 9737c07b..852a9a9b 100644 --- a/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java +++ b/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java @@ -1,5 +1,6 @@ package com.spring.modules.project.entity; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.spring.common.utils.PageUtils; import com.spring.common.utils.QueryPage; @@ -7,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +@TableName("plm_project_info") public class PlmProjectInfo extends QueryPage { /** * 项目 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 2790ec10..05f9eaa2 100644 --- a/src/main/java/com/spring/modules/project/service/ProjectService.java +++ b/src/main/java/com/spring/modules/project/service/ProjectService.java @@ -2,6 +2,7 @@ package com.spring.modules.project.service; import com.spring.common.utils.PageUtils; import com.spring.modules.project.data.*; +import com.spring.modules.project.entity.PlmProjectInfo; import com.spring.modules.sampleManagement.entity.BiAddress; import java.util.List; @@ -19,6 +20,18 @@ public interface ProjectService { */ PageUtils projectInfoSearch(PlmProjectInfoData inData); + + /** + * @Description 查询项目集合 + * @date 2023/12/22 + * @author zelian_wu + * @return + */ + List projectInfoListSearch(String site, + String projectId, + String projectName, + String customerId); + /** * @Description TODO * @Title searchOperatorWithSite 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 4631a6b6..1e3d0138 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 @@ -1,11 +1,15 @@ package com.spring.modules.project.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.common.utils.PageUtils; import com.spring.modules.base.service.TransNoControlService; import com.spring.modules.project.dao.ProjectDao; import com.spring.modules.project.data.*; +import com.spring.modules.project.entity.PlmProjectInfo; import com.spring.modules.project.entity.PlmProjectTeam; import com.spring.modules.project.entity.PlmUserRole; import com.spring.modules.project.service.ProjectService; @@ -15,6 +19,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; @@ -33,6 +38,22 @@ public class ProjectServiceImpl implements ProjectService { return new PageUtils(resultList); } + @Override + public List projectInfoListSearch(String site, + String projectId, + String projectName, + String customerId){ + LambdaQueryChainWrapper wrapper = new LambdaQueryChainWrapper<>(projectDao); + wrapper.eq(PlmProjectInfo::getSite,site).eq(PlmProjectInfo::getCustomerId,customerId); + if (StringUtils.hasText(projectId)) { + wrapper.eq(PlmProjectInfo::getProjectId,projectId); + } + if (StringUtils.hasText(projectName)) { + wrapper.like(PlmProjectInfo::getProjectName,projectName); + } + return wrapper.list(); + } + @Override public List searchOperatorWithSite(PlmOperatorData data){ return projectDao.searchOperatorWithSite(data); diff --git a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java index 76cfb5e0..1b29e8a0 100644 --- a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java +++ b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java @@ -41,7 +41,7 @@ public class QuotationInformationController { @PostMapping(value="/quotationInformationSearch") @ResponseBody public R quotationInformationSearch(@RequestBody QuotationInformationVo data) { - PageUtils page = quotationInformationService.quotationInformationSearch(data); + PageUtils page = quotationInformationService.quotationInformationSearch(data); return R.ok().put("page", page); } diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index ac7d7ff9..8dc7dd6b 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -82,6 +82,7 @@ AND #{query.endDate} >= required_completion_date + order by create_date desc @@ -136,6 +137,8 @@ ppp.site, ppp.test_part_no, ppp.part_name, + ppp.part_desc, + ppp.part_type, ppp.project_id, ppi.project_name, ppi.customer_id as customerNo, @@ -144,6 +147,9 @@ LEFT JOIN plm_project_info as ppi on ppp.site = ppi.site and ppp.project_id = ppi.project_id ppp.site = #{site} + + AND ppp.project_id = #{projectId} + AND ppp.test_part_no LIKE '%' + #{testPartNo}+'%'