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

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.4",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-8-22 09:21:37",
  "updatedTime": "2025-9-2 15:36:02",
  "dbConns": [],
  "profile": {
    "default": {
@@ -32513,6 +32513,395 @@
      "correlations": [],
      "indexes": [],
      "type": "P"
    },
    {
      "id": "A2E61B40-680E-493B-A680-C572A5B24F40",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "eam_third_maintenance_work_plan_sheet",
      "defName": "三级保养工作计划单",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "sysProps": {
        "nameTemplate": "{defKey}[{defName}]"
      },
      "notes": {},
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "id",
          "defName": "主键",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "5307B6A2-AFFB-41CE-9EDD-0A3D11087CB9"
        },
        {
          "defKey": "create_by",
          "defName": "创建人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "6FF683E1-AD25-453B-B13A-17E5C6D87280",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "create_time",
          "defName": "创建时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "3A318D9D-7E39-4711-8BAE-A73DEB8851C3",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "update_by",
          "defName": "更新人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "EBE0832C-FC5E-4798-BD0A-44E41733EB56",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "update_time",
          "defName": "更新时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "B441E390-0A17-4DAD-A13F-55FEB5EAEDD3",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "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": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "E30443B7-B835-42A1-B36A-6AD339C0AEFE"
        },
        {
          "defKey": "del_flag",
          "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": "0BD6235D-2302-485A-8E4E-8B9CAA54D8A7"
        },
        {
          "defKey": "equipment_code",
          "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": "E215A580-7335-466D-A3D3-807B91F80203"
        },
        {
          "defKey": "equipment_name",
          "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": "16F76847-23D6-49CB-9604-4CE1471F7500"
        },
        {
          "defKey": "factory_org_code",
          "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": "93A351CD-B26D-4384-9626-93424D8F4532"
        },
        {
          "defKey": "equipment_model",
          "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": "F9C1A68F-03A6-41C7-9038-F4908C84D01F"
        },
        {
          "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": "68F0DAF8-7E6C-40F6-B1CF-F7AF19618438"
        },
        {
          "defKey": "hf_code",
          "defName": "hf编码",
          "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": "76354CEC-A4EC-4055-BD44-8976208D4AB0"
        }
      ],
      "correlations": [],
      "indexes": [],
      "type": "P"
    }
  ],
  "views": [],
@@ -33270,7 +33659,8 @@
        "6102925D-12F5-42D2-A721-5BBAE73F9087",
        "6221E3E7-A119-4AE7-872F-1159192BD6AC",
        "CB01E297-3E90-404A-883F-84A36193305F",
        "75EBAC55-1246-4201-AFB9-BB29A8600D61"
        "75EBAC55-1246-4201-AFB9-BB29A8600D61",
        "A2E61B40-680E-493B-A680-C572A5B24F40"
      ],
      "refViews": [],
      "refDiagrams": [],

 db/LYH/2025.09.02.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[eam_third_maintenance_work_plan_sheet]') AND type in (N'U')) DROP TABLE [dbo].[eam_third_maintenance_work_plan_sheet];
CREATE TABLE [dbo].[eam_third_maintenance_work_plan_sheet](
                                                              id NVARCHAR(32) NOT NULL,
                                                              create_by NVARCHAR(50),
                                                              create_time DATETIME2,
                                                              update_by NVARCHAR(50),
                                                              update_time DATETIME2,
                                                              del_flag INT,
                                                              equipment_code NVARCHAR(255),
                                                              equipment_name NVARCHAR(255),
                                                              factory_org_code NVARCHAR(255),
                                                              equipment_model NVARCHAR(255),
                                                              maintenance_date DATETIME2,
                                                              hf_code NVARCHAR(255),
                                                              PRIMARY KEY (id)
);

