xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change(dms): 完善故障报修工单功能

Browse Source
master
zch 3 months ago
parent 9f028495fa
commit 3f0c628b0c
7 changed files with 95 additions and 26 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsFaultInstanceActivity.java
Unescape Escape View File

@ -1,13 +1,15 @@
package org.dromara.dms.domain; package org.dromara.dms.domain;
import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.tenant.core.TenantEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo;
import java.io.Serial; import java.io.Serial;
import java.util.Date;
import java.util.List;
/** /**
* 故障报修工单实例节点对象 dms_fault_instance_activity * 故障报修工单实例节点对象 dms_fault_instance_activity
@ -158,5 +160,7 @@ public class DmsFaultInstanceActivity extends TenantEntity {
*/ */
private String componentsPartsId; private String componentsPartsId;
@TableField(exist = false)
private List<DmsFaultComponentsPartsVo> parts;//join
} }

12
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsFaultInstanceActivityVo.java
Unescape Escape View File

@ -1,19 +1,17 @@
package org.dromara.dms.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
@ -199,4 +197,6 @@ public class DmsFaultInstanceActivityVo implements Serializable {
private String componentsPartsId; private String componentsPartsId;
private List<DmsFaultComponentsPartsVo> parts;//join
} }

12
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsFaultInstanceMapper.java
Unescape Escape View File

@ -3,9 +3,9 @@ package org.dromara.dms.mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.dms.domain.DmsBillsFaultInstance; 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.DmsBillsFaultInstanceVo;
import org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo;
import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo;
import java.util.List; import java.util.List;
@ -59,12 +59,12 @@ public interface DmsBillsFaultInstanceMapper extends BaseMapperPlus<DmsBillsFaul
*/ */
public DmsBillsFaultInstance selectFaultInstanceJoinFirstById(Long repairInstanceId); public DmsBillsFaultInstance selectFaultInstanceJoinFirstById(Long repairInstanceId);
List<DmsFaultInstanceActivity> selectFaults(@Param("repairInstanceId") Long repairInstanceId); List<DmsFaultInstanceActivityVo> selectFaults(@Param("repairInstanceId") Long repairInstanceId);
List<DmsFaultComponentsParts> selectParts(@Param("repairInstanceId")Long repairInstanceId); List<DmsFaultComponentsPartsVo> selectParts(@Param("repairInstanceId")Long repairInstanceId);
List<DmsBillsFaultInstance> selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance); List<DmsBillsFaultInstanceVo> selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance);
List<DmsFaultComponentsParts> getDmsPartsList(@Param("repairInstanceId") Long repairInstanceId); List<DmsFaultComponentsPartsVo> getDmsPartsList(@Param("repairInstanceId") Long repairInstanceId);
} }

14
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsFaultInstanceActivityMapper.java
Unescape Escape View File

@ -1,8 +1,12 @@
package org.dromara.dms.mapper; package org.dromara.dms.mapper;
import org.dromara.dms.domain.DmsFaultInstanceActivity; import org.apache.ibatis.annotations.Param;
import org.dromara.dms.domain.vo.DmsFaultInstanceActivityVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; 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接口 * 故障报修工单实例节点Mapper接口
@ -12,4 +16,10 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/ */
public interface DmsFaultInstanceActivityMapper extends BaseMapperPlus<DmsFaultInstanceActivity, DmsFaultInstanceActivityVo> { public interface DmsFaultInstanceActivityMapper extends BaseMapperPlus<DmsFaultInstanceActivity, DmsFaultInstanceActivityVo> {
DmsFaultInstanceActivity selectDmsFaultInstanceActivityByRepairIdMin(Long repairInstanceId);
List<DmsFaultComponentsPartsVo> selectPartsById(@Param("repairInstanceId") Long repairInstanceId);
Long selectRepairInstanceId(@Param("repairInstanceId")Long repairInstanceId);
} }

8
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
Unescape Escape View File

