From ddfaee7aa43d03483eefca4e34043985bf426aa6 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 1 Apr 2025 09:16:38 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-01=20=E8=AE=BE=E5=A4=87=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/EamController.java | 49 +++++++++++ .../pms/entity/EamFeedMatterEntity.java | 87 +++++++++++++++++++ .../pms/mapper/EamFeedMatterMapper.java | 10 +++ .../pms/service/EamFeedMatterService.java | 15 ++++ .../Impl/EamFeedMatterServiceImpl.java | 42 +++++++++ 5 files changed, 203 insertions(+) create mode 100644 src/main/java/com/xujie/sys/modules/pms/entity/EamFeedMatterEntity.java create mode 100644 src/main/java/com/xujie/sys/modules/pms/mapper/EamFeedMatterMapper.java create mode 100644 src/main/java/com/xujie/sys/modules/pms/service/EamFeedMatterService.java create mode 100644 src/main/java/com/xujie/sys/modules/pms/service/Impl/EamFeedMatterServiceImpl.java diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java index f56688b6..72dcc32c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java @@ -8,8 +8,10 @@ import com.xujie.sys.modules.base.data.BuData; import com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo; import com.xujie.sys.modules.oss.entity.SysOssEntity; import com.xujie.sys.modules.pms.data.*; +import com.xujie.sys.modules.pms.entity.EamFeedMatterEntity; import com.xujie.sys.modules.pms.entity.EamWorkOrderCoreComponentsData; import com.xujie.sys.modules.pms.entity.vo.PartSpareVo; +import com.xujie.sys.modules.pms.service.EamFeedMatterService; import com.xujie.sys.modules.pms.service.EamService; import com.xujie.sys.modules.pms.util.ResponseData; import com.xujie.sys.modules.sift.utils.QueryCriteriaConstructorDefault; @@ -41,6 +43,9 @@ public class EamController { @Autowired private EamService eamService; + @Autowired + private EamFeedMatterService eamFeedMatterService; + @Autowired private QueryCriteriaConstructorDefault queryCriteriaConstructorDefault; @@ -2349,4 +2354,48 @@ public class EamController { return R.ok().put("page", page); } + /** + * 查询维修事项 + * @param data + * @return + */ + @PostMapping("/searchFeedMatterRecord") + public R searchFeedMatterRecord(@RequestBody EamFeedMatterEntity data){ + List list = eamFeedMatterService.searchFeedMatterRecord(data); + return R.ok().put("rows", list); + } + + /** + * 新增维修事项 + * @param inData + * @return + */ + @PostMapping("/saveFeedMatter") + public R saveFeedMatter(@RequestBody EamFeedMatterEntity inData){ + eamFeedMatterService.saveFeedMatter(inData); + return R.ok(); + } + + /** + * 编辑维修事项 + * @param inData + * @return + */ + @PostMapping("/updateFeedMatter") + public R updateFeedMatter(@RequestBody EamFeedMatterEntity inData){ + eamFeedMatterService.updateFeedMatter(inData); + return R.ok(); + } + + /** + * 删除维修事项 + * @param inData + * @return + */ + @PostMapping("/deleteFeedMatter") + public R deleteFeedMatter(@RequestBody EamFeedMatterEntity inData){ + eamFeedMatterService.deleteFeedMatter(inData); + return R.ok(); + } + } diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/EamFeedMatterEntity.java b/src/main/java/com/xujie/sys/modules/pms/entity/EamFeedMatterEntity.java new file mode 100644 index 00000000..ee3e99f5 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/entity/EamFeedMatterEntity.java @@ -0,0 +1,87 @@ +package com.xujie.sys.modules.pms.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xujie.sys.common.utils.QueryPage; +import com.xujie.sys.modules.part.entity.AgentInformationEntity; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName("eam_feed_matter_record") +public class EamFeedMatterEntity extends QueryPage implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(type= IdType.AUTO) + private Long id; + /** + * 工厂 + **/ + private String site; + /** + * BU + */ + private String buNo; + /** + * 维修反馈编码 + **/ + private String feedBackId; + /** + * 事项描述 + **/ + private String eventDesc; + /** + * 状态 + **/ + private String status; + /** + * 计划完成日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date plannedExecutionDate; + /** + * 实际完成日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date actualExecutionDate; + /** + * 跟踪人员 + */ + private String trackingPersonnel; + /** + * 创建时间 + **/ + @TableField(fill = FieldFill.INSERT) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createDate; + /** + * 创建人 + **/ + private String createBy; + /** + * 更新时间 + **/ + @TableField(fill = FieldFill.UPDATE) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateDate; + /** + * 更新人 + **/ + private String updateBy; + /** + * 数据集 + */ + @TableField(exist = false) + private List informationList; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamFeedMatterMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamFeedMatterMapper.java new file mode 100644 index 00000000..e38be967 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamFeedMatterMapper.java @@ -0,0 +1,10 @@ +package com.xujie.sys.modules.pms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xujie.sys.modules.part.entity.PartInformationEntity; +import com.xujie.sys.modules.pms.entity.EamFeedMatterEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface EamFeedMatterMapper extends BaseMapper { +} diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamFeedMatterService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamFeedMatterService.java new file mode 100644 index 00000000..b1915e45 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamFeedMatterService.java @@ -0,0 +1,15 @@ +package com.xujie.sys.modules.pms.service; + +import com.xujie.sys.modules.pms.entity.EamFeedMatterEntity; + +import java.util.List; + +public interface EamFeedMatterService { + List searchFeedMatterRecord(EamFeedMatterEntity data); + + void saveFeedMatter(EamFeedMatterEntity inData); + + void updateFeedMatter(EamFeedMatterEntity inData); + + void deleteFeedMatter(EamFeedMatterEntity inData); +} diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamFeedMatterServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamFeedMatterServiceImpl.java new file mode 100644 index 00000000..8625e25f --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamFeedMatterServiceImpl.java @@ -0,0 +1,42 @@ +package com.xujie.sys.modules.pms.service.Impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xujie.sys.modules.pms.entity.EamFeedMatterEntity; +import com.xujie.sys.modules.pms.mapper.EamFeedMatterMapper; +import com.xujie.sys.modules.pms.service.EamFeedMatterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class EamFeedMatterServiceImpl extends ServiceImpl implements EamFeedMatterService { + + @Autowired + private EamFeedMatterMapper eamFeedMatterMapper; + + @Override + public List searchFeedMatterRecord(EamFeedMatterEntity data) { + List list = eamFeedMatterMapper.selectList(new LambdaQueryWrapper() + .eq(EamFeedMatterEntity::getSite, data.getSite()) + .eq(EamFeedMatterEntity::getBuNo, data.getBuNo()) + .eq(EamFeedMatterEntity::getFeedBackId, data.getFeedBackId())); + return list; + } + + @Override + public void saveFeedMatter(EamFeedMatterEntity inData) { + eamFeedMatterMapper.insert(inData); + } + + @Override + public void updateFeedMatter(EamFeedMatterEntity inData) { + eamFeedMatterMapper.updateById(inData); + } + + @Override + public void deleteFeedMatter(EamFeedMatterEntity inData) { + eamFeedMatterMapper.deleteById(inData); + } +}