EXEC sp_addextendedproperty 'MS_Description', '三级保养工作计划单', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, null, null;
EXEC sp_addextendedproperty 'MS_Description', '主键', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', id;
EXEC sp_addextendedproperty 'MS_Description', '创建人', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', create_by;
EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', create_time;
EXEC sp_addextendedproperty 'MS_Description', '更新人', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', update_by;
EXEC sp_addextendedproperty 'MS_Description', '更新时间', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', update_time;
EXEC sp_addextendedproperty 'MS_Description', '删除标记', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', del_flag;
EXEC sp_addextendedproperty 'MS_Description', '设备统一编号', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', equipment_code;
EXEC sp_addextendedproperty 'MS_Description', '设备名称', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', equipment_name;
EXEC sp_addextendedproperty 'MS_Description', '使用部门', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', factory_org_code;
EXEC sp_addextendedproperty 'MS_Description', '设备型号', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', equipment_model;
EXEC sp_addextendedproperty 'MS_Description', '保养日期', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', maintenance_date;
EXEC sp_addextendedproperty 'MS_Description', 'hf编码', 'SCHEMA', dbo, 'table', eam_third_maintenance_work_plan_sheet, 'column', hf_code;



INSERT INTO [sys_dict_item]([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1962764933997375489', N'1941372067586695170', N'三级保养工作计划单', N'THIRD_MAINTENANCE_WORK_PLAN_SHEET', N'', 18, 1, N'admin', '2025-09-02 14:30:01.0000000', N'admin', '2025-09-02 14:36:28.3440000'); GO

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

@@ -17,6 +17,7 @@
    TECHNICAL_STATUS_DEACTIVATE, //停用加工设备申请单
    REPORT_ACCIDENTS_REGISTER, //设备事故登记表
    REPORT_PRODUCT_HAZARDS, //产品安全隐患确认
    REPORT_THREE_NO_SPARE //三不放过原则表
    REPORT_THREE_NO_SPARE, //三不放过原则表
    THIRD_MAINTENANCE_WORK_PLAN_SHEET //三级保养工作计划单
    ;
}

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

@@ -69,4 +69,14 @@
    /** å¼‚常描述 */
    @ApiModelProperty(name = "异常描述",notes = "")
    private String exceptionDescription;

    public EamSecondMaintenanceOrderDetail() {
    }

    public EamSecondMaintenanceOrderDetail(EamMaintenanceStandardDetail detail) {
        this.itemCode = detail.getItemCode();
        this.itemCategory = detail.getItemCategory();
        this.itemName = detail.getItemName();
    }

}

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

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

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

/**
 * @Description: â€œä¸‰çº§ä¿å…»å·¥ä½œè®¡åˆ’单
 * @Author: jeecg-boot
 * @Date:   2025-09-02
 * @Version: V1.0
 */
@Data
@TableName("eam_third_maintenance_work_plan_sheet")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="eam_third_maintenance_work_plan_sheet对象", description="“三级保养工作计划单")
public class EamThirdMaintenanceWorkPlanSheet {

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private java.lang.String id;
    /**创建人*/
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private java.lang.String createBy;
    /**创建时间*/
    @ApiModelProperty(value = "创建时间")
    private java.util.Date createTime;
    /**更新人*/
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private java.lang.String updateBy;
    /**更新时间*/
    @ApiModelProperty(value = "更新时间")
    private java.util.Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private java.lang.Integer delFlag;
    /**设备统一编号*/
    @Excel(name = "设备统一编号", width = 15)
    @ApiModelProperty(value = "设备统一编号")
    private java.lang.String equipmentCode;
    /**设备名称*/
    @Excel(name = "设备名称", width = 15)
    @ApiModelProperty(value = "设备名称")
    private java.lang.String equipmentName;
    /**使用部门*/
    @Excel(name = "使用部门", width = 15)
    @ApiModelProperty(value = "使用部门")
    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
    private java.lang.String factoryOrgCode;
    /**设备型号*/
    @Excel(name = "设备型号", width = 15)
    @ApiModelProperty(value = "设备型号")
    private java.lang.String equipmentModel;
    /**保养日期*/
    @ApiModelProperty(value = "保养日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private java.util.Date maintenanceDate;
    /**hf编码*/
    @Excel(name = "hf编码", width = 15)
    @ApiModelProperty(value = "hf编码")
    private java.lang.String hfCode;

    /**
     * ä¿å…»å¹´ä»½
     */
    private transient String maintenanceYear;
}

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

@@ -62,6 +62,11 @@
    List<EamEquipment> selectThreeMaintenanceEquipmentList(@Param(Constants.WRAPPER) Wrapper<EamEquipment> queryWrapper);

