art:技术状态鉴定工单，查询，新增接口添加

zhangherong

9 天以前 67696c754ea8799a9f0de646bba61e55d8981833

art:技术状态鉴定工单，查询，新增接口添加

 db/430É豸¹ÜÀíÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -2,7 +2,7 @@
  "name": "430设备管理数据库设计",
  "describe": "描述设备管理数据库设计文档",
  "avatar": "",
  "version": "4.9.4",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-14 11:25:39",
  "dbConns": [],
@@ -28860,6 +28860,24 @@
          "uiHint": null
        },
        {
          "defKey": "equipment_id",
          "defName": "设备ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "E09E9780-84C0-49B3-BFE5-8BDDA43E157B"
        },
        {
          "defKey": "change_order_num",
          "defName": "变更单号",
          "comment": "",
@@ -28973,7 +28991,7 @@
          "uiHint": null
        },
        {
          "defKey": "deferred_maintenance_date",
          "defKey": "deferred_evaluation_date",
          "defName": "变更鉴定日期",
          "comment": "",
          "type": "",

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

@@ -31,6 +31,8 @@
    String TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE = "TechnicalStatusStandardCodeRule";
    //技术状态鉴定工单编码规则
    String TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE = "TechnicalStatusEvaluationOrderCodeRule";
    //技术状态鉴定工单变更编码规则
    String TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE = "TechnicalStatusEvaluationOrderChangeCodeRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */

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

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

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

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

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,14 +59,20 @@
    /**
     * æ·»åŠ 
     *
     * @param eamTechnicalStatusEvaluationOrderChange
     * @param request
     * @return
     */
    @AutoLog(value = "技术状态鉴定工单变更-添加")
    @ApiOperation(value="技术状态鉴定工单变更-添加", notes="技术状态鉴定工单变更-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) {
        eamTechnicalStatusEvaluationOrderChangeService.save(eamTechnicalStatusEvaluationOrderChange);
    public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderChange request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        boolean b = eamTechnicalStatusEvaluationOrderChangeService.addTechnicalStatusEvaluationOrderChange(request);
        if (!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }
    

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

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;

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 io.swagger.annotations.ApiModel;
@@ -46,6 +47,9 @@
    /**工单ID*/
    @ApiModelProperty(value = "工单ID")
    private String orderId;
    /**设备ID*/
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**变更单号*/
    @ApiModelProperty(value = "变更单号")
    private String changeOrderNum;
@@ -66,7 +70,7 @@
    private String applyReason;
    /**变更鉴定日期*/
    @ApiModelProperty(value = "变更鉴定日期")
    private Date deferredMaintenanceDate;
    private Date deferredEvaluationDate;
    /**主管领导签字*/
    @ApiModelProperty(value = "主管领导签字")
    private String equipmentManagerSignature;
@@ -94,4 +98,13 @@
    /**HF编码*/
    @ApiModelProperty(value = "HF编码")
    private String hfCode;

    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String equipmentModel;
    @TableField(exist = false)
    private Date originalEvaluationDate;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderChangeMapper.java

@@ -1,10 +1,12 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: æŠ€æœ¯çŠ¶æ€é‰´å®šå·¥å•å˜æ›´
@@ -13,5 +15,11 @@
 * @Version: V1.0
 */
public interface EamTechnicalStatusEvaluationOrderChangeMapper extends BaseMapper<EamTechnicalStatusEvaluationOrderChange> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param page
     * @param queryWrapper
     * @return
     */
    IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper);
}

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

@@ -2,4 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper">

    <select id="queryPageList"
            resultType="org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange">
        select ems.*, e.equipment_code, e.equipment_name, e.equipment_model, emo.evaluation_date as originalEvaluationDate
        from eam_technical_status_evaluation_order_change ems
        inner join eam_technical_status_evaluation_order emo on ems.order_id = emo.id
        inner join eam_equipment e on ems.equipment_id = e.id
        ${ew.customSqlSegment}
    </select>
</mapper>

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

@@ -21,4 +21,11 @@
     * @return
     */
    IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query);

    /**
     * æ·»åŠ 
     * @param request
     * @return
     */
    boolean addTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request);
}

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

@@ -43,4 +43,12 @@
     * @return
     */
    EamTechnicalStatusEvaluationOrder approval(EamTechnicalStatusEvaluationOrderRequest request);

    /**
     * æ›´æ–°å·¥å•çŠ¶æ€
     * @param orderId
     * @param evaluationStatus
     * @return
     */
    boolean updateEvaluationStatus(String orderId, String evaluationStatus);
}

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

