From 3d5dd93488258995645fa5153154fd56d2c877ac Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 31 十月 2025 16:47:34 +0800
Subject: [PATCH] 提交 解决现场修边设置问题
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 3 +--
north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java | 2 +-
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 21 ++++++++++++---------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
index be7254a..7b883ba 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
@@ -230,7 +230,7 @@
List<Map<String, Object>> getLayoutSetSv(String processId);
- String selectConfigByUserAndType(String username, String type);
+ String selectConfigByUserAndType(String username, int type);
void insertOptimizeConfig(String json, int type, String userName, String configName);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index f690835..e74206f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -943,27 +943,30 @@
json = object.get("json").toString();
}
if(type.equals("閽㈠寲")){
- String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, type);
+ String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 1);
if (existingConfig == null) {
String configName = "閽㈠寲鎺ㄨ崘";
glassOptimizeMapper.insertOptimizeConfig(json,1,username,configName);
+ }else {
+ glassOptimizeMapper.updateOptimizeConfig(json,1,username);
}
- glassOptimizeMapper.updateOptimizeConfig(json,1,username);
-
} else if (type.equals("淇竟")) {
- String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, type);
+ String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 5);
if (existingConfig == null) {
- String configName = "淇竟鎺ㄨ崘";
+ String configName = "淇竟閰嶇疆";
glassOptimizeMapper.insertOptimizeConfig(json,5,username,configName);
+ }else {
+ glassOptimizeMapper.updateOptimizeConfig(json,5,username);
}
- glassOptimizeMapper.updateOptimizeConfig(json,5,username);
}else if (type.equals("纾ㄩ噺")) {
- String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, type);
+ String existingConfig = glassOptimizeMapper.selectConfigByUserAndType(username, 4);
if (existingConfig == null) {
- String configName = "纾ㄩ噺鎺ㄨ崘";
+ String configName = "纾ㄩ噺閰嶇疆";
glassOptimizeMapper.insertOptimizeConfig(json,4,username,configName);
+ }else{
+ glassOptimizeMapper.updateOptimizeConfig(json,4,username);
}
- glassOptimizeMapper.updateOptimizeConfig(json,4,username);
+
}
return true;
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index bc160f8..5e7b4c3 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -2085,8 +2085,7 @@
id,
config_type,
config_detail,
- creater,
- config_type
+ creater
FROM
pp.optimize_config
WHERE creater = #{username} AND config_type = #{type}
--
Gitblit v1.8.0