    /**
     * èŽ·å–可生成二保工单的设备列表
     */
    List<EamEquipment> selectSecondMaintenanceEquipmentList(@Param(Constants.WRAPPER) Wrapper<EamEquipment> queryWrapper);

    /**
     * è®¾å¤‡ç®¡ç†é¦–页
     * @param ids
     * @return

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

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

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceWorkPlanSheet;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: â€œä¸‰çº§ä¿å…»å·¥ä½œè®¡åˆ’单
 * @Author: jeecg-boot
 * @Date:   2025-09-02
 * @Version: V1.0
 */
public interface EamThirdMaintenanceWorkPlanSheetMapper extends BaseMapper<EamThirdMaintenanceWorkPlanSheet> {

}

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

@@ -77,6 +77,23 @@
        on e.id = ext.id
        ${ew.customSqlSegment}
    </select>

    <select id="selectSecondMaintenanceEquipmentList" resultType="org.jeecg.modules.eam.entity.EamEquipment">
        select e.*,
               ext.latest_second_maintenance,
               ext.next_second_maintenance,
               ext.technology_status,
               ext.third_maintenance_period,
               ext.technology_check_period,
               ext.latest_technology_check,
               ext.next_technology_check,
               ext.technology_generate_flag
        from eam_equipment e
                 left join eam_equipment_extend ext
                           on e.id = ext.id
            ${ew.customSqlSegment}
    </select>

    <select id="echartsList" resultType="org.jeecg.modules.eam.dto.EchartsDto">
        WITH TotalCount AS (
        SELECT COUNT(a.id) AS total_count

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.EamThirdMaintenanceWorkPlanSheetMapper">

</mapper>

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

@@ -47,4 +47,13 @@
     * @return
     */
    boolean updateThirdMaintenanceParam(String equipmentId, String status, Date evaluationDate, String thirdMaintenanceGenerateFlag);

    /**
     * æ›´æ–°è®¾å¤‡äºŒä¿åŠä¿å…»æ—¥æœŸ
     * @param equipmentId è®¾å¤‡ID
     * @param status ä¿å…»çŠ¶æ€
     * @param secondMaintenanceGenerateFlag äºŒä¿å·¥å•ç”Ÿæˆæ ‡è¯†
     * @return
     */
    boolean updateSecondMaintenanceParam(String equipmentId, String status, String secondMaintenanceGenerateFlag);
}

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

@@ -88,6 +88,11 @@
    List<EamEquipment> selectThreeMaintenanceEquipmentList();

    /**
     * èŽ·å–可生成二保工单的设备列表
     */
    List<EamEquipment> selectSecondMaintenanceEquipmentList();

    /**
     * è®¾å¤‡ç®¡ç†é¦–页-技术状态
     * @return
     */

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceWorkPlanSheet;

/**
 * @Description: â€œä¸‰çº§ä¿å…»å·¥ä½œè®¡åˆ’单
 * @Author: jeecg-boot
 * @Date:   2025-09-02
 * @Version: V1.0
 */
public interface IEamThirdMaintenanceWorkPlanSheetService extends IService<EamThirdMaintenanceWorkPlanSheet> {

