art: 设备管理-点检工单-点检增加确认类型，确认意见字段

zhangherong

2025-04-18 faf06098c4bf5c351cc190f97a743ddcf2d3fd0c

art: 设备管理-点检工单-点检增加确认类型，确认意见字段

 db/Êý¾Ý¿â²úÆ·»¯Éè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-4-16 17:11:07",
  "updatedTime": "2025-4-17 16:10:18",
  "dbConns": [],
  "profile": {
    "default": {
@@ -4717,8 +4717,44 @@
          "id": "9E1E21C7-514F-491B-AFD8-BB810BB8D06C"
        },
        {
          "defKey": "confirm_deal_type",
          "defName": "确认类型",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "0C006924-8415-4148-919E-3EF09EB76D5D"
        },
        {
          "defKey": "confirm_comment",
          "defName": "确认意见",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "98BA313C-F5DE-438E-9F58-133F1EE63002"
        },
        {
          "defKey": "confirm_user",
          "defName": "设备管理员确认",
          "defName": "班组长确认",
          "comment": "",
          "type": "",
          "len": "",

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,7 +8,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;

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

@@ -112,6 +112,13 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "确认时间")
    private Date confirmTime;
    /**确认意见*/
    @ApiModelProperty(value = "确认意见")
    private String confirmComment;
    /** ç¡®è®¤ç±»åž‹ 1 é€šè¿‡  2 é©³å›ž */
    @ApiModelProperty(value = "确认类型")
    @Dict(dicCode = "approved_rejected")
    private String confirmDealType;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注-点检工单创建备注")
@@ -134,14 +141,6 @@
    /**列表 ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "列表 ä¿å…»é¡¹æ˜Žç»†")
    private transient List<EamInspectionOrderDetail> tableDetailList;

    /**处理类型*/
    @ApiModelProperty(value = "处理类型")
    private transient String dealType;

    /**处理意见*/
    @ApiModelProperty(value = "处理意见")
    private transient String dealSuggestion;

    @ApiModelProperty(value = "设备名称")
    @TableField(exist = false)

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

@@ -26,7 +26,6 @@
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
@@ -47,72 +46,58 @@
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**工单号*/
    @Excel(name = "工单号", width = 15)
    @ApiModelProperty(value = "工单号")
    private String orderNum;
    /**设备ID*/
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    @Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
    private String equipmentId;
    /**标准ID*/
    @Excel(name = "保养标准ID", width = 15)
    @ApiModelProperty(value = "保养标准ID")
    @Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
    private String standardId;
    /**点检日期*/
    @Excel(name = "点检日期（计划）", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "点检日期")
    private Date inspectionDate;
    /**点检过期时间*/
    @Excel(name = "点检过期时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "点检过期时间")
    private Date expirationTime;
    /**点检时间*/
    @Excel(name = "点检时间（实际）", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "点检时间")
    private Date operateTime;
    /**点检人*/
    @Excel(name = "点检人", width = 15)
    @ApiModelProperty(value = "点检人-是领取人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String operator;
    /**创建方式*/
    @Excel(name = "创建方式", width = 15)
    @ApiModelProperty(value = "创建方式")
    private String creationMethod;
    /**点检状态*/
    @Excel(name = "点检状态", width = 15)
    @ApiModelProperty(value = "点检状态   å¾…点检-待确认-已完成")
    private String inspectionStatus;
    /**班组长确认*/
    @Excel(name = "班组长确认", width = 15)
    @ApiModelProperty(value = "班组长确认--领取后产生")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String confirmUser;
    /**确认时间*/
    @Excel(name = "确认时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "确认时间")
    private Date confirmTime;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注-点检工单创建备注")
    private String remark;
    /**照片文件ids;id以逗号分隔*/
    @Excel(name = "照片文件ids;id以逗号分隔-执行时", width = 15)
    @ApiModelProperty(value = "照片文件ids;id以逗号分隔")
    private String imageFiles;

@@ -124,11 +109,11 @@
    @ApiModelProperty(value = "列表 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamInspectionOrderDetail> tableDetailList;

    /**处理类型*/
    @ApiModelProperty(value = "处理类型")
    private String dealType;

    /**处理意见*/
    @ApiModelProperty(value = "处理意见")
    private String dealSuggestion;
    /**确认意见*/
    @ApiModelProperty(value = "确认意见")
    private String confirmComment;
    /** ç¡®è®¤ç±»åž‹ 1 é€šè¿‡  2 é©³å›ž */
    @ApiModelProperty(value = "确认类型")
    @Dict(dicCode = "approved_rejected")
    private String confirmDealType;
}

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

@@ -388,11 +388,11 @@
        } else {
            // ç­ç»„长确认
            values.put("dataId", order.getId());
            values.put("organization", request.getDealSuggestion());
            values.put("comment", request.getDealSuggestion());
            values.put("confirmation", request.getDealType());
            request.setComment(request.getDealSuggestion());
            if ("2".equals(request.getDealType())) {
            values.put("organization", request.getConfirmComment());
            values.put("comment", request.getConfirmComment());
            values.put("confirmation", request.getConfirmDealType());
            request.setComment(request.getConfirmComment());
            if ("2".equals(request.getConfirmDealType())) {
                // ç­ç»„长驳回
                List<String> usernames = new ArrayList<>();
                usernames.add(order.getOperator());
@@ -405,16 +405,18 @@

    private void updateOrderStatus(Result result, EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
        if (result.isSuccess()) {
            if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
            if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getConfirmDealType())) {
                // ç‚¹æ£€å®Œæˆ
                order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
                order.setOperateTime(new Date());
                eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
                eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
            } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getDealType())) {
            } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
                // ç­ç»„长确认任务
                order.setInspectionStatus(InspectionStatus.COMPLETE.name());
                order.setConfirmUser(user.getUsername());
                order.setConfirmComment(request.getConfirmComment());
                order.setConfirmDealType(request.getConfirmDealType());
                order.setConfirmTime(new Date());
            }
        }