From 3f0c628b0c6f1f1b1e046daf706a3f5b2df00ec4 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 7 Apr 2025 17:54:02 +0800 Subject: [PATCH] =?UTF-8?q?change(dms):=20=E5=AE=8C=E5=96=84=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E6=8A=A5=E4=BF=AE=E5=B7=A5=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dms/domain/DmsFaultInstanceActivity.java | 12 +++-- .../domain/vo/DmsFaultInstanceActivityVo.java | 12 ++--- .../mapper/DmsBillsFaultInstanceMapper.java | 12 ++--- .../DmsFaultInstanceActivityMapper.java | 14 ++++- .../DmsBillsFaultInstanceServiceImpl.java | 8 ++- .../dms/DmsBillsFaultInstanceMapper.xml | 12 ++--- .../dms/DmsFaultInstanceActivityMapper.xml | 51 +++++++++++++++++++ 7 files changed, 95 insertions(+), 26 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsFaultInstanceActivity.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsFaultInstanceActivity.java index 9ed58bc..0e77558 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsFaultInstanceActivity.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsFaultInstanceActivity.java @@ -1,13 +1,15 @@ package org.dromara.dms.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo; import java.io.Serial; +import java.util.Date; +import java.util.List; /** * 故障报修工单实例节点对象 dms_fault_instance_activity @@ -158,5 +160,7 @@ public class DmsFaultInstanceActivity extends TenantEntity { */ private String componentsPartsId; + @TableField(exist = false) + private List parts;//join } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsFaultInstanceActivityVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsFaultInstanceActivityVo.java index cbc1e9f..bce2d31 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsFaultInstanceActivityVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsFaultInstanceActivityVo.java @@ -1,19 +1,17 @@ package org.dromara.dms.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.dms.domain.DmsFaultInstanceActivity; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.dms.domain.DmsFaultInstanceActivity; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -199,4 +197,6 @@ public class DmsFaultInstanceActivityVo implements Serializable { private String componentsPartsId; + private List parts;//join + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsFaultInstanceMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsFaultInstanceMapper.java index b41baba..a12bf1e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsFaultInstanceMapper.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsFaultInstanceMapper.java @@ -3,9 +3,9 @@ package org.dromara.dms.mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.dms.domain.DmsBillsFaultInstance; -import org.dromara.dms.domain.DmsFaultComponentsParts; -import org.dromara.dms.domain.DmsFaultInstanceActivity; import org.dromara.dms.domain.vo.DmsBillsFaultInstanceVo; +import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo; +import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo; import java.util.List; @@ -59,12 +59,12 @@ public interface DmsBillsFaultInstanceMapper extends BaseMapperPlus selectFaults(@Param("repairInstanceId") Long repairInstanceId); + List selectFaults(@Param("repairInstanceId") Long repairInstanceId); - List selectParts(@Param("repairInstanceId")Long repairInstanceId); + List selectParts(@Param("repairInstanceId")Long repairInstanceId); - List selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance); + List selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance); - List getDmsPartsList(@Param("repairInstanceId") Long repairInstanceId); + List getDmsPartsList(@Param("repairInstanceId") Long repairInstanceId); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsFaultInstanceActivityMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsFaultInstanceActivityMapper.java index 8c2957e..cc013c9 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsFaultInstanceActivityMapper.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsFaultInstanceActivityMapper.java @@ -1,8 +1,12 @@ package org.dromara.dms.mapper; -import org.dromara.dms.domain.DmsFaultInstanceActivity; -import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.dms.domain.DmsFaultInstanceActivity; +import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo; +import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo; + +import java.util.List; /** * 故障报修工单实例节点Mapper接口 @@ -12,4 +16,10 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface DmsFaultInstanceActivityMapper extends BaseMapperPlus { + DmsFaultInstanceActivity selectDmsFaultInstanceActivityByRepairIdMin(Long repairInstanceId); + + List selectPartsById(@Param("repairInstanceId") Long repairInstanceId); + + Long selectRepairInstanceId(@Param("repairInstanceId")Long repairInstanceId); + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index 14efd33..4c85d29 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -12,6 +12,8 @@ import org.dromara.dms.domain.DmsBillsFaultInstance; import org.dromara.dms.domain.DmsFaultInstanceActivity; import org.dromara.dms.domain.bo.DmsBillsFaultInstanceBo; import org.dromara.dms.domain.vo.DmsBillsFaultInstanceVo; +import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo; +import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo; import org.dromara.dms.mapper.DmsBillsFaultInstanceMapper; import org.dromara.dms.service.IDmsBillsFaultInstanceService; import org.springframework.beans.BeanUtils; @@ -33,6 +35,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS private final DmsBillsFaultInstanceMapper baseMapper; + private final DmsBillsFaultInstanceMapper dmsBillsFaultInstanceMapper; + /** * 查询故障报修工单;手工创建故障报修工单 * @@ -149,8 +153,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS @Override public DmsFaultInstanceActivity selectFaults(Long repairInstanceId) { - List list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId); - List parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId); + List list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId); + List parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId); DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity(); BeanUtils.copyProperties(list.get(0),activity); // activity.setCheckedFault(list.get(0).getCheckedFault()); diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml index 6e6f6c2..4a5648e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -185,13 +185,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join dms_bills_fault_instance b on x.repair_instance_id = b.repair_instance_id where x.repair_instance_id = #{repairInstanceId} - - select repair_instance_id, fault_source_type, fault_source_id, wf_process_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, remark, create_by, create_time, update_by, update_time,machine_id,approveStatus,repair_confirm from dms_bills_fault_instance bills_status = 2 @@ -213,12 +213,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml index 24a5c67..3cca499 100644 --- a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml +++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml @@ -4,4 +4,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +