From 2a9ca5b78462b3c26a8dacff6b8d003ba90c5637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Thu, 23 Oct 2025 15:46:19 +0800 Subject: [PATCH] =?UTF-8?q?---=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/maven-archiver/pom.properties | 5 ----- .../compile/default-compile/createdFiles.lst | 0 .../compile/default-compile/inputFiles.lst | 16 ---------------- .../main/java/com/pictc/utils/DataLogTools.java | 6 +++--- 4 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties delete mode 100644 itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties b/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties deleted file mode 100644 index a62939d..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Sep 24 16:46:40 CST 2025 -version=2.0.4 -groupId=com.geg -artifactId=itc-pcitc-demo-api diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 12f0e49..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,16 +0,0 @@ -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\vo\DemoApplianceVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\client\IDemoApplianceClient.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\vo\Testfrom4Vo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\dto\DemoCustomerPageDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\dto\AddDemoCustomerDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\dto\UpdateDemoCustomerDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\dto\AddTestfrom4Dto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\dto\AddDemoApplianceDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\vo\DemoCustomerVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\vo\Testfrom4PageVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\dto\DemoAppliancePageDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\vo\DemoAppliancePageVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\dto\Testfrom4PageDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\dto\UpdateTestfrom4Dto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\vo\DemoCustomerPageVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\dto\UpdateDemoApplianceDto.java diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index c6a12f7..a85959b 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -322,7 +322,7 @@ public class DataLogTools { T dto = (T)tabInfo.toDto(entity); DataChangeLog datalog = createLog(klazz,OperationType.UPDATE); datalog.setEntityId(id); - buildFields(datalog,tabInfo,dto,null); + buildFields(datalog,tabInfo,dto,tabInfo.toDto(old)); logs.add(datalog); saveLogs(tabInfo,logs); return dto; @@ -330,7 +330,7 @@ public class DataLogTools { public static boolean disable(Class klazz, @Valid List ids) { for (Long id : ids) { - enableById(klazz, id); + disableById(klazz, id); } return true; } @@ -348,7 +348,7 @@ public class DataLogTools { T dto = (T)tabInfo.toDto(entity); DataChangeLog datalog = createLog(klazz,OperationType.UPDATE); datalog.setEntityId(id); - buildFields(datalog,tabInfo,dto,null); + buildFields(datalog,tabInfo,dto,tabInfo.toDto(old)); logs.add(datalog); saveLogs(tabInfo,logs); return dto;