    /**
     * æ–°å¢ž
     * @param eamThirdMaintenanceWorkPlanSheet
     * @return
     */
    boolean add(EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet);
}

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

@@ -4,15 +4,23 @@
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceWorkPlanSheet;
import org.jeecg.modules.eam.mapper.EamEquipmentExtendMapper;
import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceWorkPlanSheetService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.Date;

/**
@@ -26,6 +34,13 @@

    @Resource
    private EamEquipmentExtendMapper eamEquipmentExtendMapper;

    @Autowired
    private IEamThirdMaintenanceWorkPlanSheetService eamThirdMaintenanceWorkPlanSheetService;

    @Resource
    private EamEquipmentMapper eamEquipmentMapper;


    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -96,6 +111,38 @@
                entity.setNextThirdMaintenance(DateUtils.addYear(entity.getLatestThirdMaintenance(), entity.getThirdMaintenancePeriod()));
            }
        }

        EamEquipment eamEquipment = eamEquipmentMapper.selectById(equipmentId);
        EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet=new EamThirdMaintenanceWorkPlanSheet();
        BeanUtils.copyProperties(eamEquipment,eamThirdMaintenanceWorkPlanSheet);
        eamThirdMaintenanceWorkPlanSheet.setId(null);
        eamThirdMaintenanceWorkPlanSheet.setMaintenanceDate(eamEquipment.getLatestThirdMaintenance());
        eamThirdMaintenanceWorkPlanSheetService.add(eamThirdMaintenanceWorkPlanSheet);

        return this.getBaseMapper().updateById(entity) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean updateSecondMaintenanceParam(String equipmentId, String status,String secondMaintenanceGenerateFlag){
        if (StringUtils.isBlank(status) && StringUtils.isBlank(secondMaintenanceGenerateFlag)) {
            return false;
        }
        EamEquipmentExtend entity = this.getBaseMapper().selectById(equipmentId);
        UpdateWrapper<EamEquipmentExtend> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", equipmentId);
        if (StringUtils.isNotBlank(status)) {
            entity.setMaintenanceStatus(status);
        }
        //二保默认生成六个月后
        // è½¬æ¢ä¸ºLocalDate处理日期
        LocalDate localDate = DateUtils.dateToLocalDate(entity.getLatestSecondMaintenance());
        // è®¡ç®—六个月后的日期
        LocalDate sixMonthsLater = localDate.plusMonths(6);
        // è°ƒæ•´åˆ°å½“月的最后一天
        LocalDate lastDayOfMonth = sixMonthsLater.with(TemporalAdjusters.lastDayOfMonth());
        entity.setNextSecondMaintenance(DateUtils.localDateToDate(lastDayOfMonth));

        return this.getBaseMapper().updateById(entity) > 0;
    }
}

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

@@ -19,10 +19,12 @@
import org.jeecg.modules.eam.dto.EchartsDto;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceWorkPlanSheet;
import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceWorkPlanSheetService;
import org.jeecg.modules.eam.tree.FindsEquipmentEamCenterUtil;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
@@ -64,6 +66,8 @@
    private IBaseFactoryUserService baseFactoryUserService;
    @Autowired
    private IBaseFactoryService baseFactoryService;
    @Autowired
    private IEamThirdMaintenanceWorkPlanSheetService eamThirdMaintenanceWorkPlanSheetService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -83,6 +87,13 @@
        eamEquipmentExtend.setMaintenanceStatus(EquipmentMaintenanceStatus.NORMAL.name());
        eamEquipmentExtend.setRepairStatus(EquipmentRepairStatus.NORMAL.name());
        equipmentExtendService.save(eamEquipmentExtend);

        //三保
        EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet=new EamThirdMaintenanceWorkPlanSheet();
        BeanUtils.copyProperties(eamEquipment,eamThirdMaintenanceWorkPlanSheet);
        eamThirdMaintenanceWorkPlanSheet.setId(null);
        eamThirdMaintenanceWorkPlanSheet.setMaintenanceDate(eamEquipment.getLatestThirdMaintenance());
        eamThirdMaintenanceWorkPlanSheetService.add(eamThirdMaintenanceWorkPlanSheet);

        //插入设备履历   @EquipmentHistoryLog
        return eamEquipment;
@@ -449,6 +460,18 @@
    }

    /**
     * èŽ·å–可生成二保工单的设备列表
     */
    @Override
    public List<EamEquipment> selectSecondMaintenanceEquipmentList(){
        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
        queryWrapper.ne("ext.maintenance_status", MaintenanceStatusEnum.PROHIBITED.name());
        queryWrapper.isNotNull("ext.next_second_maintenance");
        return this.getBaseMapper().selectSecondMaintenanceEquipmentList(queryWrapper);
    }

    /**
     * è®¾å¤‡ç®¡ç†é¦–页-技术状态
     * @return
     */

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

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

import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceWorkPlanSheet;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceWorkPlanSheetMapper;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceWorkPlanSheetService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
 * @Description: â€œä¸‰çº§ä¿å…»å·¥ä½œè®¡åˆ’单
 * @Author: jeecg-boot
 * @Date:   2025-09-02
 * @Version: V1.0
 */
@Service
public class EamThirdMaintenanceWorkPlanSheetServiceImpl extends ServiceImpl<EamThirdMaintenanceWorkPlanSheetMapper, EamThirdMaintenanceWorkPlanSheet> implements IEamThirdMaintenanceWorkPlanSheetService {

