From e32165abdeeb0f7f948dcfa0f11dd9b7324ba371 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 1 Dec 2023 17:54:21 +0800 Subject: [PATCH] 1127 --- .../base/entity/PlmBmPageBaseData.java | 33 +++++++++++++++++++ .../TechnicalSpecificationController.java | 7 ++++ .../dao/TechnicalSpecificationMapper.java | 12 +++++++ .../TechnicalSpecificationServiceImpl.java | 10 ++++++ .../TechnicalSpecificationService.java | 11 +++++++ .../TechnicalSpecificationMapper.xml | 4 +++ 6 files changed, 77 insertions(+) create mode 100644 src/main/java/com/spring/modules/base/entity/PlmBmPageBaseData.java diff --git a/src/main/java/com/spring/modules/base/entity/PlmBmPageBaseData.java b/src/main/java/com/spring/modules/base/entity/PlmBmPageBaseData.java new file mode 100644 index 00000000..2566c3e2 --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/PlmBmPageBaseData.java @@ -0,0 +1,33 @@ +package com.spring.modules.base.entity; + +import org.apache.ibatis.type.Alias; + +@Alias("PlmBmPageBaseData") +public class PlmBmPageBaseData { + /** + * 部门编码 + */ + private String buNo; + + /** + * 页面名称 + */ + private String codeNo; + + public String getBuNo() { + return buNo; + } + + public void setBuNo(String buNo) { + this.buNo = buNo; + } + + public String getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } +} + diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index 16842741..0de7684e 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -328,4 +328,11 @@ public class TechnicalSpecificationController { return R.ok(); } + @PostMapping(value="/getBMPageBase") + @ResponseBody + public R getBMPageBase(@RequestBody SearchBMData data){ + String page= technicalSpecificationService.getBMPageBase(data); + return R.ok().put("row",page); + } + } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 82b29400..fb6c98da 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -6,6 +6,7 @@ import com.spring.modules.base.data.PartSubPropertiesValueData; import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData; import com.spring.modules.base.data.PlmPropertiesItemAvailableData; +import com.spring.modules.base.entity.PlmBmPageBaseData; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.project.data.PlmProjectPartData; @@ -318,4 +319,15 @@ public interface TechnicalSpecificationMapper { * @throw */ void updateBMPropertiesValue(PlmBmPropertiesValueData inData); + + /** + * @Description TODO + * @Title getBMPageBase + * @param data + * @author rq + * @date 2023/12/1 15:58 + * @return List + * @throw + */ + List getBMPageBase(SearchBMData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index f1f6009d..7b9f1122 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -7,6 +7,7 @@ import com.spring.common.utils.PageUtils; import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData; import com.spring.modules.base.data.PlmPropertiesItemAvailableData; +import com.spring.modules.base.entity.PlmBmPageBaseData; import com.spring.modules.base.entity.PlmBmPropertiesValueHeader; import com.spring.modules.base.entity.PlmPropertiesItemAvailable; import com.spring.modules.base.service.TransNoControlService; @@ -328,4 +329,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } } + @Override + public String getBMPageBase(SearchBMData data){ + List result=technicalSpecificationMapper.getBMPageBase(data); + String row=""; + for (int i = 0; i < result.size(); i++) { + row=row+result.get(i).getCodeNo()+";"; + } + return row; + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index d6a75b69..befff54f 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -264,4 +264,15 @@ public interface TechnicalSpecificationService { * @throw */ void refreshBMPageModal(SearchBMData data); + + /** + * @Description TODO + * @Title getBMPageBase + * @param data + * @author rq + * @date 2023/12/1 15:58 + * @return String + * @throw + */ + String getBMPageBase(SearchBMData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 5aec1a5a..7621d320 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -263,4 +263,8 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction, and SubCodeSeqNo=#{subCodeSeqNo} and PropertiesItemNo=#{propertiesItemNo} + + \ No newline at end of file