geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

--修改datatools工具类bug

Browse Source
This commit is contained in:
张福财
2025-10-22 16:49:03 +08:00
parent e1eb5018ff
commit 37331a465d
6 changed files with 9 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
itc-pcitc-dependencies/itc-pcitc-dependencies-api/target/maven-archiver/pom.properties
View File

@ -1,5 +0,0 @@
#Generated by Maven
#Tue Oct 21 16:19:00 CST 2025
version=2.0.4
groupId=com.geg
artifactId=itc-pcitc-dependencies-api

22
itc-pcitc-dependencies/itc-pcitc-dependencies-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View File

@ -1,22 +0,0 @@
com\pictc\enums\BSalesCode.class
com\pictc\annotations\datalog\LogField.class
com\pictc\annotations\datalog\LogTable.class
com\pictc\enums\BContractCode.class
com\pictc\annotations\datalog\JoinValueType.class
com\pictc\constant\ContractLiteflowRule.class
com\pictc\annotations\datalog\LogJoin.class
com\xjrsoft\module\datalog\vo\DataChangeLogDto.class
com\pictc\annotations\datalog\LogJoinColumn.class
com\pictc\annotations\datalog\ValueDirectionType.class
com\pictc\enums\BReserveCode.class
com\pictc\enums\ExceptionCommonCode.class
com\pictc\annotations\datalog\SourceType.class
com\xjrsoft\module\datalog\vo\OperationType.class
com\pictc\common\mybatis\JsonTypeHandler.class
com\pictc\enums\BusinessCode.class
com\pictc\enums\BTransportCode.class
com\xjrsoft\module\datalog\vo\FieldChangeDto.class
com\pictc\enums\BProcurementCode.class
com\pictc\enums\BFinanceCode.class
com\pictc\annotations\datalog\JoinCaseType.class
com\pictc\annotations\datalog\JoinType.class

22
itc-pcitc-dependencies/itc-pcitc-dependencies-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View File

@ -1,22 +0,0 @@
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\xjrsoft\module\datalog\vo\FieldChangeDto.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BProcurementCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BSalesCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\xjrsoft\module\datalog\vo\OperationType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BContractCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\JoinCaseType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BFinanceCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogField.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\JoinValueType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogJoin.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\JoinType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\common\mybatis\JsonTypeHandler.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BusinessCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\ExceptionCommonCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\xjrsoft\module\datalog\vo\DataChangeLogDto.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\ValueDirectionType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\SourceType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogTable.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\constant\ContractLiteflowRule.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BTransportCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogJoinColumn.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BReserveCode.java

4
itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java
View File

@ -317,7 +317,7 @@ public class DataLogTools {
T old = BeanUtils.newInstance(klazz); T old = BeanUtils.newInstance(klazz);
BeanUtil.copyProperties(entity,old,true); BeanUtil.copyProperties(entity,old,true);
List<DataChangeLog> logs = CollectionUtils.newArrayList(); List<DataChangeLog> logs = CollectionUtils.newArrayList();
tabInfo.setFieldValue(entity,"valid",YesOrNoEnum.YES.getTextCode()); BeanUtils.setFieldValue("valid", YesOrNoEnum.YES.getTextCode(), entity);
mapper.updateById(entity); mapper.updateById(entity);
T dto = (T)tabInfo.toDto(entity); T dto = (T)tabInfo.toDto(entity);
DataChangeLog datalog = createLog(klazz,OperationType.UPDATE); DataChangeLog datalog = createLog(klazz,OperationType.UPDATE);
@ -343,7 +343,7 @@ public class DataLogTools {
T old = BeanUtils.newInstance(klazz); T old = BeanUtils.newInstance(klazz);
BeanUtil.copyProperties(entity,old,true); BeanUtil.copyProperties(entity,old,true);
List<DataChangeLog> logs = CollectionUtils.newArrayList(); List<DataChangeLog> logs = CollectionUtils.newArrayList();
tabInfo.setFieldValue(entity,"valid",YesOrNoEnum.NO.getTextCode()); BeanUtils.setFieldValue("valid",YesOrNoEnum.NO.getTextCode(), entity);
mapper.updateById(entity); mapper.updateById(entity);
T dto = (T)tabInfo.toDto(entity); T dto = (T)tabInfo.toDto(entity);
DataChangeLog datalog = createLog(klazz,OperationType.UPDATE); DataChangeLog datalog = createLog(klazz,OperationType.UPDATE);

1
itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml
View File

@ -29,6 +29,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>app</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

6
pom.xml
View File

@ -30,6 +30,12 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<docker-registry>http://127.0.0.1:2375</docker-registry>
<maven.build.timestamp.format>yyyy-MM-dd-HHmm</maven.build.timestamp.format>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<docker-jar-name>${project.build.finalName}.jar</docker-jar-name>
</properties> </properties>
<dependencyManagement> <dependencyManagement>