    @Autowired
    private IEamBaseHFCodeService hfCodeService;

    /**
     * æ–°å¢ž
     * @param eamThirdMaintenanceWorkPlanSheet
     * @return
     */
    @Override
    public boolean add(EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet){
        //三级保养工作计划单
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_WORK_PLAN_SHEET.name());
        if(eamBaseHFCode == null) {
            throw new JeecgBootException("未配置三级保养工作计划单的HF编码，添加失败！");
        }
        eamThirdMaintenanceWorkPlanSheet.setHfCode(eamBaseHFCode.getHfCode());
        return super.save(eamThirdMaintenanceWorkPlanSheet);
    }
}

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

@@ -24,6 +24,7 @@
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceWorkPlanSheetService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import org.jeecg.modules.system.entity.BaseFactory;

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

@@ -28,6 +28,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;

@@ -514,7 +515,7 @@
     */
    @ApiOperation(value = "二保工单-执行操作", notes = "二保工单-执行操作")
    @PutMapping(value = "/approval")
    public Result<?> approval(@RequestBody EamSecondMaintenanceRequest request) {
    public Result<?> approval(@RequestBody EamSecondMaintenanceRequest request) throws ParseException {
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }

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

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

import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.util.StrUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceWorkPlanSheet;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceWorkPlanSheetService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 /**
 * @Description: â€œä¸‰çº§ä¿å…»å·¥ä½œè®¡åˆ’单
 * @Author: jeecg-boot
 * @Date:   2025-09-02
 * @Version: V1.0
 */
@Slf4j
@Api(tags="“三级保养工作计划单")
@RestController
@RequestMapping("/eam/eamThirdMaintenanceWorkPlanSheet")
public class EamThirdMaintenanceWorkPlanSheetController extends JeecgController<EamThirdMaintenanceWorkPlanSheet, IEamThirdMaintenanceWorkPlanSheetService> {
    @Autowired
    private IEamThirdMaintenanceWorkPlanSheetService eamThirdMaintenanceWorkPlanSheetService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamThirdMaintenanceWorkPlanSheet
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "“三级保养工作计划单-分页列表查询")
    @ApiOperation(value="“三级保养工作计划单-分页列表查询", notes="“三级保养工作计划单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamThirdMaintenanceWorkPlanSheet> queryWrapper = new QueryWrapper<>();
        queryWrapper.like(StrUtil.isNotEmpty(eamThirdMaintenanceWorkPlanSheet.getMaintenanceYear()),"maintenance_date",eamThirdMaintenanceWorkPlanSheet.getMaintenanceYear());
        queryWrapper.like(StrUtil.isNotEmpty(eamThirdMaintenanceWorkPlanSheet.getEquipmentCode()),"equipment_code",eamThirdMaintenanceWorkPlanSheet.getEquipmentCode());
        queryWrapper.like(StrUtil.isNotEmpty(eamThirdMaintenanceWorkPlanSheet.getEquipmentName()),"equipment_name",eamThirdMaintenanceWorkPlanSheet.getEquipmentName());
        queryWrapper.like(StrUtil.isNotEmpty(eamThirdMaintenanceWorkPlanSheet.getEquipmentModel()),"equipment_model",eamThirdMaintenanceWorkPlanSheet.getEquipmentModel());
        queryWrapper.like(StrUtil.isNotEmpty(eamThirdMaintenanceWorkPlanSheet.getFactoryOrgCode()),"factory_org_code", eamThirdMaintenanceWorkPlanSheet.getFactoryOrgCode());
        Page<EamThirdMaintenanceWorkPlanSheet> page = new Page<EamThirdMaintenanceWorkPlanSheet>(pageNo, pageSize);
        IPage<EamThirdMaintenanceWorkPlanSheet> pageList = eamThirdMaintenanceWorkPlanSheetService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param eamThirdMaintenanceWorkPlanSheet
     * @return
     */
    @AutoLog(value = "“三级保养工作计划单-添加")
    @ApiOperation(value="“三级保养工作计划单-添加", notes="“三级保养工作计划单-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet) {
        eamThirdMaintenanceWorkPlanSheetService.save(eamThirdMaintenanceWorkPlanSheet);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param eamThirdMaintenanceWorkPlanSheet
     * @return
     */
    @AutoLog(value = "“三级保养工作计划单-编辑")
    @ApiOperation(value="“三级保养工作计划单-编辑", notes="“三级保养工作计划单-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet) {
        eamThirdMaintenanceWorkPlanSheetService.updateById(eamThirdMaintenanceWorkPlanSheet);
        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) {
        eamThirdMaintenanceWorkPlanSheetService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "“三级保养工作计划单-批量删除")
    @ApiOperation(value="“三级保养工作计划单-批量删除", notes="“三级保养工作计划单-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamThirdMaintenanceWorkPlanSheetService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "“三级保养工作计划单-通过id查询")
    @ApiOperation(value="“三级保养工作计划单-通过id查询", notes="“三级保养工作计划单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet = eamThirdMaintenanceWorkPlanSheetService.getById(id);
        return Result.OK(eamThirdMaintenanceWorkPlanSheet);
    }

  /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param eamThirdMaintenanceWorkPlanSheet
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceWorkPlanSheet eamThirdMaintenanceWorkPlanSheet) {
      return super.exportXls(request, eamThirdMaintenanceWorkPlanSheet, EamThirdMaintenanceWorkPlanSheet.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, EamThirdMaintenanceWorkPlanSheet.class);
  }

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderGenerateJob.java

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

import cn.hutool.core.collection.CollectionUtil;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecg.modules.quartz.entity.SysQuartzLog;
import org.jeecg.modules.quartz.service.IQuartzJobService;
import org.jeecg.modules.quartz.service.ISysQuartzLogService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

/**
 * @Author: Lyh
 * @CreateTime: 2025-09-01
 * @Description: äºŒä¿å·¥å•ç”Ÿæˆ
 */
@Component
@Slf4j
public class SecondMaintenanceOrderGenerateJob implements Job {

    @Autowired
    private IEamEquipmentService equipmentService;
    @Autowired
    private IEamSecondMaintenanceOrderService eamSecondMaintenanceOrderService;
    @Autowired
    private IEamMaintenanceStandardService eamMaintenanceStandardService;
    @Autowired
    private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ISysQuartzLogService sysQuartzLogService;
    @Autowired
    private IQuartzJobService quartzJobService;
    @Autowired
    private IEamEquipmentExtendService equipmentExtendService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        // ä»»åŠ¡æ—¥å¿—初始化
        SysQuartzLog quartzLog = new SysQuartzLog();
        quartzLog.setCreateTime(new Date());
        List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
        if (byJobClassName != null && !byJobClassName.isEmpty()) {
            quartzLog.setJobId(byJobClassName.get(0).getId());
        }
        long startTime = System.currentTimeMillis();
        // èŽ·å–需要二保的设备列表
        List<EamEquipment> equipmentList = equipmentService.selectSecondMaintenanceEquipmentList();
        if (CollectionUtil.isEmpty(equipmentList)) {
            log.warn("没有需要生成二保工单的设备！日期：{}", DateUtils.date2Str(DateUtils.date_sdf.get()));
            quartzLog.setIsSuccess(-1);
            quartzLog.setExceptionDetail("没有需要生成二保工单的设备");
            saveQuartzLog(quartzLog, startTime);
            return;
        }

        AtomicInteger successCount = new AtomicInteger(0);
        AtomicInteger failCount = new AtomicInteger(0);
        StringBuilder sb = new StringBuilder();

        // éåŽ†è®¾å¤‡ç”Ÿæˆå·¥å•
        for (EamEquipment equipment : equipmentList) {
            generateSecondMaintenanceOrder(
                    equipment,
                    successCount,
                    failCount,
                    sb
            );
        }

        // ä¿å­˜ä»»åŠ¡æ—¥å¿—
        quartzLog.setIsSuccess(failCount.get() > 0 ? -1 : 0);
        sb.insert(0, "二保工单生成结果：");
        sb.append("\n成功：").append(successCount.get()).append("，失败：").append(failCount.get());
        quartzLog.setExceptionDetail(sb.toString());
        saveQuartzLog(quartzLog, startTime);
    }

    private void saveQuartzLog(SysQuartzLog quartzLog, long startTime) {
        long endTime = System.currentTimeMillis();
        quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
        sysQuartzLogService.save(quartzLog);
    }

    private void generateSecondMaintenanceOrder(EamEquipment equipment, AtomicInteger successCount, AtomicInteger failCount, StringBuilder sb) {
        Date nextMaintenanceDate=equipment.getNextSecondMaintenance();
        //检查是否满足生成条件，提前一天生成
        Calendar cal = Calendar.getInstance();
        cal.setTime(nextMaintenanceDate);
        cal.add(Calendar.DAY_OF_MONTH, -1);
        Date targetDate = cal.getTime();

        // èŽ·å–当前日期（不含时间部分）
        Calendar today = Calendar.getInstance();
        today.set(Calendar.HOUR_OF_DAY, 0);
        today.set(Calendar.MINUTE, 0);
        today.set(Calendar.SECOND, 0);
        today.set(Calendar.MILLISECOND, 0);
        // æ¯”较日期是否匹配
        if (targetDate.equals(today.getTime())) {
            // ç”ŸæˆäºŒä¿å·¥å•
            EamMaintenanceStandard standard = eamMaintenanceStandardService.queryByEquipmentIdAndCategory(
                    equipment.getId(),
                    MaintenanceCategoryEnum.SECOND_MAINTENANCE.name()
            );

            if (standard == null) {
                handleFailure(equipment, "未配置二级保养规范", failCount, sb);
                return;
            }

            // èŽ·å–规范明细
            List<EamMaintenanceStandardDetail> details = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId());
            if (CollectionUtil.isEmpty(details)) {
                handleFailure(equipment, "未配置二级保养规范明细", failCount, sb);
                return;
            }

            // æž„建工单请求
            EamSecondMaintenanceRequest request = new EamSecondMaintenanceRequest();
            request.setOrderNum(businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SECOND_MAINTENANCE_CODE_RULE));
            request.setEquipmentId(equipment.getId());
            request.setStandardId(standard.getId());
            request.setMaintenanceDate(nextMaintenanceDate);
            request.setCreationMethod(OrderCreationMethodEnum.AUTO.name());

            // è½¬æ¢è§„范明细
            List<EamSecondMaintenanceOrderDetail> orderDetails = details.stream()
                    .map(EamSecondMaintenanceOrderDetail::new)
                    .collect(Collectors.toList());
            request.setTableDetailList(orderDetails);

            try {
                // åˆ›å»ºå·¥å•
                eamSecondMaintenanceOrderService.addMaintenance(request);
                // æ›´æ–°è®¾å¤‡çŠ¶æ€
                equipmentExtendService.updateSecondMaintenanceParam(
                        equipment.getId(),
                        null,
                        CommonConstant.STATUS_1
                );
                successCount.incrementAndGet();
                log.info("设备 {} äºŒä¿å·¥å•ç”ŸæˆæˆåŠŸ", equipment.getEquipmentCode());
            } catch (Exception e) {
                handleFailure(equipment, "生成失败: " + e.getMessage(), failCount, sb);
                log.error("设备 {} äºŒä¿å·¥å•ç”Ÿæˆå¼‚常", equipment.getEquipmentCode(), e);
            }
        }
    }

    private void handleFailure(EamEquipment equipment, String reason, AtomicInteger failCount, StringBuilder sb) {
        failCount.incrementAndGet();
        sb.append("\n设备 ")
                .append(equipment.getEquipmentCode())
                .append("：")
                .append(reason);
        log.warn("设备 {} äºŒä¿å·¥å•ç”Ÿæˆå¤±è´¥ï¼š{}", equipment.getEquipmentCode(), reason);
    }


}

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

