DMS:
设备保养增加设备部位保养项目的维护,PDA接口开始设备保养和完成设备保养修改。
master
xs 6 months ago
parent 0cbbed4b89
commit 34ecfd7eb6

@ -82,4 +82,8 @@ public class DmsConstants {
public static final String DMS_ALARM_STATUS_ARTIFICIAL_HANDLE="1";//1人工已处理
public static final String DMS_ALARM_STATUS_AUTO_HANDLE="2";//2自动恢复
/** 保养项目状态0待保养1保养完成*/
public static final String DMS_MAINT_PROJECT_STATUS_TO_MAINT="0";//0待保养
public static final String DMS_MAINT_PROJECT_STATUS_COMPLETE="1";//1保养完成
}

@ -225,7 +225,7 @@ public class DmsMobileController extends BaseController {
}
/**
*
*
*/
// @RequiresPermissions("qms:checkresultdetail:add")
@Log(title = "点巡检工单明细", businessType = BusinessType.INSERT)

@ -6,6 +6,7 @@ import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.Date;
import java.util.List;
/**
* dms_bills_maint_detail
@ -52,6 +53,9 @@ public class DmsBillsMaintDetail extends BaseEntity
private Date endTime;
/** 保养工单明细项目信息;检查每个项目的点巡检结果详情信息 */
private List<DmsBillsMaintDetailProject> dmsBillsMaintDetailProjectList;
private String deviceCode;
private String deviceName;
@ -201,6 +205,14 @@ public class DmsBillsMaintDetail extends BaseEntity
this.endTime = endTime;
}
public List<DmsBillsMaintDetailProject> getDmsBillsMaintDetailProjectList() {
return dmsBillsMaintDetailProjectList;
}
public void setDmsBillsMaintDetailProjectList(List<DmsBillsMaintDetailProject> dmsBillsMaintDetailProjectList) {
this.dmsBillsMaintDetailProjectList = dmsBillsMaintDetailProjectList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -0,0 +1,112 @@
package com.hw.dms.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
/**
* ; dms_bills_maint_detail_project
*
* @author xins
* @date 2024-09-18
*/
public class DmsBillsMaintDetailProject extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 保养工单明细项目信息ID */
private Long maintDetailProjectId;
/** 保养工单明细ID */
@Excel(name = "保养工单明细ID")
private Long billsMaintDetailId;
/** 保养项目ID */
@Excel(name = "保养项目ID")
private Long maintProjectId;
/** 保养项目名称(冗余) */
@Excel(name = "保养项目名称(冗余)")
private String maintProjectName;
/** 保养项目描述 */
@Excel(name = "保养项目描述")
private String maintProjectDesc;
/** 保养项目状态0待保养1保养完成 */
@Excel(name = "保养项目状态", readConverterExp = "0=待保养1保养完成")
private String maintProjectStatus;
public void setMaintDetailProjectId(Long maintDetailProjectId)
{
this.maintDetailProjectId = maintDetailProjectId;
}
public Long getMaintDetailProjectId()
{
return maintDetailProjectId;
}
public void setBillsMaintDetailId(Long billsMaintDetailId)
{
this.billsMaintDetailId = billsMaintDetailId;
}
public Long getBillsMaintDetailId()
{
return billsMaintDetailId;
}
public void setMaintProjectId(Long maintProjectId)
{
this.maintProjectId = maintProjectId;
}
public Long getMaintProjectId()
{
return maintProjectId;
}
public void setMaintProjectName(String maintProjectName)
{
this.maintProjectName = maintProjectName;
}
public String getMaintProjectName()
{
return maintProjectName;
}
public void setMaintProjectDesc(String maintProjectDesc)
{
this.maintProjectDesc = maintProjectDesc;
}
public String getMaintProjectDesc()
{
return maintProjectDesc;
}
public void setMaintProjectStatus(String maintProjectStatus)
{
this.maintProjectStatus = maintProjectStatus;
}
public String getMaintProjectStatus()
{
return maintProjectStatus;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("maintDetailProjectId", getMaintDetailProjectId())
.append("billsMaintDetailId", getBillsMaintDetailId())
.append("maintProjectId", getMaintProjectId())
.append("maintProjectName", getMaintProjectName())
.append("maintProjectDesc", getMaintProjectDesc())
.append("maintProjectStatus", getMaintProjectStatus())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

@ -0,0 +1,61 @@
package com.hw.dms.mapper;
import java.util.List;
import com.hw.dms.domain.DmsBillsMaintDetailProject;
/**
* ;Mapper
*
* @author xins
* @date 2024-09-18
*/
public interface DmsBillsMaintDetailProjectMapper
{
/**
* ;
*
* @param maintDetailProjectId ;
* @return ;
*/
public DmsBillsMaintDetailProject selectDmsBillsMaintDetailProjectByMaintDetailProjectId(Long maintDetailProjectId);
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return ;
*/
public List<DmsBillsMaintDetailProject> selectDmsBillsMaintDetailProjectList(DmsBillsMaintDetailProject dmsBillsMaintDetailProject);
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return
*/
public int insertDmsBillsMaintDetailProject(DmsBillsMaintDetailProject dmsBillsMaintDetailProject);
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return
*/
public int updateDmsBillsMaintDetailProject(DmsBillsMaintDetailProject dmsBillsMaintDetailProject);
/**
* ;
*
* @param maintDetailProjectId ;
* @return
*/
public int deleteDmsBillsMaintDetailProjectByMaintDetailProjectId(Long maintDetailProjectId);
/**
* ;
*
* @param maintDetailProjectIds
* @return
*/
public int deleteDmsBillsMaintDetailProjectByMaintDetailProjectIds(Long[] maintDetailProjectIds);
}

@ -0,0 +1,61 @@
package com.hw.dms.service;
import java.util.List;
import com.hw.dms.domain.DmsBillsMaintDetailProject;
/**
* ;Service
*
* @author xins
* @date 2024-09-18
*/
public interface IDmsBillsMaintDetailProjectService
{
/**
* ;
*
* @param maintDetailProjectId ;
* @return ;
*/
public DmsBillsMaintDetailProject selectDmsBillsMaintDetailProjectByMaintDetailProjectId(Long maintDetailProjectId);
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return ;
*/
public List<DmsBillsMaintDetailProject> selectDmsBillsMaintDetailProjectList(DmsBillsMaintDetailProject dmsBillsMaintDetailProject);
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return
*/
public int insertDmsBillsMaintDetailProject(DmsBillsMaintDetailProject dmsBillsMaintDetailProject);
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return
*/
public int updateDmsBillsMaintDetailProject(DmsBillsMaintDetailProject dmsBillsMaintDetailProject);
/**
* ;
*
* @param maintDetailProjectIds ;
* @return
*/
public int deleteDmsBillsMaintDetailProjectByMaintDetailProjectIds(Long[] maintDetailProjectIds);
/**
* ;
*
* @param maintDetailProjectId ;
* @return
*/
public int deleteDmsBillsMaintDetailProjectByMaintDetailProjectId(Long maintDetailProjectId);
}

@ -79,9 +79,9 @@ public interface IDmsBillsMaintInstanceService
*
*
* @param dmsBillsMaintDetail
* @return
* @return DmsBillsMaintDetail
*/
public int startMaint(DmsBillsMaintDetail dmsBillsMaintDetail);
public DmsBillsMaintDetail startMaint(DmsBillsMaintDetail dmsBillsMaintDetail);
/**

@ -0,0 +1,96 @@
package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsBillsMaintDetailProjectMapper;
import com.hw.dms.domain.DmsBillsMaintDetailProject;
import com.hw.dms.service.IDmsBillsMaintDetailProjectService;
/**
* ;Service
*
* @author xins
* @date 2024-09-18
*/
@Service
public class DmsBillsMaintDetailProjectServiceImpl implements IDmsBillsMaintDetailProjectService
{
@Autowired
private DmsBillsMaintDetailProjectMapper dmsBillsMaintDetailProjectMapper;
/**
* ;
*
* @param maintDetailProjectId ;
* @return ;
*/
@Override
public DmsBillsMaintDetailProject selectDmsBillsMaintDetailProjectByMaintDetailProjectId(Long maintDetailProjectId)
{
return dmsBillsMaintDetailProjectMapper.selectDmsBillsMaintDetailProjectByMaintDetailProjectId(maintDetailProjectId);
}
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return ;
*/
@Override
public List<DmsBillsMaintDetailProject> selectDmsBillsMaintDetailProjectList(DmsBillsMaintDetailProject dmsBillsMaintDetailProject)
{
return dmsBillsMaintDetailProjectMapper.selectDmsBillsMaintDetailProjectList(dmsBillsMaintDetailProject);
}
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return
*/
@Override
public int insertDmsBillsMaintDetailProject(DmsBillsMaintDetailProject dmsBillsMaintDetailProject)
{
dmsBillsMaintDetailProject.setCreateTime(DateUtils.getNowDate());
return dmsBillsMaintDetailProjectMapper.insertDmsBillsMaintDetailProject(dmsBillsMaintDetailProject);
}
/**
* ;
*
* @param dmsBillsMaintDetailProject ;
* @return
*/
@Override
public int updateDmsBillsMaintDetailProject(DmsBillsMaintDetailProject dmsBillsMaintDetailProject)
{
dmsBillsMaintDetailProject.setUpdateTime(DateUtils.getNowDate());
return dmsBillsMaintDetailProjectMapper.updateDmsBillsMaintDetailProject(dmsBillsMaintDetailProject);
}
/**
* ;
*
* @param maintDetailProjectIds ;
* @return
*/
@Override
public int deleteDmsBillsMaintDetailProjectByMaintDetailProjectIds(Long[] maintDetailProjectIds)
{
return dmsBillsMaintDetailProjectMapper.deleteDmsBillsMaintDetailProjectByMaintDetailProjectIds(maintDetailProjectIds);
}
/**
* ;
*
* @param maintDetailProjectId ;
* @return
*/
@Override
public int deleteDmsBillsMaintDetailProjectByMaintDetailProjectId(Long maintDetailProjectId)
{
return dmsBillsMaintDetailProjectMapper.deleteDmsBillsMaintDetailProjectByMaintDetailProjectId(maintDetailProjectId);
}
}

@ -14,13 +14,10 @@ import com.hw.common.core.utils.DateUtils;
import com.hw.common.core.utils.uuid.Seq;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.*;
import com.hw.dms.mapper.DmsBillsMaintDetailMapper;
import com.hw.dms.mapper.DmsMaintInstanceActivityMapper;
import com.hw.dms.mapper.DmsPlanMaintMapper;
import com.hw.dms.mapper.*;
import com.hw.system.api.RemoteSysCommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsBillsMaintInstanceMapper;
import com.hw.dms.service.IDmsBillsMaintInstanceService;
import org.springframework.transaction.annotation.Transactional;
@ -40,6 +37,8 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
private DmsMaintInstanceActivityMapper dmsMaintInstanceActivityMapper;
@Autowired
private DmsBillsMaintDetailMapper dmsBillsMaintDetailMapper;
@Autowired
private DmsBillsMaintDetailProjectMapper dmsBillsMaintDetailProjectMapper;
@Autowired
private RemoteSysCommonService remoteSysCommonService;
@ -198,11 +197,11 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
*
*
* @param dmsBillsMaintDetail
* @return
* @return DmsBillsMaintDetail
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int startMaint(DmsBillsMaintDetail dmsBillsMaintDetail) {
public DmsBillsMaintDetail startMaint(DmsBillsMaintDetail dmsBillsMaintDetail) {
DmsBillsMaintInstance dmsBillsMaintInstance = dmsBillsMaintInstanceMapper.
selectDmsBillsMaintInstanceByMaintInstanceId(dmsBillsMaintDetail.getMaintInstanceId());
Long maintStatus = dmsBillsMaintInstance.getMaintStatus() == null ?
@ -228,16 +227,22 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail);
} else {//保养中
dmsBillsMaintDetail.setUpdateBy(userName);
dmsBillsMaintDetail.setUpdateTime(currentDate);
dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail);
}
return 1;
// else {//保养中
// dmsBillsMaintDetail.setUpdateBy(userName);
// dmsBillsMaintDetail.setUpdateTime(currentDate);
// dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail);
// }
DmsBillsMaintDetailProject queryBillsMaintDetailProject = new DmsBillsMaintDetailProject();
queryBillsMaintDetailProject.setBillsMaintDetailId(dmsBillsMaintDetail.getBillsMaintDetailId());
List<DmsBillsMaintDetailProject> dmsBillsMaintDetailProjects = dmsBillsMaintDetailProjectMapper.selectDmsBillsMaintDetailProjectList(queryBillsMaintDetailProject);
dmsBillsMaintDetail.setDmsBillsMaintDetailProjectList(dmsBillsMaintDetailProjects);
return dmsBillsMaintDetail;
}
/**
*
*
@ -247,6 +252,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
@Override
@Transactional(rollbackFor = Exception.class)
public int completeMaint(DmsBillsMaintDetail dmsBillsMaintDetail) {
List<DmsBillsMaintDetailProject> dmsBillsMaintDetailProjects = dmsBillsMaintDetail.getDmsBillsMaintDetailProjectList();
Long maintInstanceId = dmsBillsMaintDetail.getMaintInstanceId();
DmsBillsMaintInstance dmsBillsMaintInstance = dmsBillsMaintInstanceMapper.
selectDmsBillsMaintInstanceByMaintInstanceId(maintInstanceId);
@ -283,6 +289,14 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance);
}
//更新保养工单明细项目信息
for(DmsBillsMaintDetailProject dmsBillsMaintDetailProject:dmsBillsMaintDetailProjects){
dmsBillsMaintDetailProject.setMaintProjectStatus(DmsConstants.DMS_MAINT_PROJECT_STATUS_COMPLETE);
dmsBillsMaintDetailProject.setCreateTime(currentDate);
dmsBillsMaintDetail.setCreateBy(userName);
dmsBillsMaintDetailProjectMapper.updateDmsBillsMaintDetailProject(dmsBillsMaintDetailProject);
}
dmsBillsMaintDetail.setEndTime(currentDate);
dmsBillsMaintDetail.setUpdateBy(userName);
dmsBillsMaintDetail.setUpdateTime(currentDate);

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsBillsMaintDetailProjectMapper">
<resultMap type="DmsBillsMaintDetailProject" id="DmsBillsMaintDetailProjectResult">
<result property="maintDetailProjectId" column="maint_detail_project_id" />
<result property="billsMaintDetailId" column="bills_maint_detail_id" />
<result property="maintProjectId" column="maint_project_id" />
<result property="maintProjectName" column="maint_project_name" />
<result property="maintProjectDesc" column="maint_project_desc" />
<result property="maintProjectStatus" column="maint_project_status" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectDmsBillsMaintDetailProjectVo">
select maint_detail_project_id, bills_maint_detail_id, maint_project_id, maint_project_name, maint_project_desc, maint_project_status, remark, create_by, create_time, update_by, update_time from dms_bills_maint_detail_project
</sql>
<select id="selectDmsBillsMaintDetailProjectList" parameterType="DmsBillsMaintDetailProject" resultMap="DmsBillsMaintDetailProjectResult">
<include refid="selectDmsBillsMaintDetailProjectVo"/>
<where>
<if test="billsMaintDetailId != null "> and bills_maint_detail_id = #{billsMaintDetailId}</if>
<if test="maintProjectId != null "> and maint_project_id = #{maintProjectId}</if>
<if test="maintProjectName != null and maintProjectName != ''"> and maint_project_name like concat('%', #{maintProjectName}, '%')</if>
<if test="maintProjectDesc != null and maintProjectDesc != ''"> and maint_project_desc = #{maintProjectDesc}</if>
<if test="maintProjectStatus != null and maintProjectStatus != ''"> and maint_project_status = #{maintProjectStatus}</if>
</where>
</select>
<select id="selectDmsBillsMaintDetailProjectByMaintDetailProjectId" parameterType="Long" resultMap="DmsBillsMaintDetailProjectResult">
<include refid="selectDmsBillsMaintDetailProjectVo"/>
where maint_detail_project_id = #{maintDetailProjectId}
</select>
<insert id="insertDmsBillsMaintDetailProject" parameterType="DmsBillsMaintDetailProject" useGeneratedKeys="true" keyProperty="maintDetailProjectId">
insert into dms_bills_maint_detail_project
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="billsMaintDetailId != null">bills_maint_detail_id,</if>
<if test="maintProjectId != null">maint_project_id,</if>
<if test="maintProjectName != null and maintProjectName != ''">maint_project_name,</if>
<if test="maintProjectDesc != null">maint_project_desc,</if>
<if test="maintProjectStatus != null and maintProjectStatus != ''">maint_project_status,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="billsMaintDetailId != null">#{billsMaintDetailId},</if>
<if test="maintProjectId != null">#{maintProjectId},</if>
<if test="maintProjectName != null and maintProjectName != ''">#{maintProjectName},</if>
<if test="maintProjectDesc != null">#{maintProjectDesc},</if>
<if test="maintProjectStatus != null and maintProjectStatus != ''">#{maintProjectStatus},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateDmsBillsMaintDetailProject" parameterType="DmsBillsMaintDetailProject">
update dms_bills_maint_detail_project
<trim prefix="SET" suffixOverrides=",">
<if test="billsMaintDetailId != null">bills_maint_detail_id = #{billsMaintDetailId},</if>
<if test="maintProjectId != null">maint_project_id = #{maintProjectId},</if>
<if test="maintProjectName != null and maintProjectName != ''">maint_project_name = #{maintProjectName},</if>
<if test="maintProjectDesc != null">maint_project_desc = #{maintProjectDesc},</if>
<if test="maintProjectStatus != null and maintProjectStatus != ''">maint_project_status = #{maintProjectStatus},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where maint_detail_project_id = #{maintDetailProjectId}
</update>
<delete id="deleteDmsBillsMaintDetailProjectByMaintDetailProjectId" parameterType="Long">
delete from dms_bills_maint_detail_project where maint_detail_project_id = #{maintDetailProjectId}
</delete>
<delete id="deleteDmsBillsMaintDetailProjectByMaintDetailProjectIds" parameterType="String">
delete from dms_bills_maint_detail_project where maint_detail_project_id in
<foreach item="maintDetailProjectId" collection="array" open="(" separator="," close=")">
#{maintDetailProjectId}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save