From da8d96268f2d36ce2e33044834a898b0ebc9488e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Tue, 12 Sep 2023 09:09:22 +0800 Subject: [PATCH] =?UTF-8?q?2023-09-12=20plm=E6=8A=A5=E4=BB=B7=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuotationInformationController.java | 38 +++++ .../entity/QuotationInformationEntity.java | 141 ++++++++++++++++++ .../mapper/QuotationInformationMapper.java | 15 ++ .../service/QuotationInformationService.java | 12 ++ .../impl/QuotationInformationServiceImpl.java | 32 ++++ .../quotation/vo/QuotationInformationVo.java | 44 ++++++ .../customer/CustomerInformationMapper.xml | 6 +- .../quotation/QuotationInformationMapper.xml | 83 +++++++++++ 8 files changed, 368 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java create mode 100644 src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java create mode 100644 src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java create mode 100644 src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java create mode 100644 src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java create mode 100644 src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java create mode 100644 src/main/resources/mapper/quotation/QuotationInformationMapper.xml diff --git a/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java new file mode 100644 index 00000000..052f2513 --- /dev/null +++ b/src/main/java/com/spring/modules/quotation/controller/QuotationInformationController.java @@ -0,0 +1,38 @@ +package com.spring.modules.quotation.controller; + +import com.spring.common.utils.PageUtils; +import com.spring.common.utils.R; +import com.spring.modules.customer.vo.CustomerInformationVo; +import com.spring.modules.quotation.service.QuotationInformationService; +import com.spring.modules.quotation.vo.QuotationInformationVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @description: 报价信息 + * @author: fengyuan_yang + * @date: 2023/9/11 11:46 + * @param: + * @return: + **/ +@RestController +@RequestMapping("plm/quotationInformation") +public class QuotationInformationController { + + @Autowired + private QuotationInformationService quotationInformationService; + + /** + * @description: 报价信息列表 + * @author: fengyuan_yang + * @date: 2023/9/11 13:04 + * @param: [data] + * @return: com.spring.common.utils.R + **/ + @PostMapping(value="/quotationInformationSearch") + @ResponseBody + public R quotationInformationSearch(@RequestBody QuotationInformationVo data){ + PageUtils page = quotationInformationService.quotationInformationSearch(data); + return R.ok().put("page", page); + } +} diff --git a/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java b/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java new file mode 100644 index 00000000..a5c68dc8 --- /dev/null +++ b/src/main/java/com/spring/modules/quotation/entity/QuotationInformationEntity.java @@ -0,0 +1,141 @@ +package com.spring.modules.quotation.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.spring.common.utils.QueryPage; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("plm_quotation_information") +public class QuotationInformationEntity extends QueryPage implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 工厂 + **/ + private String site; + /** + * 报价单号 + **/ + private String quotationNo; + /** + * 客户编码 + **/ + private String customerNo; + /** + * 项目编码 + **/ + private String projectId; + /** + * 跟单人员 + **/ + private String tracker; + /** + * 报价人员 + **/ + private String quoter; + /** + * 状态 + **/ + private String quotationStatus; + /** + * 产品编码 + **/ + private String testPartNo; + /** + * 优先等级 + **/ + private String priorityLevel; + /** + * 要求完成日期 + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date requiredCompletionDate; + /** + * 备注 + **/ + private String remark; + /** + * 技术注意事项 + **/ + private String technicalConsiderations; + /** + * 客户负责人 + **/ + private String customerResponsiblePerson; + /** + * 客户负责人联系方式 + **/ + private String customerResponsiblePersonPhone; + /** + * 接下来的状态 + **/ + private String nextToDo; + /** + * 实际报价日期 + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date actualityQuotationDate; + /** + * 报价结果信息 + **/ + private String quotationResultInformation; + /** + * 实际提交客户日期 + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date actualitySubmissionDate; + /** + * 提交方式 + **/ + private String submissionMethod; + /** + * 提交备注 + **/ + private String submissionRemark; + /** + * 实际回复日期 + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date actualityReplyDate; + /** + * 客户确认结果 + **/ + private String confirmResults; + /** + * 客户确认人 + **/ + private String confirmBy; + /** + * 客户回复信息 + **/ + private String confirmInformation; + /** + * 创建时间 + **/ + @TableField(fill = FieldFill.INSERT) + private Date createDate; + /** + * 创建人 + **/ + private String createBy; + /** + * 更新时间 + **/ + @TableField(fill = FieldFill.UPDATE) + private Date updateDate; + /** + * 更新人 + **/ + private String updateBy; + +} diff --git a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java new file mode 100644 index 00000000..2c416532 --- /dev/null +++ b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java @@ -0,0 +1,15 @@ +package com.spring.modules.quotation.mapper; + +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.customer.entity.CustomerAddressEntity; +import com.spring.modules.quotation.entity.QuotationInformationEntity; +import com.spring.modules.quotation.vo.QuotationInformationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface QuotationInformationMapper extends BaseMapper { + IPage quotationInformationSearch(Page quotationInformationVoPage, @Param("query") QuotationInformationVo data); +} diff --git a/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java b/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java new file mode 100644 index 00000000..1f894d6c --- /dev/null +++ b/src/main/java/com/spring/modules/quotation/service/QuotationInformationService.java @@ -0,0 +1,12 @@ +package com.spring.modules.quotation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.spring.common.utils.PageUtils; +import com.spring.modules.quotation.entity.QuotationInformationEntity; +import com.spring.modules.quotation.vo.QuotationInformationVo; + +public interface QuotationInformationService extends IService { + + + PageUtils quotationInformationSearch(QuotationInformationVo data); +} diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java new file mode 100644 index 00000000..a13bdb00 --- /dev/null +++ b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java @@ -0,0 +1,32 @@ +package com.spring.modules.quotation.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.spring.common.utils.PageUtils; +import com.spring.modules.quotation.entity.QuotationInformationEntity; +import com.spring.modules.quotation.mapper.QuotationInformationMapper; +import com.spring.modules.quotation.service.QuotationInformationService; +import com.spring.modules.quotation.vo.QuotationInformationVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class QuotationInformationServiceImpl extends ServiceImpl implements QuotationInformationService { + + @Autowired + private QuotationInformationMapper quotationInformationMapper; + + /** + * @description: 报价信息列表 + * @author: fengyuan_yang + * @date: 2023/9/11 13:08 + * @param: [data] + * @return: com.spring.common.utils.PageUtils + **/ + @Override + public PageUtils quotationInformationSearch(QuotationInformationVo data) { + IPage resultList = this.quotationInformationMapper.quotationInformationSearch(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } +} diff --git a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java new file mode 100644 index 00000000..710f7498 --- /dev/null +++ b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java @@ -0,0 +1,44 @@ +package com.spring.modules.quotation.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.spring.modules.quotation.entity.QuotationInformationEntity; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class QuotationInformationVo extends QuotationInformationEntity { + /** + * 客户名称 + **/ + private String customerDesc; + /** + * 项目名称 + **/ + private String projectName; + /** + * 跟单人员名称 + **/ + private String trackerName; + /** + * 报价人员名称 + **/ + private String quoterName; + /** + * 产品名称 + **/ + private String testPartDesc; + /** + * 要求完成日期(开始) + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startDate; + /** + * 要求完成日期(结束) + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; +} diff --git a/src/main/resources/mapper/customer/CustomerInformationMapper.xml b/src/main/resources/mapper/customer/CustomerInformationMapper.xml index e24107ed..ae231929 100644 --- a/src/main/resources/mapper/customer/CustomerInformationMapper.xml +++ b/src/main/resources/mapper/customer/CustomerInformationMapper.xml @@ -22,9 +22,9 @@ create_by, update_date, update_by, - dbo.plm_Get_contactName(site, customer_no, 'Y') as contactName, - dbo.plm_Get_contactPhoneNumber(site, customer_no, 'Y') as contactPhoneNumber1, - dbo.plm_Get_addressName(site, customer_no, 'Y') as addressName + dbo.plm_get_contactName(site, customer_no, 'Y') as contactName, + dbo.plm_get_contactPhoneNumber(site, customer_no, 'Y') as contactPhoneNumber1, + dbo.plm_get_addressName(site, customer_no, 'Y') as addressName FROM plm_customer_information site = #{query.site} diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml new file mode 100644 index 00000000..9d38166a --- /dev/null +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -0,0 +1,83 @@ + + + + + + + +