@@ -55,20 +55,6 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    /**
     * é”å®šå·¥å•æ—¥æœŸ
     */
    @ApiModelProperty(value = "锁定工单日期;提前55天锁定工单")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date freezeOrderDate;
    /**
     * å·¥å•è¿‡æœŸæ—¥æœŸ
     */
    @ApiModelProperty(value = "工单过期日期;到期未做直接过期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date orderExpirationDate;
    /**
     * å®žé™…开始时间
     */
    @ApiModelProperty(value = "实际开始时间")

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

@@ -9,6 +9,7 @@
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
import org.jeecg.modules.eam.vo.EamEquipmentTree;

import java.text.ParseException;
import java.util.List;

/**
@@ -57,7 +58,7 @@
     * @param request
     * @return
     */
    EamSecondMaintenanceOrder approval(EamSecondMaintenanceRequest request);
    EamSecondMaintenanceOrder approval(EamSecondMaintenanceRequest request) throws ParseException;


    /**

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

ÎļþÒÑɾ³ý

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

@@ -52,7 +52,10 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -100,8 +103,6 @@
    private BaseFactoryMapper baseFactoryMapper;
    @Autowired
    private IEamSecondMaintenanceOrderDetailService eamSecondMaintenanceOrderDetailService;
    @Autowired
    private EamSecondMaintenanceOrderAsyncService eamSecondMaintenanceOrderAsyncService;
    @Autowired
    private IEamFactorySecondMaintPlanService factorySecondMaintPlanService;

@@ -349,9 +350,9 @@
        }
        // æ’入首页二保养计划
        // ä½¿ç”¨ SimpleDateFormat ç›´æŽ¥æ ¼å¼åŒ–为“yyyyå¹´MM月”格式
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyå¹´MM月");
        String formattedDate = sdf.format(order.getMaintenanceDate());
        factorySecondMaintPlanService.add(order.getEquipmentId(), formattedDate);
//        SimpleDateFormat sdf = new SimpleDateFormat("yyyyå¹´MM月");
//        String formattedDate = sdf.format(order.getMaintenanceDate());
//        factorySecondMaintPlanService.add(order.getEquipmentId(), formattedDate);
        return true;
    }

@@ -486,7 +487,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SECOND_MAINTENANCE, businessTable = "eam_second_maintenance_order")
    public EamSecondMaintenanceOrder approval(EamSecondMaintenanceRequest request) {
    public EamSecondMaintenanceOrder approval(EamSecondMaintenanceRequest request) throws ParseException {
        EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderMapper.selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("审批的数据已删除，请刷新重试！");
@@ -683,17 +684,32 @@
        eamSecondMaintenanceOrderMapper.updateById(entity);
        //异步生成下次二保工单
        if (SecondMaintenanceStatusEnum.COMPLETE.name().equals(entity.getMaintenanceStatus())) {
            try {
                eamSecondMaintenanceOrderAsyncService.asyncGenerateNextMaintenanceOrder(entity.getId());
            } catch (Exception e) {
                log.error("触发异步生成下次工单失败，工单ID: {}", entity.getId(), e);
            }
            //填充计算下次二保日期
            EamEquipmentExtend eamEquipmentExtend=eamEquipmentExtendService.getById(entity.getEquipmentId());
            eamEquipmentExtend.setLatestSecondMaintenance(entity.getMaintenanceDate());
            eamEquipmentExtend.setNextSecondMaintenance(calculateNextMaintenanceDate(entity.getMaintenanceDate()));
            eamEquipmentExtendService.updateById(eamEquipmentExtend);
        }

        return entity;
    }

    /**
     * è®¡ç®—六个月后的当月最后一天
     * @param currentDate å½“前工单日期
     * @return å…­ä¸ªæœˆåŽçš„当月最后一天
     */
    private Date calculateNextMaintenanceDate(Date currentDate) {
        // è½¬æ¢ä¸ºLocalDate处理日期
        LocalDate localDate = DateUtils.dateToLocalDate(currentDate);
        // è®¡ç®—六个月后的日期
        LocalDate sixMonthsLater = localDate.plusMonths(6);
        // è°ƒæ•´åˆ°å½“月的最后一天
        LocalDate lastDayOfMonth = sixMonthsLater.with(TemporalAdjusters.lastDayOfMonth());
        // è½¬æ¢å›žDate类型
        return DateUtils.localDateToDate(lastDayOfMonth);
    }

    /**
     * æ‰¹é‡æ‰“印二保工单
     * @param ids
     * @return