Browse Source

first

master
ruanqi 2 years ago
parent
commit
5169a75e2f
  1. 69
      src/main/java/com/spring/modules/project/data/TechnicalCustomerInfoData.java
  2. 8
      src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
  3. 12
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  4. 6
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  5. 12
      src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
  6. 11
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

69
src/main/java/com/spring/modules/project/data/TechnicalCustomerInfoData.java

@ -0,0 +1,69 @@
package com.spring.modules.project.data;
import org.apache.ibatis.type.Alias;
@Alias("TechnicalCustomerInfoData")
public class TechnicalCustomerInfoData {
private Integer id;
private String customerId;
private String customerName;
private String customerDesc;
private String customerRemark;
private String remark;
private String finalCustomerId;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getCustomerId() {
return customerId;
}
public void setCustomerId(String customerId) {
this.customerId = customerId;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getCustomerDesc() {
return customerDesc;
}
public void setCustomerDesc(String customerDesc) {
this.customerDesc = customerDesc;
}
public String getCustomerRemark() {
return customerRemark;
}
public void setCustomerRemark(String customerRemark) {
this.customerRemark = customerRemark;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getFinalCustomerId() {
return finalCustomerId;
}
public void setFinalCustomerId(String finalCustomerId) {
this.finalCustomerId = finalCustomerId;
}
}

8
src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@ -5,6 +5,7 @@ package com.spring.modules.sampleManagement.controller;
import com.spring.common.utils.PageUtils;
import com.spring.common.utils.R;
import com.spring.modules.project.data.PlmProjectInfoData;
import com.spring.modules.project.data.TechnicalCustomerInfoData;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
import com.spring.modules.sampleManagement.service.TechnicalSpecificationService;
@ -64,5 +65,12 @@ public class TechnicalSpecificationController {
return R.ok().put("rows", list);
}
@PostMapping(value="/getTechnicalCustomerInfoData")
@ResponseBody
public R getTechnicalCustomerInfoData(@RequestBody TechnicalCustomerInfoData data){
TechnicalCustomerInfoData out = technicalSpecificationService.getTechnicalCustomerInfoData(data);
return R.ok().put("row", out);
}
}

12
src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@ -3,6 +3,7 @@ package com.spring.modules.sampleManagement.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.spring.modules.project.data.PlmProjectInfoData;
import com.spring.modules.project.data.TechnicalCustomerInfoData;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
import org.apache.ibatis.annotations.Mapper;
@ -63,4 +64,15 @@ public interface TechnicalSpecificationMapper {
* @throw
*/
List<String> searchTechnicalSpecificationTeamStr(PlmTechnicalSpecificationTeamData data);
/**
* @Description 技术参数卡客户页签查询
* @Title getTechnicalCustomerInfoData
* @param inData
* @author rq
* @date 2023/9/27 15:55
* @return TechnicalCustomerInfoData
* @throw
*/
TechnicalCustomerInfoData getTechnicalCustomerInfoData(TechnicalCustomerInfoData inData);
}

6
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -7,6 +7,7 @@ import com.spring.modules.base.service.TransNoControlService;
import com.spring.modules.project.data.PlmProjectContactData;
import com.spring.modules.project.data.PlmProjectInfoData;
import com.spring.modules.project.data.PlmUserRoleData;
import com.spring.modules.project.data.TechnicalCustomerInfoData;
import com.spring.modules.project.entity.PlmProjectTeam;
import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
@ -91,4 +92,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
return technicalSpecificationMapper.searchTechnicalSpecificationTeamStr(data);
}
@Override
public TechnicalCustomerInfoData getTechnicalCustomerInfoData(TechnicalCustomerInfoData inData){
return technicalSpecificationMapper.getTechnicalCustomerInfoData(inData);
}
}

12
src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@ -2,6 +2,7 @@ package com.spring.modules.sampleManagement.service;
import com.spring.common.utils.PageUtils;
import com.spring.modules.project.data.PlmProjectInfoData;
import com.spring.modules.project.data.TechnicalCustomerInfoData;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
@ -41,4 +42,15 @@ public interface TechnicalSpecificationService {
* @throw
*/
List<String> searchTechnicalSpecificationTeamStr(PlmTechnicalSpecificationTeamData data);
/**
* @Description 技术参数卡客户页签查询
* @Title getTechnicalCustomerInfoData
* @param inData
* @author rq
* @date 2023/9/27 15:55
* @return TechnicalCustomerInfoData
* @throw
*/
TechnicalCustomerInfoData getTechnicalCustomerInfoData(TechnicalCustomerInfoData inData);
}

11
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@ -33,8 +33,8 @@
<insert id="saveTechnicalSpecificationSheet">
insert into plm_technical_specification_sheet(site,code_no,proofing_no,project_id,test_part_no,status,rev_no,ECN_flag,ECN_no,ECN_address,remark,
create_date,create_by) values (#{site},#{codeNo},#{proofingNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress}
,#{remark},GetDate(),#{createBy})
create_date,create_by) values (#{site},#{codeNo},#{proofingNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress}
,#{remark},GetDate(),#{createBy})
</insert>
<insert id="saveTechnicalSpecificationTeams">
@ -55,4 +55,11 @@ create_date,create_by) values (#{site},#{codeNo},#{proofingNo},#{projectId},#{te
select operator_id from plm_technicalSpecification_team where type=#{type} and site=#{site} and code_no=#{codeNo}
</select>
<select id="getTechnicalCustomerInfoData" resultType="TechnicalCustomerInfoData">
select a.id,b.customer_id,c.customer_desc as customerName,c.remark as customerDesc ,b.customer_Remark,b.remark
from plm_technical_specification_sheet a left join plm_project_info b on a.site=b.site and a.project_id=b.project_id
left join plm_customer_information c on b.site=c.site and b.customer_id=c.customer_no where a.id=#{id}
</select>
</mapper>
Loading…
Cancel
Save