Merge remote-tracking branch 'origin/master'

lyh

2 天以前 ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9

Merge remote-tracking branch 'origin/master'

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

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.4",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-23 19:33:38",
  "updatedTime": "2025-7-23 11:43:01",
  "dbConns": [],
  "profile": {
    "default": {
@@ -9084,6 +9084,42 @@
          "id": "6BEE092E-65D4-4D44-916B-EDB48C4BFBCB"
        },
        {
          "defKey": "order_num",
          "defName": "工单号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "2DF6DEC7-CE4E-4F1A-8F92-D175CB25C833"
        },
        {
          "defKey": "maintenance_date",
          "defName": "保养日期",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "AE0B0F0C-CC47-422E-B517-CC3C2992D44B"
        },
        {
          "defKey": "equipment_id",
          "defName": "设备ID",
          "comment": "",
@@ -9229,7 +9265,7 @@
        },
        {
          "defKey": "operate_time",
          "defName": "保养日期",
          "defName": "保养时间",
          "comment": "",
          "type": "",
          "len": "",
@@ -9300,6 +9336,24 @@
          "id": "4C11A4C0-29C2-423B-972B-C080B6023536"
        },
        {
          "defKey": "approved_rejected",
          "defName": "确认类型",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "869FCDB4-D5FF-4D44-B0D1-2E0DDF707052"
        },
        {
          "defKey": "confirm_time",
          "defName": "确认日期",
          "comment": "",
@@ -9334,6 +9388,24 @@
          "extProps": {},
          "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
          "id": "624246E9-5FFE-49D3-B975-4439FF9DA03B"
        },
        {
          "defKey": "remark",
          "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": "FBF88752-FD0D-4697-A427-85AB377753B3"
        }
      ],
      "correlations": [],