@@ -1,26 +1,191 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
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.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderStatusEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: æŠ€æœ¯çŠ¶æ€é‰´å®šå·¥å•å˜æ›´
 * @Author: jeecg-boot
 * @Date:   2025-07-09
 * @Date: 2025-07-09
 * @Version: V1.0
 */
@Service
public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService {
@Service("IEamTechnicalStatusEvaluationOrderChangeService")
public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService, FlowCallBackServiceI {
    @Autowired
    private IBaseFactoryUserService baseFactoryUserService;
    @Autowired
    private IBaseFactoryService baseFactoryService;
    @Autowired
    private IEamTechnicalStatusEvaluationOrderService evaluationOrderService;
    @Autowired
    private IEamEquipmentService equipmentService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;

    @Override
    public IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query) {
        QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("ems.del_flag", CommonConstant.DEL_FLAG_0);
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
            queryWrapper.in("e.equipment_code", equipArr);
        } else {
            //没有选择设备，根据中心过滤设备
            List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.
                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
            if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
                Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                queryWrapper.in("e.factory_org_code", factoryCodeList);
            } else {
                return page;
            }
        }
        if (query != null) {
            //编码 æ¨¡ç³ŠæŸ¥è¯¢
            if (StringUtils.isNotBlank(query.getChangeOrderNum())) {
                queryWrapper.like("ems.change_order_num", query.getChangeOrderNum());
            }
            //设备
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
                queryWrapper.eq("ems.equipment_id", query.getEquipmentId());
            }

            //保养分类
            if (StringUtils.isNotBlank(query.getChangeStatus())) {
                queryWrapper.eq("ems.change_status", query.getChangeStatus());
            }
            if (query.getDateBegin() != null && query.getDateEnd() != null) {
                queryWrapper.between("ems.apply_date", query.getDateBegin(), query.getDateEnd());
            }
            //排序
            if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
                String column = query.getColumn();
                if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
                    column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
                }
                if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
                    queryWrapper.orderByAsc("ems." + oConvertUtils.camelToUnderline(column));
                } else {
                    queryWrapper.orderByDesc("ems." + oConvertUtils.camelToUnderline(column));
                }
            } else {
                queryWrapper.orderByDesc("ems.create_time");
            }
        } else {
            queryWrapper.orderByDesc("ems.create_time");
        }
        return this.getBaseMapper().queryPageList(page, queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request) {
        //查询工单
        EamTechnicalStatusEvaluationOrder order = evaluationOrderService.getById(request.getOrderId());
        if (order == null) {
            throw new JeecgBootException("鉴定工单不存在，操作失败！");
        }
        //查询设备
        EamEquipment equipment = equipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备信息不存在，操作失败！");
        }
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("登录用户信息为空，操作失败！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE);
        request.setChangeOrderNum(codeSeq);
        request.setId(null);
        request.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name());
        request.setDelFlag(CommonConstant.DEL_FLAG_0);
        request.setApplicant(sysUser.getUsername());
        request.setApplyDate(new Date());
        request.setFactoryOrgCode(equipment.getFactoryOrgCode());
        //技术状态鉴定表
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG.name());
        if (eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态鉴定变更的HF编码，添加失败！");
        }
        request.setHfCode(eamBaseHFCode.getHfCode());
        this.getBaseMapper().insert(request);
        boolean b = evaluationOrderService.updateEvaluationStatus(request.getOrderId(), TechnicalStatusEvaluationOrderStatusEnum.CHANGING.name());
        if (!b) {
            throw new JeecgBootException("技术状态鉴定工单状态变更失败，无法变更！");
        }
        return true;
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

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

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程，业务干预，流程干预，指定人员进行处理
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}

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

@@ -4,6 +4,7 @@
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.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -570,6 +571,18 @@
        return entity;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean updateEvaluationStatus(String orderId, String evaluationStatus) {
        UpdateWrapper<EamTechnicalStatusEvaluationOrder> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("order_id", orderId);
        updateWrapper.set("evaluation_status", evaluationStatus);
        updateWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        updateWrapper.eq("evaluation_status", TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
        int update = this.getBaseMapper().update(null, updateWrapper);
        return update > 0;
    }

    private void checkDetailResult(List<EamTechnicalStatusEvaluationOrderDetail> detailList, TechnicalStatusEvaluationCheckCategoryEnum checkCategory) {
        boolean b;
        switch (checkCategory) {