设备故障登记修改与产品安全确认

lyh

2025-07-26 b16d7f9fd029bf9d37bcc3c6f3cf8472a0081888

设备故障登记修改与产品安全确认

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java

@@ -116,6 +116,10 @@
    String PCR0022 = "PCR0022";
    //主管部级领导
    String PCR0023 = "PCR0023";
    //主管工艺
    String PCR0024 = "PCR0024";
    //副部级领导
    String PCR0025 = "PCR0025";
    //通过、驳回
    String APPROVED = "1";
    String REJECTED = "2";

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamReportProductHazardsEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package org.jeecg.modules.eam.constant;

public enum EamReportProductHazardsEnum {
    //待提交
    PENDING_SUBMIT,
    //待主管工艺确认
    PENDING_SUPERIOR_TECHNICAL_CONFIRMATION,
    //待部级领导确认
    PENDING_DEPARTMENT_LEADER_CONFIRMATION,
    //已完成
    REPAIR_COMPLETED,
    //已驳回
    REJECTED;

    public static EamReportProductHazardsEnum getInstance(String code) {
        EamReportProductHazardsEnum[] values = EamReportProductHazardsEnum.values();
        for (EamReportProductHazardsEnum value : values) {
            if (value.name().equals(code)) {
                return value;
            }
        }
        return null;
    }
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java

@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

@@ -26,7 +27,7 @@
@TableName("eam_report_product_hazards")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class EamReportProductHazardsDto {
public class EamReportProductHazardsDto extends FlowTaskVo implements Serializable {

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
@@ -88,6 +89,10 @@
    @Excel(name = "主管工艺确认意见", width = 15)
    @ApiModelProperty(value = "主管工艺确认意见")
    private String technologistComment;
    /**主管工艺确认结果*/
    @Excel(name = "主管工艺确认结果", width = 15)
    @ApiModelProperty(value = "主管工艺确认结果")
    private String technologistResult;
    /**部级领导*/
    @Excel(name = "部级领导", width = 15)
    @ApiModelProperty(value = "部级领导")
@@ -102,6 +107,10 @@
    @Excel(name = "部级领导确认意见", width = 15)
    @ApiModelProperty(value = "部级领导确认意见")
    private String deputyDepartmentComment;
    /**部级领导确认结果*/
    @Excel(name = "部级领导确认结果", width = 15)
    @ApiModelProperty(value = "部级领导确认结果")
    private String deputyDepartmentResult;
    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
@@ -111,4 +120,5 @@
    private String equipmentModel;
    @TableField(exist = false)
    private String installationPosition;

}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportProductHazards.java

@@ -50,6 +50,11 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**报修ID*/
    @Excel(name = "报修ID", width = 15)
    @ApiModelProperty(value = "报修ID")
@@ -58,6 +63,11 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**确认状态*/
    @Excel(name = "确认状态", width = 15)
    @ApiModelProperty(value = "确认状态")
    @Dict(dicCode = "confirm_status")
    private String confirmStatus;
    /**操作工*/
    @Excel(name = "操作工", width = 15)
    @ApiModelProperty(value = "操作工")
@@ -90,6 +100,10 @@
    @Excel(name = "主管工艺确认意见", width = 15)
    @ApiModelProperty(value = "主管工艺确认意见")
    private String technologistComment;
    /**主管工艺确认结果*/
    @Excel(name = "主管工艺确认结果", width = 15)
    @ApiModelProperty(value = "主管工艺确认结果")
    private String technologistResult;
    /**部级领导*/
    @Excel(name = "部级领导", width = 15)
    @ApiModelProperty(value = "部级领导")
@@ -104,6 +118,10 @@
    @Excel(name = "部级领导确认意见", width = 15)
    @ApiModelProperty(value = "部级领导确认意见")
    private String deputyDepartmentComment;
    /**部级领导确认结果*/
    @Excel(name = "部级领导确认结果", width = 15)
    @ApiModelProperty(value = "部级领导确认结果")
    private String deputyDepartmentResult;
    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
@@ -113,4 +131,13 @@
    private String equipmentModel;
    @TableField(exist = false)
    private String installationPosition;
    /**批次号*/
    @TableField(exist = false)
    private String batchNumber;
    /**加工零件号*/
    @TableField(exist = false)
    private String processingPart;
    /**件数*/
    @TableField(exist = false)
    private String quantity;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportProductHazardsMapper.xml

@@ -3,7 +3,8 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamReportProductHazardsMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.request.EamReportProductHazardsQuery">
        select erph.*, e.equipment_code, e.equipment_name,e.equipment_model, e.installation_position
        select erph.*, e.equipment_code, e.equipment_name,e.equipment_model, e.installation_position,
               arr.processing_part,arr.batch_number,arr.quantity
        from eam_report_product_hazards erph
                 inner join eam_equipment e
                            on erph.equipment_id = e.id

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportProductHazardsQuery.java

@@ -1,15 +1,13 @@
package org.jeecg.modules.eam.request;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

@@ -50,6 +48,11 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**报修ID*/
    @Excel(name = "报修ID", width = 15)
    @ApiModelProperty(value = "报修ID")
@@ -58,9 +61,15 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**确认状态*/
    @Excel(name = "确认状态", width = 15)
    @ApiModelProperty(value = "确认状态")
    @Dict(dicCode = "confirm_status")
    private String confirmStatus;
    /**操作工*/
    @Excel(name = "操作工", width = 15)
    @ApiModelProperty(value = "操作工")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String confirmer;
    /**操作工确认时间*/
    @Excel(name = "操作工确认时间", width = 15, format = "yyyy-MM-dd")
@@ -71,6 +80,7 @@
    /**产品损失情况*/
    @Excel(name = "产品损失情况", width = 15)
    @ApiModelProperty(value = "产品损失情况")
    @Dict(dicCode = "yn")
    private String productLoss;
    /**产品损失质量影响分析*/
    @Excel(name = "产品损失质量影响分析", width = 15)
@@ -79,6 +89,7 @@
    /**主管工艺*/
    @Excel(name = "主管工艺", width = 15)
    @ApiModelProperty(value = "主管工艺")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String technologist;
    /**主管工艺确认时间*/
    @Excel(name = "主管工艺确认时间", width = 15, format = "yyyy-MM-dd")
@@ -90,9 +101,14 @@
    @Excel(name = "主管工艺确认意见", width = 15)
    @ApiModelProperty(value = "主管工艺确认意见")
    private String technologistComment;
    /**主管工艺确认结果*/
    @Excel(name = "主管工艺确认结果", width = 15)
    @ApiModelProperty(value = "主管工艺确认结果")
    private String technologistResult;
    /**部级领导*/
    @Excel(name = "部级领导", width = 15)
    @ApiModelProperty(value = "部级领导")
    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
    private String deputyDepartment;
    /**部级领导确认时间*/
    @Excel(name = "部级领导确认时间", width = 15, format = "yyyy-MM-dd")
@@ -104,6 +120,10 @@
    @Excel(name = "部级领导确认意见", width = 15)
    @ApiModelProperty(value = "部级领导确认意见")
    private String deputyDepartmentComment;
    /**部级领导确认结果*/
    @Excel(name = "部级领导确认结果", width = 15)
    @ApiModelProperty(value = "部级领导确认结果")
    private String deputyDepartmentResult;
    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
@@ -115,4 +135,13 @@
    private String installationPosition;
    private String column;
    private String order;
    /**批次号*/
    @TableField(exist = false)
    private String batchNumber;
    /**加工零件号*/
    @TableField(exist = false)
    private String processingPart;
    /**件数*/
    @TableField(exist = false)
    private String quantity;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamReportProductHazardsService.java

@@ -40,6 +40,12 @@
    Result<?> submit(String id);

    /**
     * æµç¨‹å®¡æ ¸
     * @param eamReportProductHazardsDto
     */
    Result<?> audit(EamReportProductHazardsDto eamReportProductHazardsDto);

    /**
     * åˆ é™¤
     * @param id
     * @return

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java

@@ -129,6 +129,9 @@
            if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getEquipmentName())) {
                queryWrapper.like("e.equipment_name", eamReportAccidentsRegisterQuery.getEquipmentName());
            }
            if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getRegisterStatus())) {
                queryWrapper.eq("aar.register_status", eamReportAccidentsRegisterQuery.getRegisterStatus());
            }
            queryWrapper.eq("aar.del_flag", CommonConstant.DEL_FLAG_0);
            //排序
            if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getColumn()) && StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getOrder())) {
@@ -223,7 +226,7 @@
    public Result<?> audit(EamReportAccidentsRegisterDto eamReportAccidentsRegisterDto){
        EamReportAccidentsRegister eamReportAccidentsRegister = this.baseMapper.selectById(eamReportAccidentsRegisterDto.getId());
        if (eamReportAccidentsRegister == null) {
            throw new JeecgBootException("维修工单不存在，请刷新重试！");
            throw new JeecgBootException("工单不存在，请刷新重试！");
        }
        // èŽ·å–当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -271,6 +274,7 @@
                    }
                    values.put("organization",eamReportAccidentsRegisterDto.getDistrictConfirm());
                    values.put("comment", eamReportAccidentsRegisterDto.getDistrictConfirm());
                    values.put("districtResult", eamReportAccidentsRegisterDto.getDistrictResult());
                    eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getDistrictConfirm());
                    eamReportAccidentsRegister.setDistrict(user.getUsername());
                    eamReportAccidentsRegister.setDistrictTime(new Date());
@@ -298,6 +302,7 @@
                    }
                    values.put("organization",eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
                    values.put("comment", eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
                    values.put("centerDirectorResult", eamReportAccidentsRegisterDto.getCenterDirectorResult());
                    eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
                    eamReportAccidentsRegister.setCenterDirector(user.getUsername());
                    eamReportAccidentsRegister.setCenterDirectorTime(new Date());
@@ -325,6 +330,7 @@
                    }
                    values.put("organization",eamReportAccidentsRegisterDto.getRepairConfirmComment());
                    values.put("comment", eamReportAccidentsRegisterDto.getRepairConfirmComment());
                    values.put("repairConfirmResult", eamReportAccidentsRegisterDto.getRepairConfirmResult());
                    eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairConfirmComment());
                    eamReportAccidentsRegister.setRepairConfirm(user.getUsername());
                    eamReportAccidentsRegister.setRepairConfirmTime(new Date());
@@ -338,7 +344,7 @@
                    eamReportAccidentsRegister.setSuggestionTakeSteps(eamReportAccidentsRegisterDto.getSuggestionTakeSteps());
                    eamReportAccidentsRegister.setSuggestionTakeStepsTime(eamReportAccidentsRegisterDto.getSuggestionTakeStepsTime());
                    if ("2".equals(eamReportAccidentsRegisterDto.getRepairConfirmResult())){
                        //维修组长拒绝
                        //维修工拒绝
                        eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
                    }else {
                        eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_TEAM_LEADER.name());
@@ -358,6 +364,7 @@
                }
                values.put("organization",eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
                values.put("comment", eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
                values.put("repairGroupLeaderResult", eamReportAccidentsRegisterDto.getRepairGroupLeaderResult());
                eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
                eamReportAccidentsRegister.setRepairGroupLeader(user.getUsername());
                eamReportAccidentsRegister.setRepairGroupLeaderTime(new Date());
@@ -383,12 +390,13 @@
                }
                values.put("organization",eamReportAccidentsRegisterDto.getRepairDistrictComment());
                values.put("comment", eamReportAccidentsRegisterDto.getRepairDistrictComment());
                values.put("repairDistrictResult", eamReportAccidentsRegisterDto.getRepairDistrictResult());
                eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairDistrictComment());
                eamReportAccidentsRegister.setRepairDistrict(user.getUsername());
                eamReportAccidentsRegister.setRepairDistrictTime(new Date());
                eamReportAccidentsRegister.setRepairDistrictResult(eamReportAccidentsRegisterDto.getRepairDistrictResult());
                eamReportAccidentsRegister.setRepairDistrictComment(eamReportAccidentsRegisterDto.getRepairDistrictComment());
                if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
                if ("2".equals(eamReportAccidentsRegisterDto.getRepairDistrictResult())){
                    //维修区长拒绝
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
                }else {
@@ -408,6 +416,7 @@
                }
                values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
                values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
                values.put("technicalDirectorResult", eamReportAccidentsRegisterDto.getTechnicalDirectorResult());
                eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
                eamReportAccidentsRegister.setCheckAgree(eamReportAccidentsRegisterDto.getCheckAgree());
                eamReportAccidentsRegister.setDisagreeReason(eamReportAccidentsRegisterDto.getDisagreeReason());
@@ -417,7 +426,7 @@
                eamReportAccidentsRegister.setTechnicalDirectorTime(new Date());
                eamReportAccidentsRegister.setTechnicalDirectorResult(eamReportAccidentsRegisterDto.getTechnicalDirectorResult());
                eamReportAccidentsRegister.setTechnicalDirectorConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
                if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
                if ("2".equals(eamReportAccidentsRegisterDto.getTechnicalDirectorResult())){
                    //技术负责人拒绝
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
                }else {
@@ -437,12 +446,13 @@
                }
                values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
                values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
                values.put("technicalDirectorLeaderResult", eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderResult());
                eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
                eamReportAccidentsRegister.setTechnicalDirectorLeader(user.getUsername());
                eamReportAccidentsRegister.setTechnicalDirectorLeaderTime(new Date());
                eamReportAccidentsRegister.setTechnicalDirectorLeaderResult(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderResult());
                eamReportAccidentsRegister.setTechnicalDirectorLeaderConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
                if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
                if ("2".equals(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderResult())){
                    //技术主管室级领导拒绝
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
                }else {
@@ -456,12 +466,13 @@
                }
                values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
                values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
                values.put("technicalDirectorPartResult", eamReportAccidentsRegisterDto.getTechnicalDirectorPartResult());
                eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
                eamReportAccidentsRegister.setTechnicalDirectorPart(user.getUsername());
                eamReportAccidentsRegister.setTechnicalDirectorPartTime(new Date());
                eamReportAccidentsRegister.setTechnicalDirectorPartResult(eamReportAccidentsRegisterDto.getTechnicalDirectorPartResult());
                eamReportAccidentsRegister.setTechnicalDirectorPartConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
                if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
                if ("2".equals(eamReportAccidentsRegisterDto.getTechnicalDirectorPartResult())){
                    //技术主管室级领导拒绝
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
                }else {

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportProductHazardsServiceImpl.java

@@ -1,5 +1,8 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -8,22 +11,39 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EamReportAccidentsRegisterEnum;
import org.jeecg.modules.eam.constant.EamReportProductHazardsEnum;
import org.jeecg.modules.eam.dto.EamReportProductHazardsDto;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamReportAccidentsRegister;
import org.jeecg.modules.eam.entity.EamReportProductHazards;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.mapper.EamReportProductHazardsMapper;
import org.jeecg.modules.eam.request.EamReportProductHazardsQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamReportProductHazardsService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -31,9 +51,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.Arrays;
import java.util.List;
import java.util.Set;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -43,7 +62,7 @@
 * @Version: V1.0
 */
@Service("IEamReportProductHazardsService")
public class EamReportProductHazardsServiceImpl extends ServiceImpl<EamReportProductHazardsMapper, EamReportProductHazards> implements IEamReportProductHazardsService {
public class EamReportProductHazardsServiceImpl extends ServiceImpl<EamReportProductHazardsMapper, EamReportProductHazards> implements IEamReportProductHazardsService, FlowCallBackServiceI {

    @Autowired
    private IBaseFactoryUserService baseFactoryUserService;
@@ -52,7 +71,25 @@
    @Autowired
    @Lazy
    private IEamReportRepairService iEamReportRepairService;
    @Resource
    private IFlowMyBusinessService flowMyBusinessService;

    @Resource
    private TaskService taskService;

    @Resource
    private IFlowTaskService flowTaskService;

    @Autowired
    private ISysUserService sysUserService;

    @Resource
    private FlowCommonService flowCommonService;

    @Resource
    private IFlowDefinitionService flowDefinitionService;
    @Resource
    private IEamEquipmentService eamEquipmentService;
    /**
     * åˆ†é¡µåˆ—表
     * @param page
@@ -94,6 +131,13 @@
            if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getEquipmentName())) {
                queryWrapper.like("e.equipment_name", eamReportProductHazardsQuery.getEquipmentName());
            }
            if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getConfirmStatus())) {
                queryWrapper.eq("erph.confirm_status", eamReportProductHazardsQuery.getConfirmStatus());
            }
            if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getProductLoss())) {
                queryWrapper.eq("erph.product_loss", eamReportProductHazardsQuery.getProductLoss());
            }
            queryWrapper.eq("erph.del_flag", CommonConstant.DEL_FLAG_0);
            //排序
            if (StringUtils.isNotBlank(eamReportProductHazardsQuery.getColumn()) && StringUtils.isNotBlank(eamReportProductHazardsQuery.getOrder())) {
                String column = eamReportProductHazardsQuery.getColumn();
@@ -137,7 +181,164 @@
     */
    @Override
    public Result<?> submit(String id){
        EamReportProductHazards eamReportProductHazards=this.getById(id);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        EamEquipment eamEquipment = eamEquipmentService.getById(eamReportProductHazards.getEquipmentId());
        List<UserSelector> userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0024);
        // å¯åŠ¨è®¾å¤‡äº‹æ•…登记流程
        flowCommonService.initActBusiness("设备编号：" + eamEquipment.getEquipmentCode() + ", è®¾å¤‡åç§°ï¼š" + eamEquipment.getEquipmentName()+"发起产品安全隐患确认流程",
                eamReportProductHazards.getId(),
                "IEamReportProductHazardsService",
                "eam_report_product_hazards",
                null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", eamReportProductHazards.getId());
        variables.put("organization", "操作工提交启动流程");
        variables.put("comment", "操作工提交单启动流程");
        variables.put("proofreading", true);
        if (CollectionUtils.isEmpty(userSelectorList)) {
            throw new JeecgBootException("设备未存在主管工艺，无法进入下级审批！");
        }else {
            List<String> usernameList = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.toList());
            variables.put("NextAssignee", usernameList);
        }
        Result result = flowDefinitionService.startProcessInstanceByKey("eam_report_product_hazards", variables);
        if (!result.isSuccess()) {
            return Result.error("流程启动失败");
        } else {
            eamReportProductHazards.setConfirmer(user.getUsername());
            eamReportProductHazards.setConfirmTime(new Date());
            eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_SUPERIOR_TECHNICAL_CONFIRMATION.name());
            this.updateById(eamReportProductHazards);
            return result;
        }
    }

    /**
     * æµç¨‹å®¡æ ¸
     * @param eamReportProductHazardsDto
     */
    @Override
    public Result<?> audit(EamReportProductHazardsDto eamReportProductHazardsDto){
        EamReportProductHazards eamReportProductHazards = this.baseMapper.selectById(eamReportProductHazardsDto.getId());
        if (eamReportProductHazards == null) {
            throw new JeecgBootException("工单不存在，请刷新重试！");
        }
        // èŽ·å–当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("未获取到登录用户，请重新登录后再试！");
        }
        eamReportProductHazardsDto.setAssignee(user.getUsername());
        // èŽ·å–流程业务记录
        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(eamReportProductHazardsDto.getInstanceId());
        if (flowMyBusiness == null) {
            throw new JeecgBootException("流程实例不存在，请刷新后重试！");
        }
        boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
        if (!userAuthorized) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // è®¤é¢†ä»»åŠ¡
        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }
        EamEquipment equipment = eamEquipmentService.getById(eamReportProductHazardsDto.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }
        EamReportProductHazardsEnum status = EamReportProductHazardsEnum.getInstance(eamReportProductHazards.getConfirmStatus());
        if (status == null) {
        return null;
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        List<String> userApprovalList;
        List<UserSelector> userSelectors;
        switch (status) {
            //待主管工艺确认
            case PENDING_SUPERIOR_TECHNICAL_CONFIRMATION:
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0025);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未存在副部级领导，无法进入下级审批！");
                }else{
                    userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("NextAssignee", userApprovalList);
                    values.put("dataId", eamReportProductHazardsDto.getId());
                    if (StrUtil.isEmpty(eamReportProductHazardsDto.getTechnologistComment())){
                        eamReportProductHazardsDto.setTechnologistComment("");
                    }
                    values.put("organization",eamReportProductHazardsDto.getTechnologistComment());
                    values.put("comment", eamReportProductHazardsDto.getTechnologistComment());
                    values.put("technologistResult", eamReportProductHazardsDto.getTechnologistResult());
                    eamReportProductHazardsDto.setComment(eamReportProductHazardsDto.getTechnologistComment());
                    eamReportProductHazards.setTechnologist(user.getUsername());
                    eamReportProductHazards.setTechnologistTime(new Date());
                    eamReportProductHazards.setTechnologistResult(eamReportProductHazardsDto.getTechnologistResult());
                    eamReportProductHazards.setTechnologistComment(eamReportProductHazardsDto.getTechnologistComment());
                    if ("2".equals(eamReportProductHazardsDto.getTechnologistResult())){
                        //主管工艺拒绝
                        eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.REJECTED.name());
                    }else {
                        eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_DEPARTMENT_LEADER_CONFIRMATION.name());
                    }
                }
                break;
            //待副部级领导确认
            case PENDING_DEPARTMENT_LEADER_CONFIRMATION:
                values.put("dataId", eamReportProductHazardsDto.getId());
                if (StrUtil.isEmpty(eamReportProductHazardsDto.getDeputyDepartmentComment())){
                    eamReportProductHazardsDto.setDeputyDepartmentComment("");
                }
                values.put("organization",eamReportProductHazardsDto.getDeputyDepartmentComment());
                values.put("comment", eamReportProductHazardsDto.getDeputyDepartmentComment());
                values.put("deputyDepartmentResult", eamReportProductHazardsDto.getDeputyDepartmentResult());
                eamReportProductHazardsDto.setComment(eamReportProductHazardsDto.getDeputyDepartmentComment());
                eamReportProductHazards.setDeputyDepartment(user.getUsername());
                eamReportProductHazards.setDeputyDepartmentTime(new Date());
                eamReportProductHazards.setDeputyDepartmentResult(eamReportProductHazardsDto.getDeputyDepartmentResult());
                eamReportProductHazards.setDeputyDepartmentComment(eamReportProductHazardsDto.getDeputyDepartmentComment());
                if ("2".equals(eamReportProductHazardsDto.getDeputyDepartmentResult())){
                    //副部级领导拒绝
                    eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.REJECTED.name());
                }else {
                    eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.REPAIR_COMPLETED.name());
                }
                break;
            default:
                throw  new JeecgBootException("审批失败");
        }
        eamReportProductHazardsDto.setValues(values);
        //保存工单
        this.updateById(eamReportProductHazards);
        Result result = flowTaskService.complete(eamReportProductHazardsDto);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        return Result.ok("审批成功");
    }

    private boolean claimTask(String taskId, LoginUser user) {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (task == null) {
            return false;
        }
        if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
            return false;
        }
        taskService.claim(taskId, user.getUsername());
        return true;
    }

    /**
     * åˆ¤æ–­ç”¨æˆ·æ˜¯å¦æ‹¥æœ‰æ­¤æƒé™
     * @param flowMyBusiness
     * @param user
     * @return
     */
    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
        List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
        return todoUsers != null && todoUsers.contains(user.getUsername());
    }

    /**
@@ -166,4 +367,26 @@
        this.removeById(id);
        return true;
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {

    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return null;
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return Collections.emptyMap();
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java

@@ -197,6 +197,8 @@
            EamReportProductHazards eamReportProductHazards=new EamReportProductHazards();
            eamReportProductHazards.setEquipmentId(eamReportRepair.getEquipmentId());
            eamReportProductHazards.setReportId(eamReportRepair.getId());
            eamReportProductHazards.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
            eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_SUBMIT.name());
            iEamReportProductHazardsService.save(eamReportProductHazards);
        }
        if (StrUtil.isNotEmpty(eamReportRepair.getIsAccidentsRegister())&&("1").equals(eamReportRepair.getIsAccidentsRegister())) {
@@ -208,7 +210,7 @@
            eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
            iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
        }
        //生成维修工单,可能会有领取操作
        //生成维修工单
        EamRepairOrder eamRepairOrder=new EamRepairOrder();
        BeanUtils.copyProperties(eamReportRepairRequest, eamRepairOrder);
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java

@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.util.StrUtil;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
@@ -19,6 +20,7 @@
import org.jeecg.modules.eam.dto.EamReportProductHazardsDto;
import org.jeecg.modules.eam.dto.EamReportRepairDto;
import org.jeecg.modules.eam.entity.EamReportProductHazards;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportProductHazardsQuery;
import org.jeecg.modules.eam.service.IEamReportProductHazardsService;

@@ -27,6 +29,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -50,7 +53,8 @@
public class EamReportProductHazardsController extends JeecgController<EamReportProductHazards, IEamReportProductHazardsService> {
    @Autowired
    private IEamReportProductHazardsService eamReportProductHazardsService;

     @Autowired
     private IEamReportRepairService eamReportRepairService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -85,6 +89,43 @@
    public Result<String> add(@RequestBody EamReportProductHazards eamReportProductHazards) {
        eamReportProductHazardsService.save(eamReportProductHazards);
        return Result.OK("添加成功！");
    }

     /**
      * æ“ä½œå·¥æäº¤-发起流程
      * @param id
      * @return
      */
     @ApiOperation(value = "设备事故登记表-提交", notes = "设备事故登记表-提交")
     @GetMapping(value = "/submit")
     public Result<?> submit(String id){
         // æ ¡éªŒé¢†å–权限
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (!BusinessCodeConst.PCR0001.equals(user.getPost())) {
             return Result.error("提交失败,没有提交权限！,需操作工提交");
         }
         eamReportProductHazardsService.submit(id);
         return Result.OK("提交成功！");
     }

     /**
      * æˆ‘的待办 æ‰§è¡Œ/审批
      *
      * @param eamReportProductHazardsDto
      * @return
      */
     @AutoLog(value = "设备事故登记表-执行/审批")
     @ApiOperation(value = "设备事故登记表-执行/审批", notes = "设备事故登记表-执行/审批")
     @PostMapping(value = "/perform")
     public Result<?> audit(@RequestBody  EamReportProductHazardsDto eamReportProductHazardsDto){
         if (eamReportProductHazardsDto == null) {
             return Result.error("审批的对象不能为空！");
         }
         // æ£€æŸ¥è¯·æ±‚参数
         if (StrUtil.isBlank(eamReportProductHazardsDto.getTaskId()) || StrUtil.isBlank(eamReportProductHazardsDto.getDataId()) || StrUtil.isBlank(eamReportProductHazardsDto.getInstanceId())) {
             return Result.error("审批任务错误或不存在！");
         }
         return eamReportProductHazardsService.audit(eamReportProductHazardsDto);
    }

    /**
@@ -148,6 +189,10 @@
        if(eamReportProductHazards==null) {
            return Result.error("未找到对应数据");
        }
        EamReportRepair eamReportRepair=eamReportRepairService.getById(eamReportProductHazards.getReportId());
        eamReportProductHazards.setBatchNumber(eamReportRepair.getBatchNumber());
        eamReportProductHazards.setProcessingPart(eamReportRepair.getProcessingPart());
        eamReportProductHazards.setQuantity(eamReportRepair.getQuantity());
        return Result.OK(eamReportProductHazards);
    }