From da26a61eee160d63ad99b69bcef0b24565c1a8f7 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 15:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/LYH/sys_params.sql | 126 ++++++++++++++++++++++++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 32 +++++++++-
2 files changed, 154 insertions(+), 4 deletions(-)
diff --git a/db/LYH/sys_params.sql b/db/LYH/sys_params.sql
new file mode 100644
index 0000000..7812b01
--- /dev/null
+++ b/db/LYH/sys_params.sql
@@ -0,0 +1,126 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : 127.0.0.1,1433
+ Source Server Type : SQL Server
+ Source Server Version : 11007001
+ Source Host : 127.0.0.1:1433
+ Source Catalog : LXZN_TEST_430_NEW
+ Source Schema : dbo
+
+ Target Server Type : SQL Server
+ Target Server Version : 11007001
+ File Encoding : 65001
+
+ Date: 10/07/2025 14:54:07
+*/
+
+
+-- ----------------------------
+-- Table structure for sys_params
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[sys_params]') AND type IN ('U'))
+ DROP TABLE [dbo].[sys_params]
+GO
+
+CREATE TABLE [dbo].[sys_params] (
+ [id] varchar(32) COLLATE Chinese_PRC_CI_AS NOT NULL,
+ [setting_key] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
+ [setting_value] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
+ [remark] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
+ [create_by] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
+ [create_time] datetime2(0) NULL,
+ [update_by] varchar(255) COLLATE Chinese_PRC_CI_AS NULL,
+ [update_time] datetime2(0) NULL,
+ [setting_name] varchar(255) COLLATE Chinese_PRC_CI_AS NULL
+)
+GO
+
+ALTER TABLE [dbo].[sys_params] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'涓婚敭',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍙傛暟閿�',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'setting_key'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍙傛暟鍊�',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'setting_value'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'澶囨敞',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'remark'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍒涘缓浜�',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍒涘缓鏃ユ湡',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏇存柊浜�',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'update_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏇存柊鏃ユ湡',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍙傛暟鍚嶇О',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params',
+'COLUMN', N'setting_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'绯荤粺鍙傛暟琛�',
+'SCHEMA', N'dbo',
+'TABLE', N'sys_params'
+GO
+
+
+-- ----------------------------
+-- Records of sys_params
+-- ----------------------------
+INSERT INTO [dbo].[sys_params] ([id], [setting_key], [setting_value], [remark], [create_by], [create_time], [update_by], [update_time], [setting_name]) VALUES (N'1', N'maintenance_import_type', N'0', N'淇濆吇瑙勮寖瀵煎叆鏄惁鍚姩娴佺▼ 0 鍚� 1鏄�', N'admin', N'2025-02-11 14:00:21', N'admin', N'2025-02-11 16:08:28', N'绯荤粺绫诲瀷閰嶇疆')
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table sys_params
+-- ----------------------------
+ALTER TABLE [dbo].[sys_params] ADD CONSTRAINT [PK__sys_para__3213E83F7A8FD449] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 56d59d2..1238b1b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -22,8 +22,8 @@
import org.jeecg.common.system.vo.LoginUser;
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.entity.SysParams;
+import org.jeecg.modules.system.service.*;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EamMaintenanceStandardDetailCategory;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
@@ -45,8 +45,6 @@
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.service.ISysBusinessCodeRuleService;
-import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -97,6 +95,8 @@
private IEamEquipmentExtendService eamEquipmentExtendService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ISysParamsService sysParamsService;
// 甯搁噺瀹氫箟
private static final String REPAIR_TITLE = "缁翠慨浜哄憳淇濆吇鍐呭";
@@ -598,6 +598,18 @@
eamMaintenanceStandardDetailService.saveBatch(allDetails);
}
+ SysParams sysParams = sysParamsService.getSysPramBySettingKey("maintenance_import_type");
+
+ if (sysParams != null) {
+ if (sysParams.getSettingValue().equals("1")){
+ //瑙﹀彂淇濆吇娴佺▼
+ eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
+ eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
+ }
+ }else {
+ return Result.error("鏈壘鍒颁繚鍏绘祦绋嬪鍏ョ浉鍏抽厤缃�,璇疯仈绯荤鐞嗗憳");
+ }
+
return Result.OK("鐐规琛ㄥ鍏ユ垚鍔�");
} catch (Exception e) {
@@ -1023,6 +1035,18 @@
// 4. 淇濆瓨椤圭洰
eamMaintenanceStandardDetailService.saveBatch(items);
+
+ SysParams sysParams = sysParamsService.getSysPramBySettingKey("maintenance_import_type");
+
+ if (sysParams != null) {
+ if (sysParams.getSettingValue().equals("1")) {
+ standard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
+ eamMaintenanceStandardMapper.updateById(standard);
+ }
+ }else {
+ return Result.error("鏈壘鍒颁繚鍏绘祦绋嬪鍏ョ浉鍏抽厤缃�,璇疯仈绯荤鐞嗗憳");
+ }
+
return Result.ok(fileName + ": 瀵煎叆鎴愬姛, 椤圭洰鏁�: " + items.size());
} catch (ImportException e) {
--
Gitblit v1.9.3