@ -12,6 +12,8 @@ import org.dromara.dms.domain.DmsBillsFaultInstance;
import org.dromara.dms.domain.DmsFaultInstanceActivity; import org.dromara.dms.domain.DmsFaultInstanceActivity;
import org.dromara.dms.domain.bo.DmsBillsFaultInstanceBo; import org.dromara.dms.domain.bo.DmsBillsFaultInstanceBo;
import org.dromara.dms.domain.vo.DmsBillsFaultInstanceVo; 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.mapper.DmsBillsFaultInstanceMapper;
import org.dromara.dms.service.IDmsBillsFaultInstanceService; import org.dromara.dms.service.IDmsBillsFaultInstanceService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -33,6 +35,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
private final DmsBillsFaultInstanceMapper baseMapper; private final DmsBillsFaultInstanceMapper baseMapper;
private final DmsBillsFaultInstanceMapper dmsBillsFaultInstanceMapper;
/** /**
* 查询故障报修工单;手工创建故障报修工单 * 查询故障报修工单;手工创建故障报修工单
* *
@ -149,8 +153,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
@Override @Override
public DmsFaultInstanceActivity selectFaults(Long repairInstanceId) { public DmsFaultInstanceActivity selectFaults(Long repairInstanceId) {
List<DmsFaultInstanceActivity> list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId); List<DmsFaultInstanceActivityVo> list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId);
List<DmsFaultCompentsParts> parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId); List<DmsFaultComponentsPartsVo> parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId);
DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity(); DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity();
BeanUtils.copyProperties(list.get(0),activity); BeanUtils.copyProperties(list.get(0),activity);
// activity.setCheckedFault(list.get(0).getCheckedFault()); // activity.setCheckedFault(list.get(0).getCheckedFault());

12
ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
Unescape Escape View File

@ -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 left join dms_bills_fault_instance b on x.repair_instance_id = b.repair_instance_id
where x.repair_instance_id = #{repairInstanceId} where x.repair_instance_id = #{repairInstanceId}
</select> </select>
<select id="selectParts" resultType="com.hw.dms.domain.DmsFaultCompentsParts" <select id="selectParts" resultType="org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo"
parameterType="java.lang.Long"> parameterType="java.lang.Long">
SELECT x.* FROM `hwjy-cloud`.dms_fault_compents_parts x where x.fault_id = #{repairInstanceId} SELECT x.* FROM dms_fault_compents_parts x where x.fault_id = #{repairInstanceId}
</select> </select>
<select id="selectDmsBillsFaultInstanceCompletedList" resultType="com.hw.dms.domain.DmsBillsFaultInstance" <select id="selectDmsBillsFaultInstanceCompletedList" resultType="org.dromara.dms.domain.vo.DmsBillsFaultInstanceVo"
parameterType="com.hw.dms.domain.DmsBillsFaultInstance"> parameterType="org.dromara.dms.domain.DmsBillsFaultInstance">
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 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
<where> <where>
bills_status = 2 bills_status = 2
@ -213,12 +213,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc order by create_time desc
</select> </select>
<select id="getDmsPartsList" resultType="com.hw.dms.domain.DmsFaultCompentsParts" <select id="getDmsPartsList" resultType="org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo"
parameterType="java.lang.Long"> parameterType="java.lang.Long">
select select
x.*,a.bills_fault_code x.*,a.bills_fault_code
from from
`hwjy-cloud`.dms_fault_compents_parts x dms_fault_compents_parts x
left join dms_bills_fault_instance a on left join dms_bills_fault_instance a on
x.fault_id = a.repair_instance_id where x.fault_id = #{repairInstanceId} x.fault_id = a.repair_instance_id where x.fault_id = #{repairInstanceId}
</select> </select>

51
ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml
Unescape Escape View File

@ -4,4 +4,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.dms.mapper.DmsFaultInstanceActivityMapper"> <mapper namespace="org.dromara.dms.mapper.DmsFaultInstanceActivityMapper">
<resultMap type="DmsFaultInstanceActivity" id="DmsFaultInstanceActivityResult">
<result property="instanceActivityId" column="instance_activity_id" />
<result property="repairInstanceId" column="repair_instance_id" />
<result property="processActivityId" column="process_activity_id" />
<result property="faultType" column="fault_type" />
<result property="faultDescription" column="fault_description" />
<result property="designOperations" column="design_operations" />
<result property="machineId" column="machine_id" />
<result property="repairType" column="repair_type" />
<result property="outsourcingId" column="outsourcing_id" />
<result property="processHandleResolution" column="process_handle_resolution" />
<result property="remark" column="remark" />
<result property="processHandleStatus" column="process_handle_status" />
<result property="processStepOrder" column="process_step_order" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="handleUserId" column="handle_user_id" />
<result property="handleBy" column="handle_by" />
<result property="handleTime" column="handle_time" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="transferUserId" column="transfer_user_id" />
<result property="attr1" column="attr1" />
<result property="approveStatus" column="approveStatus" />
</resultMap>
<!-- 先查询出该工单审批到了第几步，然后根据步骤查询拥有权限的对象id集合 -->
<!-- <select id="selectUserIdByDmsFaultInstanceActivity" parameterType="Long" resultType="java.lang.Long">
select auth_target_id from wf_process_activity_auth where process_activity_id =(
select process_activity_id
from wf_process_activity
where wf_process_id = 102
and process_activity_order = (1+(select max(process_step_order)
from dms_fault_instance_activity
where repair_instance_id=#{repairInstanceId})))
</select>-->
<select id="selectDmsFaultInstanceActivityByRepairIdMin" parameterType="Long" resultMap="DmsFaultInstanceActivityResult">
select *
from dms_fault_instance_activity
where instance_activity_id = (select min(instance_activity_id) FROM dms_fault_instance_activity where repair_instance_id = #{repairInstanceId})
</select>
<select id="selectPartsById" resultType="org.dromara.dms.domain.vo.DmsFaultComponentsPartsVo"
parameterType="java.lang.Long">
SELECT x.* FROM dms_fault_components_parts x where x.repair_instance_id = #{repairInstanceId}
</select>
<select id="selectRepairInstanceId" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT x.repair_instance_id FROM dms_fault_instance_activity x where x.instance_activity_id =#{activityId}
</select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save