@@ -9581,6 +9653,42 @@
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "order_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": "7EBCA911-19F6-4317-A7F3-3B2901ADBF63"
        },
        {
          "defKey": "spare_code",
          "defName": "备件序号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "590E5C5B-22E6-42AC-9905-BC67F51B3137"
        },
        {
          "defKey": "spare_name",
          "defName": "备件名称",
          "comment": "",
@@ -9826,6 +9934,24 @@
          "id": "7E7714A5-B442-4842-8E65-6179F3F43740"
        },
        {
          "defKey": "remark",
          "defName": "备注",
          "comment": "",
          "type": "NVARCHAR",
          "len": 255,
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "",
          "id": "5175E822-55EE-4354-AED8-3A08F23BDAAF"
        },
        {
          "defKey": "create_by",
          "defName": "创建人",
          "comment": "",
@@ -9914,6 +10040,24 @@
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "F888AE02-055A-458A-98FD-CB22C3EA539B"
        },
        {
          "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": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "CCCA9FE5-4BB7-4C86-B3E4-45AE86A15C3F"
        },
        {
          "defKey": "order_id",
@@ -33104,12 +33248,12 @@
  "dbConn": [
    {
      "defKey": "949F6F53-7669-4EC7-923F-649A7D4D8273",
      "defName": "430",
      "defName": "hangyu",
      "type": "BFC87171-C74F-494A-B7C2-76B9C55FACC9",
      "properties": {
        "driver_class_name": "com.microsoft.sqlserver.jdbc.SQLServerDriver",
        "url": "jdbc:sqlserver://127.0.0.1:1433;DatabaseName=LXZN_TEST_430_NEW",
        "password": "",
        "url": "jdbc:sqlserver://192.168.1.118:1433;DatabaseName=LXZN_TEST_HANGYU",
        "password": "123",
        "username": "sa",
        "customer_driver": ""
      }

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

@@ -21,6 +21,8 @@
    String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule";
    //三保变更编码规则
    String THIRD_MAINTENANCE_CHANGE_CODE_RULE = "ThirdMaintenanceChangeCodeRule";
    //真空热处理炉编码规则
    String THIRD_MAINTENANCE_FURNACE_CODE_RULE = "ThirdMaintenanceFurnaceCodeRule";
    //设备借出归还
    String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule";
    //设备封存启封

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

@@ -6,6 +6,7 @@
    THIRD_MAINTENANCE_HANDOVER, //三保移交单
    THIRD_MAINTENANCE_ACCEPTANCE, //三保验收单
    THIRD_MAINTENANCE_CHANGE, //三保变更单
    THIRD_MAINTENANCE_FURNACE, //真空热处理炉整体性能检测表
    TECHNICAL_STATUS_EVALUATION, //技术状态鉴定表
    TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK, //设备安全装置检查单
    TECHNICAL_STATUS_EVALUATION_OTHER_CHECK, //其他检查项目

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

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

import lombok.Getter;

@Getter
public enum ThirdMaintenanceFurnaceStatusEnum {
    WAIT_MAINTENANCE, //待保养
    UNDER_MAINTENANCE, //保养中
    WAIT_CONFIRM, //待确认
    COMPLETE, //已完成
    ABOLISH, //已作废
    EXPIRED; //已过期
}

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

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

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -8,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.ibatis.type.JdbcType;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -37,6 +40,18 @@
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * è®¾å¤‡ID
     */
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * ä¸‰ä¿å·¥å•ID
     */
@@ -106,7 +121,8 @@
    @Excel(name = "延迟保养日期", width = 20, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date deferredMaintenanceDate;
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String deferredMaintenanceDate;
    /**
     * ä¸»ç®¡é¢†å¯¼ç­¾å­—
     */

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

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

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -29,7 +31,12 @@
public class EamThirdMaintenanceFurnace extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = -5799611070364065336L;

    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * åˆ é™¤æ ‡è®°
     */
@@ -42,6 +49,19 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**
     * å·¥å•å·
     */
    @Excel(name = "工单号", width = 15)
    @ApiModelProperty(value = "工单号")
    private String orderNum;
    /**
     * è®¡åˆ’保养日期
     */
    @ApiModelProperty(value = "计划保养日期;提前70天生成工单")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    /**
     * åŽ‹ç¼©ç©ºæ°”压力(MPa)
     */
@@ -83,13 +103,13 @@
     */
    @Excel(name = "保养人", width = 15)
    @ApiModelProperty(value = "保养人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String operator;
    /**
     * ä¿å…»æ—¥æœŸ
     * ä¿å…»æ—¶é—´
     */
    @ApiModelProperty(value = "保养日期")
    @Excel(name = "保养日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "保养时间")
    @Excel(name = "保养时间", width = 20, 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")
    private Date operateTime;
@@ -98,6 +118,7 @@
     */
    @Excel(name = "保养状态;待提交、待确认、已完成", width = 15)
    @ApiModelProperty(value = "保养状态;待提交、待确认、已完成")
    @Dict(dicCode = "third_maintenance_furnace_status")
    private String maintenanceStatus;
    /**
     * èƒ½å¦æ»¡è¶³åŠ å·¥éœ€æ±‚;是否
@@ -110,8 +131,11 @@
     */
    @Excel(name = "确认人", width = 15)
    @ApiModelProperty(value = "确认人")
    @Dict(dicCode = "sys_user, realname, username")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String confirmUser;
    /** ç¡®è®¤ç±»åž‹ 1 é€šè¿‡  2 é©³å›ž */
    @ApiModelProperty(value = "确认类型")
    private String confirmDealType;
    /**
     * ç¡®è®¤æ—¥æœŸ
     */
@@ -126,4 +150,11 @@
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String equipmentModel;
}

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

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

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -61,7 +62,8 @@
    @ApiModelProperty(value = "计划保养日期;提前70天生成工单")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String maintenanceDate;
    /**
     * é”å®šå·¥å•æ—¥æœŸ
     */

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

@@ -6,6 +6,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

@@ -28,6 +29,18 @@
    private static final long serialVersionUID = -164548817301978100L;

    /**
     * ä¸‰ä¿å·¥å•ID
     */
    @Excel(name = "三保工单ID", width = 15)
    @ApiModelProperty(value = "三保工单ID")
    private String orderId;
    /**
     * å¤‡ä»¶åºå·
     */
    @Excel(name = "备件序号", width = 15)
    @ApiModelProperty(value = "备件序号")
    private Integer spareCode;
    /**
     * å¤‡ä»¶åç§°
     */
    @Excel(name = "备件名称", width = 15)

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

@@ -204,6 +204,7 @@
            translateDictTextUtils.translateField("equipmentManagerSignature", entity.getEquipmentManagerSignature(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("departManagerSignature", entity.getDepartManagerSignature(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("productionSupportSignature", entity.getProductionSupportSignature(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("factoryOrgCode", entity.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");

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

@@ -1,8 +1,14 @@
package org.jeecg.modules.eam.controller;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -10,8 +16,19 @@
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.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceFurnaceStatusEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceRequest;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceFurnaceService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

@@ -19,6 +36,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

/**
 * @Description: çœŸç©ºçƒ­å¤„理炉三保
@@ -31,13 +50,20 @@
@RestController
@RequestMapping("/eam/eamThirdMaintenanceFurnace")
public class EamThirdMaintenanceFurnaceController extends JeecgController<EamThirdMaintenanceFurnace, IEamThirdMaintenanceFurnaceService> {

    @Resource
    private IEamThirdMaintenanceFurnaceService eamThirdMaintenanceFurnaceService;
    @Resource
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Resource
    private ObjectMapper objectMapper;
    @Resource
    private TranslateDictTextUtils translateDictTextUtils;
    
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamThirdMaintenanceFurnace
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
@@ -46,70 +72,93 @@
    @AutoLog(value = "真空热处理炉三保-分页列表查询")
    @ApiOperation(value="真空热处理炉三保-分页列表查询", notes="真空热处理炉三保-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamThirdMaintenanceFurnace eamThirdMaintenanceFurnace,
    public Result<?> queryPageList(EamThirdMaintenanceFurnaceQuery query,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamThirdMaintenanceFurnace> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceFurnace, req.getParameterMap());
        Page<EamThirdMaintenanceFurnace> page = new Page<EamThirdMaintenanceFurnace>(pageNo, pageSize);
        IPage<EamThirdMaintenanceFurnace> pageList = eamThirdMaintenanceFurnaceService.page(page, queryWrapper);
        IPage<EamThirdMaintenanceFurnace> pageList = eamThirdMaintenanceFurnaceService.queryPageList(page, query);
        return Result.OK(pageList);
    }
    
    /**
     * æ·»åŠ 
     *
     * @param eamThirdMaintenanceFurnace
     * @param request
     * @return
     */
    @AutoLog(value = "真空热处理炉三保-添加")
    @ApiOperation(value="真空热处理炉三保-添加", notes="真空热处理炉三保-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamThirdMaintenanceFurnace eamThirdMaintenanceFurnace) {
        eamThirdMaintenanceFurnaceService.save(eamThirdMaintenanceFurnace);
        return Result.OK("添加成功！");
    public Result<?> add(@RequestBody EamThirdMaintenanceFurnaceRequest request) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_FURNACE_CODE_RULE);
        request.setOrderNum(codeSeq);
        return eamThirdMaintenanceFurnaceService.addThirdMaintenanceFurnace(request);
    }
    
    /**
     * ç¼–辑
     *
     * @param eamThirdMaintenanceFurnace
     * @param request
     * @return
     */
    @AutoLog(value = "真空热处理炉三保-编辑")
    @ApiOperation(value="真空热处理炉三保-编辑", notes="真空热处理炉三保-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamThirdMaintenanceFurnace eamThirdMaintenanceFurnace) {
        eamThirdMaintenanceFurnaceService.updateById(eamThirdMaintenanceFurnace);
    public Result<?> edit(@RequestBody EamThirdMaintenanceFurnaceRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        boolean b = eamThirdMaintenanceFurnaceService.editMaintenance(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }
    
    /**
     * é€šè¿‡id删除
     * çœŸç©ºçƒ­å¤„理炉三保
     *
     * @param id
     * @return
     */
    @AutoLog(value = "真空热处理炉三保-通过id删除")
    @ApiOperation(value="真空热处理炉三保-通过id删除", notes="真空热处理炉三保-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamThirdMaintenanceFurnaceService.removeById(id);
        return Result.OK("删除成功!");
    @AutoLog(value = "真空热处理炉三保-作废")
    @ApiOperation(value = "真空热处理炉三保-作废", notes = "真空热处理炉三保-作废")
    @GetMapping(value = "/abolish")
    public Result<String> abolish(@RequestParam(name = "id", required = true) String id) {
        EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceService.getById(id);
        if (entity == null) {
            return Result.error("要作废的数据不存在，请刷新重试！");
        }
        if (!ThirdMaintenanceFurnaceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
            return Result.error("该状态的数据不允许进行作废！");
        }
        entity.setMaintenanceStatus(ThirdMaintenanceFurnaceStatusEnum.ABOLISH.name());
        eamThirdMaintenanceFurnaceService.updateById(entity);
        return Result.OK("作废成功");
    }
    
    /**
     * æ‰¹é‡åˆ é™¤
     * é€šè¿‡id批量作废
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "真空热处理炉三保-批量删除")
    @ApiOperation(value="真空热处理炉三保-批量删除", notes="真空热处理炉三保-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamThirdMaintenanceFurnaceService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    @AutoLog(value = "真空热处理炉三保-批量作废")
    @ApiOperation(value = "真空热处理炉三保-批量作废", notes = "真空热处理炉三保-批量作废")
    @DeleteMapping(value = "/abolishBatch")
    public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> list = Arrays.asList(ids.split(","));
        AtomicInteger i = new AtomicInteger();
        list.forEach(id -> {
            EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceService.getById(id);
            if (entity != null && ThirdMaintenanceFurnaceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
                entity.setMaintenanceStatus(ThirdMaintenanceFurnaceStatusEnum.ABOLISH.name());
                eamThirdMaintenanceFurnaceService.updateById(entity);
                i.getAndIncrement();
            }
        });
        return Result.OK("批量作废成功 " + i.get() + " æ¡å·¥å•ï¼");
    }
    
    /**
@@ -123,30 +172,84 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamThirdMaintenanceFurnace eamThirdMaintenanceFurnace = eamThirdMaintenanceFurnaceService.getById(id);
        return Result.OK(eamThirdMaintenanceFurnace);
        if (eamThirdMaintenanceFurnace == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamThirdMaintenanceFurnace);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("createBy", eamThirdMaintenanceFurnace.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("operator", eamThirdMaintenanceFurnace.getOperator(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmUser", eamThirdMaintenanceFurnace.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("maintenanceStatus", eamThirdMaintenanceFurnace.getMaintenanceStatus(), item, "third_maintenance_furnace_status");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

  /**
   * å¯¼å‡ºexcel
     * é€šè¿‡id批量领取
   *
   * @param request
   * @param eamThirdMaintenanceFurnace
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceFurnace eamThirdMaintenanceFurnace) {
      return super.exportXls(request, eamThirdMaintenanceFurnace, EamThirdMaintenanceFurnace.class, "真空热处理炉三保");
  }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
     * @param ids
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamThirdMaintenanceFurnace.class);
    @AutoLog(value = "真空热处理炉三保-批量领取")
    @ApiOperation(value = "真空热处理炉三保-批量领取", notes = "真空热处理炉三保-批量领取")
    @DeleteMapping(value = "/collectBatch")
    public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> list = Arrays.asList(ids.split(","));
        AtomicInteger i = new AtomicInteger();
        list.forEach(id -> {
            EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceService.getById(id);
            if (entity != null && ThirdMaintenanceFurnaceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
                boolean b = eamThirdMaintenanceFurnaceService.collect(id);
                if (b) {
                    i.getAndIncrement();
                }
            }
        });
        return Result.OK("批量领取成功 " + i.get() + " æ¡å·¥å•ï¼");
    }

    /**
     * é€šè¿‡id领取
     *
     * @param id
     * @return
     */
    @AutoLog(value = "真空热处理炉三保-领取")
    @ApiOperation(value = "真空热处理炉三保-领取", notes = "真空热处理炉三保-领取")
    @GetMapping(value = "/collect")
    public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamThirdMaintenanceFurnaceService.collect(id);
        if (!b) {
            Result.OK("领取失败!");
        }
        return Result.OK("领取成功!");
    }

    /**
     * æˆ‘的待办，审批动作
     *
     * @param request
     * @return
     */
    @ApiOperation(value = "真空热处理炉三保-执行操作", notes = "真空热处理炉三保-执行操作")
    @PutMapping(value = "/approval")
    public Result<?> approval(@RequestBody EamThirdMaintenanceFurnaceRequest request) {
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }
        // æ£€æŸ¥è¯·æ±‚参数
        if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
            return Result.error("审批任务错误或不存在！");
        }
        EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceService.approval(request);
        if (entity == null) {
            return Result.error("操作失败！");
        }
        return Result.ok("操作成功！");
  }

}

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

@@ -205,8 +205,8 @@
     * @param ids
     * @return
     */
    @AutoLog(value = "周保工单-批量作废")
    @ApiOperation(value = "周保工单-批量作废", notes = "周保工单-批量作废")
    @AutoLog(value = "设备三级保养-批量作废")
    @ApiOperation(value = "设备三级保养-批量作废", notes = "设备三级保养-批量作废")
    @DeleteMapping(value = "/abolishBatch")
    public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> list = Arrays.asList(ids.split(","));
@@ -228,8 +228,8 @@
     * @param ids
     * @return
     */
    @AutoLog(value = "周保工单-批量领取")
    @ApiOperation(value = "周保工单-批量领取", notes = "周保工单-批量领取")
    @AutoLog(value = "设备三级保养-批量领取")
    @ApiOperation(value = "设备三级保养-批量领取", notes = "设备三级保养-批量领取")
    @DeleteMapping(value = "/collectBatch")
    public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> list = Arrays.asList(ids.split(","));

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

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

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.extension.plugins.pagination.Page;
@@ -10,6 +11,7 @@
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.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceSpare;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceSpareService;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: ä¸‰ä¿å¤‡ä»¶æ˜Žç»†
@@ -55,6 +58,22 @@
        Page<EamThirdMaintenanceSpare> page = new Page<EamThirdMaintenanceSpare>(pageNo, pageSize);
        IPage<EamThirdMaintenanceSpare> pageList = eamThirdMaintenanceSpareService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * ä¸€æ¬¡åŠ è½½
     *
     * @param orderId
     * @return
     */
    @ApiOperation(value = "周保工单明细-不分页列表查询", notes = "周保工单明细-不分页列表查询")
    @GetMapping(value = "/queryList")
    public Result<?> queryList(@RequestParam("orderId") String orderId) {
        LambdaQueryWrapper<EamThirdMaintenanceSpare> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamThirdMaintenanceSpare::getOrderId, orderId);
        queryWrapper.orderByAsc(EamThirdMaintenanceSpare::getSpareCode);
        List<EamThirdMaintenanceSpare> list = eamThirdMaintenanceSpareService.list(queryWrapper);
        return Result.OK(list);
    }
    
    /**
@@ -125,29 +144,6 @@
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamThirdMaintenanceSpare eamThirdMaintenanceSpare = eamThirdMaintenanceSpareService.getById(id);
        return Result.OK(eamThirdMaintenanceSpare);
    }

  /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param eamThirdMaintenanceSpare
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceSpare eamThirdMaintenanceSpare) {
      return super.exportXls(request, eamThirdMaintenanceSpare, EamThirdMaintenanceSpare.class, "三保备件明细");
  }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamThirdMaintenanceSpare.class);
  }

}

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

@@ -1,6 +1,11 @@
package org.jeecg.modules.eam.mapper;

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.EamThirdMaintenanceFurnace;

/**
@@ -11,4 +16,11 @@
 */
public interface EamThirdMaintenanceFurnaceMapper extends BaseMapper<EamThirdMaintenanceFurnace> {

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

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

@@ -2,4 +2,11 @@
<!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.EamThirdMaintenanceFurnaceMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace">
        select tmf.*, e.equipment_code, e.equipment_name, e.equipment_model
        from eam_third_maintenance_furnace tmf
        inner join eam_equipment e
        on tmf.equipment_id = e.id
        ${ew.customSqlSegment}
    </select>
</mapper>

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-24
 * @Description:
 */
@Data
public class EamThirdMaintenanceFurnaceQuery {
    private String orderNum;
    private String equipmentId;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDateBegin;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDateEnd;
    private String maintenanceStatus;

    private String column;
    private String order;
}

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

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

import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-24
 * @Description:
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class EamThirdMaintenanceFurnaceRequest extends FlowTaskVo implements Serializable {

    private static final long serialVersionUID = 3599956173993730625L;

    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * å·¥å•å·
     */
    @ApiModelProperty(value = "工单号")
    private String orderNum;
    /**
     * è®¾å¤‡ID
     */
    @ApiModelProperty(value = "设备ID")
    @Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
    private String equipmentId;
    /**
     * è®¡åˆ’保养日期
     */
    @ApiModelProperty(value = "计划保养日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    /**
     * åŽ‹ç¼©ç©ºæ°”压力(MPa)
     */
    @ApiModelProperty(value = "压缩空气压力(MPa)")
    private String compressedAirPressureValue;
    /**
     * æžé™çœŸç©º(Pa)
     */
    @ApiModelProperty(value = "极限真空(Pa)")
    private String ultimateVacuumValue;
    /**
     * æ³„漏率(Pa/h)
     */
    @ApiModelProperty(value = "泄漏率(Pa/h)")
    private String leakRate;
    /**
     * å‡€åŒ–处理
     */
    @ApiModelProperty(value = "净化处理")
    private String purificationTreatment;
    /**
     * ç‚‰æ¸©å‡åŒ€æ€§æ£€æµ‹
     */
    @ApiModelProperty(value = "炉温均匀性检测")
    private String furnaceTemperatureUniformityTesting;
    /**
     * åŠ çƒ­åŠŸçŽ‡æµ‹è¯•
     */
    @ApiModelProperty(value = "加热功率测试")
    private String heatingPowerTest;
    /**
     * ä¿å…»äºº
     */
    @ApiModelProperty(value = "保养人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String operator;
    /**
     * ä¿å…»æ—¶é—´
     */
    @ApiModelProperty(value = "保养时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date operateTime;
    /**
     * ä¿å…»çŠ¶æ€;待提交、待确认、已完成
     */
    @ApiModelProperty(value = "保养状态;待提交、待确认、已完成")
    private String maintenanceStatus;
    /**
     * èƒ½å¦æ»¡è¶³åŠ å·¥éœ€æ±‚;是否
     */
    @ApiModelProperty(value = "能否满足加工需求;是否")
    @Dict(dicCode = "yn")
    private String processingRequirementsFlag;
    /**
     * ç¡®è®¤äºº
     */
    @ApiModelProperty(value = "确认人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String confirmUser;
    /** ç¡®è®¤ç±»åž‹ 1 é€šè¿‡  2 é©³å›ž */
    @ApiModelProperty(value = "确认类型")
    @Dict(dicCode = "approved_rejected")
    private String confirmDealType;

}

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

@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceSpare;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -50,7 +51,7 @@
    @ApiModelProperty(value = "保养日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    private String maintenanceDate;
    /**
     * ç»´ä¿®äºº
     */
@@ -101,6 +102,11 @@
     */
    @ApiModelProperty(value = "删除 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamThirdMaintenanceOrderDetail> removeDetailList;
    /**
     * å¤‡ä»¶æ˜Žç»†
     */
    @ApiModelProperty(value = "备件使用明细")
    private List<EamThirdMaintenanceSpare> tableSpareList;

    /**
     * æ“ä½œäººç­¾å­—

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace;
import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceRequest;

/**
 * @Description: çœŸç©ºçƒ­å¤„理炉三保
@@ -11,4 +16,39 @@
 */
public interface IEamThirdMaintenanceFurnaceService extends IService<EamThirdMaintenanceFurnace> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param page
     * @param query
     * @return
     */
    IPage<EamThirdMaintenanceFurnace> queryPageList(Page<EamThirdMaintenanceFurnace> page, EamThirdMaintenanceFurnaceQuery query);

    /**
     * æ–°å¢žçƒ­å¤„理炉保养工单
     * @param eamThirdMaintenanceFurnaceRequest
     * @return
     */
    Result<?> addThirdMaintenanceFurnace(EamThirdMaintenanceFurnaceRequest eamThirdMaintenanceFurnaceRequest);

    /**
     * é¢†å–工单
     * @param id
     * @return
     */
    boolean collect(String id);

    /**
     * ç¼–辑
     * @param request
     * @return
     */
    boolean editMaintenance(EamThirdMaintenanceFurnaceRequest request);

    /**
     * å®¡æ‰¹æµç¨‹
     * @param request
     * @return
     */
    EamThirdMaintenanceFurnace approval(EamThirdMaintenanceFurnaceRequest request);
}

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

@@ -518,7 +518,6 @@
                    weekInspectionDetailList.forEach(weekInspectionDetail -> {
                        weekInspectionDetail.setEquipmentId(eamInspectionOrderRequest.getEquipmentId());
                        weekInspectionDetail.setStandardId(eamInspectionOrderRequest.getStandardId());
                        // TODO å‘¨ç‚¹æ£€æ—¥æœŸ
                        weekInspectionDetail.setPlanInspectionDate(eamInspectionOrderRequest.getInspectionDate());
                    });
                    eamWeekInspectionDetailService.saveBatch(weekInspectionDetailList);

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

@@ -5,11 +5,14 @@
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.LambdaUpdateWrapper;
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.type.JdbcType;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
@@ -34,6 +37,7 @@
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
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;
@@ -49,6 +53,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;

@@ -58,8 +63,8 @@
 * @Date:   2025-07-11
 * @Version: V1.0
 */
@Service
public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService {
@Service("IEamThirdMaintenanceChangeService")
public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService, FlowCallBackServiceI {

    @Resource
    private EamThirdMaintenanceChangeMapper eamThirdMaintenanceChangeMapper;
@@ -177,6 +182,7 @@
        request.setApplicant(sysUser.getUsername());
        request.setApplyDate(new Date());
        request.setFactoryOrgCode(equipment.getFactoryOrgCode());
        request.setEquipmentId(equipment.getId());
        // ä¸‰ä¿å˜æ›´å·¥å•HF
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_CHANGE.name());
        if (eamBaseHFCode == null) {
@@ -203,6 +209,14 @@
        }
        entity.setApplyReasonType(request.getApplyReasonType());
        entity.setApplyReason(request.getApplyReason());
        entity.setRemark(request.getRemark());
        entity.setApplyCategory(request.getApplyCategory());
        if ("SCRAPPED".equals(request.getApplyCategory())) {
            // ç›´æŽ¥è®¾ä¸º null
            entity.setDeferredMaintenanceDate(null);
        } else {
            entity.setDeferredMaintenanceDate(request.getDeferredMaintenanceDate());
        }
        this.getBaseMapper().updateById(entity);
        return true;
    }
@@ -470,8 +484,13 @@
                    if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
                        //通过
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.COMPLETED.name());
                        order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
                        if ("SCRAPPED".equals(request.getApplyCategory())) {
                            order.setMaintenanceDate(null);
                            order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
                        } else {
                        order.setMaintenanceDate(entity.getDeferredMaintenanceDate());
                            order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
                        }
                        thirdMaintenanceOrderService.updateById(order);
                    }else {
                        //驳回
@@ -499,4 +518,28 @@
        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/EamThirdMaintenanceFurnaceServiceImpl.java

@@ -1,10 +1,54 @@
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.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.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.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceFurnaceMapper;
import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceFurnaceRequest;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceFurnaceService;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: çœŸç©ºçƒ­å¤„理炉三保
@@ -12,7 +56,319 @@
 * @Date:   2025-07-11
 * @Version: V1.0
 */
@Service
public class EamThirdMaintenanceFurnaceServiceImpl extends ServiceImpl<EamThirdMaintenanceFurnaceMapper, EamThirdMaintenanceFurnace> implements IEamThirdMaintenanceFurnaceService {
@Service("IEamThirdMaintenanceFurnaceService")
public class EamThirdMaintenanceFurnaceServiceImpl extends ServiceImpl<EamThirdMaintenanceFurnaceMapper, EamThirdMaintenanceFurnace> implements IEamThirdMaintenanceFurnaceService, FlowCallBackServiceI {

    @Resource
    private EamThirdMaintenanceFurnaceMapper eamThirdMaintenanceFurnaceMapper;
    @Resource
    private IBaseFactoryUserService baseFactoryUserService;
    @Resource
    private IBaseFactoryService baseFactoryService;
    @Resource
    private IEamBaseHFCodeService eamBaseHFCodeService;
    @Resource
    private IEamEquipmentService eamEquipmentService;
    @Resource
    private FlowCommonService flowCommonService;
    @Resource
    private IFlowDefinitionService flowDefinitionService;
    @Resource
    private IFlowMyBusinessService flowMyBusinessService;
    @Resource
    private TaskService taskService;
    @Resource
    private IFlowTaskService flowTaskService;
    @Resource
    private ISysUserService sysUserService;

    /**
     * åˆ†é¡µåˆ—表查询
     * @param page
     * @param query
     * @return
     */
    @Override
    public IPage<EamThirdMaintenanceFurnace> queryPageList(Page<EamThirdMaintenanceFurnace> page, EamThirdMaintenanceFurnaceQuery query) {
        QueryWrapper<EamThirdMaintenanceFurnace> queryWrapper = new QueryWrapper<>();
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().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> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                queryWrapper.in("e.factory_org_code", factoryCode);
            } else {
                return page;
            }
        }
        //查询条件过滤
        if (query != null) {
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
                queryWrapper.eq("e.equipment_id", query.getEquipmentId());
            }
            if (StringUtils.isNotBlank(query.getMaintenanceStatus())) {
                queryWrapper.eq("tmf.maintenance_status", query.getMaintenanceStatus());
            }
            if (query.getMaintenanceDateBegin() != null && query.getMaintenanceDateEnd() != null) {
                queryWrapper.between("tmf.maintenance_date", query.getMaintenanceDateBegin(), query.getMaintenanceDateEnd());
            }
            //排序
            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("tmf." + oConvertUtils.camelToUnderline(column));
                } else {
                    queryWrapper.orderByDesc("tmf." + oConvertUtils.camelToUnderline(column));
                }
            } else {
                queryWrapper.orderByDesc("tmf.create_time");
            }
        }
        return eamThirdMaintenanceFurnaceMapper.queryPageList(page, queryWrapper);
    }

    @Override
    public Result<?> addThirdMaintenanceFurnace(EamThirdMaintenanceFurnaceRequest eamThirdMaintenanceFurnaceRequest) {
        List<EamThirdMaintenanceFurnace> eamThirdMaintenanceFurnaces = eamThirdMaintenanceFurnaceMapper.selectList(new LambdaQueryWrapper<EamThirdMaintenanceFurnace>().eq(EamThirdMaintenanceFurnace::getEquipmentId, eamThirdMaintenanceFurnaceRequest.getEquipmentId()).eq(EamThirdMaintenanceFurnace::getMaintenanceDate, eamThirdMaintenanceFurnaceRequest.getMaintenanceDate()).ne(EamThirdMaintenanceFurnace::getMaintenanceStatus, ThirdMaintenanceFurnaceStatusEnum.ABOLISH.name()));
        if (CollectionUtils.isNotEmpty(eamThirdMaintenanceFurnaces)) {
            return Result.error("添加失败,系统已存在当前日期工单！");
        }
        EamThirdMaintenanceFurnace eamThirdMaintenanceFurnace = new EamThirdMaintenanceFurnace();
        BeanUtils.copyProperties(eamThirdMaintenanceFurnaceRequest, eamThirdMaintenanceFurnace);
        //修改状态
        eamThirdMaintenanceFurnace.setMaintenanceStatus(ThirdMaintenanceFurnaceStatusEnum.WAIT_MAINTENANCE.name());
        eamThirdMaintenanceFurnace.setDelFlag(CommonConstant.DEL_FLAG_0);
        //HF码处理
        EamBaseHFCode eamBaseHFCode = eamBaseHFCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_FURNACE.name());
        if (eamBaseHFCode == null) {
            return Result.error("添加失败,未配置真空热处理炉检验表HF编码！");
        }
        eamThirdMaintenanceFurnace.setHfCode(eamBaseHFCode.getHfCode());
        save(eamThirdMaintenanceFurnace);
        return Result.OK("添加成功！");
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean collect(String id) {
        EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceMapper.selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要领取的工单不存在，请刷新重试！");
        }
        if (!ThirdMaintenanceFurnaceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
            throw new JeecgBootException("该工单已进行过领取！");
        }
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null || !BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
            throw new JeecgBootException("不是维修工，无法领取此工单！");
        }
        entity.setOperator(sysUser.getUsername());
        entity.setMaintenanceStatus(ThirdMaintenanceFurnaceStatusEnum.UNDER_MAINTENANCE.name());
        eamThirdMaintenanceFurnaceMapper.updateById(entity);
        // å¯åŠ¨æµç¨‹
        flowCommonService.initActBusiness("工单号:" + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode(),
                entity.getId(), "IEamThirdMaintenanceFurnaceService", "third_maintenance_furnace_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);
        // è®¾ç½®ä¸‹ä¸€æ­¥å¤„理人
        List<String> usernames = new ArrayList<>();
        usernames.add(entity.getOperator());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_furnace_process", variables);
//        if (result != null) {
//            //更新设备保养状态
//            eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
//            return result.isSuccess();
//        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editMaintenance(EamThirdMaintenanceFurnaceRequest request) {
        EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
        }
        EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceMapper.selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("编辑的数据已删除，请刷新重试！");
        }
        if (!ThirdMaintenanceFurnaceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
            throw new JeecgBootException("只有待保养状态的数据才可编辑！");
        }
        entity.setMaintenanceDate(request.getMaintenanceDate());
        entity.setRemark(request.getRemark());
        eamThirdMaintenanceFurnaceMapper.updateById(entity);
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.THIRD_MAINTENANCE, businessTable = "eam_third_maintenance_furnace")
    public EamThirdMaintenanceFurnace approval(EamThirdMaintenanceFurnaceRequest request) {
        EamThirdMaintenanceFurnace entity = eamThirdMaintenanceFurnaceMapper.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("流程实例不存在，请刷新后重试！");
        }

        if (!isUserAuthorized(flowMyBusiness, user)) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // è®¤é¢†ä»»åŠ¡
        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }
        // è®¾ç½®æµç¨‹å˜é‡
        setupProcessVariables(request, entity, user, equipment);

        // å®Œæˆæµç¨‹ä»»åŠ¡
        Result result = flowTaskService.complete(request);

        // æ ¹æ®ä»»åŠ¡å®Œæˆç»“果更新工单状态
        updateOrderStatus(result, request, entity, user);

        //更新工单信息
        eamThirdMaintenanceFurnaceMapper.updateById(entity);
        return entity;
    }

    /**
     * è®¾ç½®æµç¨‹å˜é‡
     */
    private void setupProcessVariables(EamThirdMaintenanceFurnaceRequest request, EamThirdMaintenanceFurnace entity, LoginUser user, EamEquipment equipment) {
        //流程变量
        Map<String, Object> values = new HashMap<>();
        List<String> userApprovalList;
        List<UserSelector> userSelectors;
        if (ThirdMaintenanceFurnaceStatusEnum.UNDER_MAINTENANCE.name().equals(entity.getMaintenanceStatus()) && user.getUsername().equals(entity.getOperator())) {
            // ä¿å…»äººä¿å…»ç»“束
            values.put("dataId", entity.getId());
            values.put("organization", "保养人保养结束");
            values.put("comment", "保养人保养结束");
            // èŽ·å–下一步执行人
            userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
            if (CollectionUtil.isEmpty(userSelectors)) {
                throw new JeecgBootException("设备未分配给维修组长，无法进入下级审批！");
            }
            userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
            values.put("NextAssignee", userApprovalList);
            request.setComment("保养人保养结束");
        } else {
            // ç»´ä¿®ç»„长确认
            values.put("dataId", entity.getId());
            values.put("organization", "维修组长确认结束");
            values.put("comment", "维修组长确认结束");
            request.setComment("维修组长确认结束");
        }
        request.setValues(values);
    }

    /**
     * æ›´æ–°å·¥å•çŠ¶æ€
     */
    private void updateOrderStatus(Result result, EamThirdMaintenanceFurnaceRequest request, EamThirdMaintenanceFurnace entity, LoginUser user) {
        if (result.isSuccess()) {
            if (ThirdMaintenanceFurnaceStatusEnum.UNDER_MAINTENANCE.name().equals(entity.getMaintenanceStatus()) && user.getUsername().equals(entity.getOperator())) {
                //维修工保养完成
                entity.setMaintenanceStatus(ThirdMaintenanceFurnaceStatusEnum.WAIT_CONFIRM.name());
                entity.setOperateTime(new Date());
                entity.setCompressedAirPressureValue(request.getCompressedAirPressureValue());
                entity.setUltimateVacuumValue(request.getUltimateVacuumValue());
                entity.setLeakRate(request.getLeakRate());
                entity.setPurificationTreatment(request.getPurificationTreatment());
                entity.setFurnaceTemperatureUniformityTesting(request.getFurnaceTemperatureUniformityTesting());
                entity.setHeatingPowerTest(request.getHeatingPowerTest());
                entity.setProcessingRequirementsFlag(request.getProcessingRequirementsFlag());
            } else {
                //维修组长确认完成
                entity.setMaintenanceStatus(ThirdMaintenanceFurnaceStatusEnum.COMPLETE.name());
                entity.setConfirmUser(user.getUsername());
                entity.setConfirmTime(new Date());
            }
        }
    }

    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
        List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
        return todoUsers != null && todoUsers.contains(user.getUsername());
    }

    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;
    }

    @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/EamThirdMaintenanceOrderServiceImpl.java

@@ -88,6 +88,8 @@
    private IEamBaseHFCodeService eamBaseHFCodeService;
    @Resource
    private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;
    @Resource
    private IEamThirdMaintenanceSpareService eamThirdMaintenanceSpareService;

    @Override
    public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
@@ -549,6 +551,14 @@
                    // ä¸‰ä¿æ˜Žç»†å¤„理
                    eamThirdMaintenanceOrderDetailService.remove(new LambdaQueryWrapper<EamThirdMaintenanceOrderDetail>().eq(EamThirdMaintenanceOrderDetail::getOrderId, order.getId()));
                    eamThirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
                    // ä¸‰ä¿å¤‡ä»¶æ˜Žç»†å¤„理
                    if (request.getTableSpareList() != null && !request.getTableSpareList().isEmpty()) {
                        List<EamThirdMaintenanceSpare> tableSpareList = request.getTableSpareList();
                        tableSpareList.forEach(eamThirdMaintenanceSpare -> {
                            eamThirdMaintenanceSpare.setOrderId(request.getId());
                        });
                        eamThirdMaintenanceSpareService.saveBatch(tableSpareList);
                    }
                    break;
                case UNDER_FIRST_ACCEPTANCE:
                    // ç¬¬ä¸€æ¬¡éªŒæ”¶ç»“束