From c964d3043846a0459b8d2aacdf2f76bf5be2ad79 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期二, 02 九月 2025 18:03:13 +0800 Subject: [PATCH] 三级保养工作计划单 --- db/LYH/2025.09.02.sql | 34 ++ lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceWorkPlanSheetService.java | 20 + lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java | 21 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceWorkPlanSheetController.java | 162 +++++++++++ db/430设备管理数据库设计.pdma.json | 394 ++++++++++++++++++++++++++++ lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java | 3 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 11 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceWorkPlanSheetServiceImpl.java | 42 +++ lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceWorkPlanSheet.java | 85 ++++++ lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceWorkPlanSheetMapper.java | 17 + lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceWorkPlanSheetMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 1 12 files changed, 792 insertions(+), 3 deletions(-) diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" index 1385bed..ec764f9 100644 --- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" +++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.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": [], diff --git a/db/LYH/2025.09.02.sql b/db/LYH/2025.09.02.sql new file mode 100644 index 0000000..bdb0e67 --- /dev/null +++ b/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 diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java index 2fa63c4..ede7926 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java +++ b/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 //涓夌骇淇濆吇宸ヤ綔璁″垝鍗� ; } diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceWorkPlanSheet.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceWorkPlanSheet.java new file mode 100644 index 0000000..f1f770c --- /dev/null +++ b/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; +} diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceWorkPlanSheetMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceWorkPlanSheetMapper.java new file mode 100644 index 0000000..e3eeb83 --- /dev/null +++ b/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> { + +} diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceWorkPlanSheetMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceWorkPlanSheetMapper.xml new file mode 100644 index 0000000..a006dea --- /dev/null +++ b/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> diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceWorkPlanSheetService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceWorkPlanSheetService.java new file mode 100644 index 0000000..87781a3 --- /dev/null +++ b/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); +} diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java index 6adaf88..f75386d 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java @@ -4,9 +4,15 @@ 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; @@ -28,6 +34,13 @@ @Resource private EamEquipmentExtendMapper eamEquipmentExtendMapper; + + @Autowired + private IEamThirdMaintenanceWorkPlanSheetService eamThirdMaintenanceWorkPlanSheetService; + + @Resource + private EamEquipmentMapper eamEquipmentMapper; + @Override @Transactional(rollbackFor = Exception.class) @@ -98,6 +111,14 @@ 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; } diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java index 805fa02..a3d1f87 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java +++ b/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) @@ -84,6 +88,13 @@ 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; } diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceWorkPlanSheetServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceWorkPlanSheetServiceImpl.java new file mode 100644 index 0000000..a5da189 --- /dev/null +++ b/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("鏈厤缃笁绾т繚鍏诲伐浣滆鍒掑崟鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒"); + } + eamThirdMaintenanceWorkPlanSheet.setHfCode(eamBaseHFCode.getHfCode()); + return super.save(eamThirdMaintenanceWorkPlanSheet); + } +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java index a0a1d4e..bc124a6 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java +++ b/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; diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceWorkPlanSheetController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceWorkPlanSheetController.java new file mode 100644 index 0000000..9a33079 --- /dev/null +++ b/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); + } + +} -- Gitblit v1.9.3