art: 技术状态变更-接口添加

zhangherong

6 天以前 45e436de24a2e8e381ac89592cb6342fe6165e6d

art: 技术状态变更-接口添加

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

@@ -33,6 +33,8 @@
    String TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE = "TechnicalStatusEvaluationOrderCodeRule";
    //技术状态鉴定工单变更编码规则
    String TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE = "TechnicalStatusEvaluationOrderChangeCodeRule";
    //技术状态变更编码规则
    String TECHNICAL_STATUS_CHANG_CODE_RULE = "TechnicalStatusChangeCodeRule";
    /**
     * 备件请购单状态 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */
@@ -94,6 +96,8 @@
    String PCR0016 = "PCR0016";
    //运维管理室室主任
    String PCR0017 = "PCR0017";
    //使用单位主管部级领导
    String PCR0018 = "PCR0018";

    //通过、驳回
    String APPROVED = "1";

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

@@ -9,6 +9,7 @@
    TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK, //设备安全装置检查单
    TECHNICAL_STATUS_EVALUATION_OTHER_CHECK, //其他检查项目
    TECHNICAL_STATUS_EVALUATION_PRECISION_CHECK, //设备精度检查单
    TECHNICAL_STATUS_EVALUATION_ORDER_CHANG, //技术状态鉴定工单变更
    TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE, //技术状态鉴定工单变更
    TECHNICAL_STATUS_CHANGE, //技术状态变更申请
    ;
}

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

@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -67,6 +68,9 @@
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        if(CollectionUtil.isEmpty(request.getTableDetailList())) {
            return Result.error("设备明细不能为空！");
        }
        boolean b = eamTechnicalStatusChangeService.addEamTechnicalStatusChange(request);
        if (!b) {
            return Result.error("添加失败！");

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

@@ -19,6 +19,9 @@
    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**申请单位*/
    @ApiModelProperty(value = "申请单位")
    private String factoryOrgCode;
    /**使用单位室主管签字结果*/
    @ApiModelProperty(value = "使用单位室主管签字结果")
    private String departHeaderSignatureResult;

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

@@ -19,4 +19,10 @@
     * @return
     */
    List<EamTechnicalStatusChangeDetail> queryList(String orderId);

    /**
     * 删除变更单下的设备明细
     * @param changeId
     */
    void removeByChangeId(String changeId);
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeDetailMapper;
@@ -7,6 +8,7 @@
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@@ -26,4 +28,12 @@
        queryWrapper.orderByAsc("ems.create_time");
        return this.getBaseMapper().queryList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void removeByChangeId(String changeOrderId) {
        LambdaQueryWrapper<EamTechnicalStatusChangeDetail> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamTechnicalStatusChangeDetail::getChangeOrderId, changeOrderId);
        this.remove(queryWrapper);
    }
}

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

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

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,34 +10,51 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
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.TranslateDictTextUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusChangeOrderStatusEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeDetailService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService;
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.ISysBusinessCodeRuleService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: 技术状态变更申请
 * @Author: jeecg-boot
 * @Date:   2025-07-09
 * @Date: 2025-07-09
 * @Version: V1.0
 */
@Service("IEamTechnicalStatusChangeService")
@@ -44,6 +63,27 @@
    private IBaseFactoryUserService baseFactoryUserService;
    @Autowired
    private IBaseFactoryService baseFactoryService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;
    @Autowired
    private IEamTechnicalStatusChangeDetailService changeDetailService;
    @Autowired
    private IEamEquipmentService equipmentService;
    @Autowired
    private ISysUserService sysUserService;
    @Autowired
    private FlowCommonService flowCommonService;
    @Autowired
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private IFlowTaskService flowTaskService;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

    @Override
    public IPage<EamTechnicalStatusChange> queryPageList(Page<EamTechnicalStatusChange> page, EamTechnicalStatusChangeQuery query) {
        QueryWrapper<EamTechnicalStatusChange> queryWrapper = new QueryWrapper<>();
@@ -76,7 +116,7 @@
                queryWrapper.between("designer_time", query.getDateBegin(), query.getDateEnd());
            }
            //申请单位
            if(StringUtils.isNotBlank(query.getFactoryOrgCode())) {
            if (StringUtils.isNotBlank(query.getFactoryOrgCode())) {
                queryWrapper.eq("factory_org_code", query.getFactoryOrgCode());
            }
            //排序
@@ -102,25 +142,231 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addEamTechnicalStatusChange(EamTechnicalStatusChangeRequest request) {
        return false;
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("获取登录用户信息失败！");
        }
        EamTechnicalStatusChange order = new EamTechnicalStatusChange();
        order.setDesigner(sysUser.getUsername());
        order.setDesignerTime(new Date());
        order.setRemark(request.getRemark());
        order.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name());
        order.setFactoryOrgCode(request.getFactoryOrgCode());
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_CHANG_CODE_RULE);
        order.setChangeOrderNum(codeSeq);
        //删除标记
        order.setDelFlag(CommonConstant.DEL_FLAG_0);
        //技术状态变更申请表
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_CHANGE.name());
        if (eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态变更的HF编码，添加失败！");
        }
        order.setHfCode(eamBaseHFCode.getHfCode());
        this.getBaseMapper().insert(order);
        //处理明细数据
        request.getTableDetailList().forEach(detail -> {
            EamEquipment equipment = equipmentService.getById(detail.getEquipmentId());
            if (equipment == null) {
                throw new JeecgBootException("设备[" + detail.getEquipmentCode() + "]不存在！");
            }
            detail.setId(null);
            detail.setCreateBy(null);
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
        });
        changeDetailService.saveBatch(request.getTableDetailList());
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editEamTechnicalStatusChange(EamTechnicalStatusChangeRequest request) {
        return false;
        EamTechnicalStatusChange entity = this.getBaseMapper().selectById(request.getId());
        if(entity == null) {
            throw new JeecgBootException("要编辑的数据不存在！");
        }
        if(!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
            throw new JeecgBootException("只有待提交的状态才支持编辑！");
        }
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("获取登录用户信息失败！");
        }
        entity.setRemark(request.getRemark());
        entity.setFactoryOrgCode(request.getFactoryOrgCode());
        this.getBaseMapper().updateById(entity);
        //删除原来的设备明细
        changeDetailService.removeByChangeId(entity.getId());
        //处理明细数据
        request.getTableDetailList().forEach(detail -> {
            EamEquipment equipment = equipmentService.getById(detail.getEquipmentId());
            if (equipment == null) {
                throw new JeecgBootException("设备[" + detail.getEquipmentCode() + "]不存在！");
            }
            detail.setId(null);
            detail.setCreateBy(null);
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
        });
        changeDetailService.saveBatch(request.getTableDetailList());
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(String id) {
        return false;
        EamTechnicalStatusChange entity = this.getBaseMapper().selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的工单不存在，请刷新重试！");
        }
        if (!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
            throw new JeecgBootException("该工单已进行过提交！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if(sysUser == null || !sysUser.getUsername().equals(entity.getDesigner())) {
            throw new JeecgBootException("不是本人，不能提交此工单！");
        }
        entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.DEPART_HEADER_SIGNING.name());
        //查询下级审批人员
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(null, entity.getFactoryOrgCode(), BusinessCodeConst.PCR0011);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给使用单位主管室级领导，无法提交！");
        }
        List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        //更新实体
        this.getBaseMapper().updateById(entity);
        //使用单位翻译
        String factoryName = translateDictTextUtils.translateField("factory_org_code", entity.getFactoryOrgCode(), "eam_base_factory, factory_name, org_code");
        //启动流程
        flowCommonService.initActBusiness("工单号: " + entity.getChangeOrderNum() + ";申请单位: " + factoryName,
                entity.getId(), "IEamTechnicalStatusChangeService", "technical_status_change_process", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        if (StrUtil.isEmpty(entity.getRemark())) {
            variables.put("organization", "新增技术状态变更默认启动流程");
            variables.put("comment", "新增技术状态变更默认启动流程");
        } else {
            variables.put("organization", entity.getRemark());
            variables.put("comment", entity.getRemark());
        }
        variables.put("proofreading", true);
        variables.put("NextAssignee", userApprovalList);
        Result<?> result = flowDefinitionService.startProcessInstanceByKey("technical_status_change_process", variables);
        if(result == null || !result.isSuccess()) {
            throw new JeecgBootException("启动流程失败！");
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public EamTechnicalStatusChange approval(EamTechnicalStatusChangeRequest request) {
        return null;
        EamTechnicalStatusChange entity = this.getBaseMapper().selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("审批的数据已删除，请刷新重试！");
        }
        // 获取当前登录用户
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("未获取到登录用户，请重新登录后再试！");
        }
        request.setAssignee(user.getUsername());
        // 获取流程业务记录
        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId());
        if (flowMyBusiness == null) {
            throw new JeecgBootException("流程实例不存在，请刷新后重试！");
        }

        boolean userAuthorized = flowMyBusinessService.isUserAuthorized(flowMyBusiness, user);
        if (!userAuthorized) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // 认领任务
        if (!flowMyBusinessService.claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }

        TechnicalStatusChangeOrderStatusEnum status = TechnicalStatusChangeOrderStatusEnum.getInstance(entity.getChangeStatus());
        if (status == null) {
            return null;
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        List<String> userApprovalList;
        List<UserSelector> userSelectors;
        switch (status) {
            case DEPART_HEADER_SIGNING:
                userSelectors = sysUserService.selectOperatorList(null, entity.getFactoryOrgCode(), BusinessCodeConst.PCR0018);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未分配给使用单位主管部级领导，无法进入下级审批！");
                }
                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getDepartHeaderComment())) {
                    values.put("organization", "技术状态变更使用单位主管室级领导");
                    values.put("comment", "技术状态变更使用单位主管室级领导");
                    request.setComment("技术状态变更使用单位主管室级领导");
                } else {
                    values.put("organization", request.getDepartHeaderComment());
                    values.put("comment", request.getDepartHeaderComment());
                    request.setComment(request.getDepartHeaderComment());
                }

                //设置entity
                entity.setDepartHeaderSignature(user.getUsername());
                entity.setDepartHeaderSignatureTime(new Date());
                entity.setDepartHeaderComment(request.getDepartHeaderComment());
                entity.setDepartHeaderSignatureResult(request.getDepartHeaderSignatureResult());
                values.put("departHeaderConfirmFlag", request.getDepartHeaderSignatureResult());
                if(BusinessCodeConst.APPROVED.equals(request.getDepartHeaderSignatureResult())) {
                    //通过
                    entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.DEPART_LEADER_SIGNING.name());
                    values.put("NextAssignee", userApprovalList);
                }else {
                    //驳回
                    entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.REJECTED.name());
                }
                break;
            case DEPART_LEADER_SIGNING:
                //部门领导审核
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getDepartLeaderComment())) {
                    values.put("organization", "技术状态变更部级领导审核");
                    values.put("comment", "技术状态变更部级领导审核");
                    request.setComment("技术状态变更部级领导审核");
                } else {
                    values.put("organization", request.getDepartLeaderComment());
                    values.put("comment", request.getDepartLeaderComment());
                    request.setComment(request.getDepartLeaderComment());
                }
                //设置entity
                entity.setDepartLeaderSignature(user.getUsername());
                entity.setDepartLeaderSignatureTime(new Date());
                entity.setDepartLeaderSignatureResult(request.getDepartLeaderSignatureResult());
                entity.setDepartLeaderComment(request.getDepartLeaderComment());
                if(BusinessCodeConst.APPROVED.equals(request.getDepartLeaderSignatureResult())) {
                    //通过
                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.COMPLETED.name());
                }else {
                    //驳回
                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.REJECTED.name());
                }
                break;
        }
        request.setValues(values);

        // 完成流程任务
        Result<?> result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        //保存工单
        this.getBaseMapper().updateById(entity);
        return entity;
    }

    @Override

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

@@ -172,7 +172,7 @@
        request.setApplyDate(new Date());
        request.setFactoryOrgCode(equipment.getFactoryOrgCode());
        //技术状态鉴定表
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG.name());
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE.name());
        if (eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态鉴定变更的HF编码，添加失败！");
        }

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

@@ -166,7 +166,6 @@
            throw new JeecgBootException("技术状态鉴定规范检查项为空，添加失败！");
        }
        EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
        order.setOrderNum(request.getOrderNum());
        order.setEquipmentId(request.getEquipmentId());
        order.setStandardId(request.getStandardId());
        order.setEvaluationDate(request.getEvaluationDate());