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

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source 
# Conflicts:
#	itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java
This commit is contained in:
张秉卓
2025-10-23 10:14:56 +08:00
parent 286a3058e2 4bacf06ecf
commit 26cb8498a2
20 changed files with 334 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java
View File

@ -17,7 +17,6 @@ public interface FieldNameConstants {
*/
String FULL_NAME = "名称";
/**
* 本币
*/

11
itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java
View File

@ -17,5 +17,16 @@ public interface TableNameConstants {
*/
String LNG_B_CURRENCY = "lng_b_currency";
/**
* 银行表
*/
String LNG_B_BANK = "lng_b_bank";
/**
* 币种表
*/
String LNG_B_REGION = "lng_b_region";
}

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

2
itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java
View File

@ -35,7 +35,7 @@ public class CommonCallService {
* @param id 表主键
* @return String 返回类型 函数返回非空、或者数据库异常时rollback，函数返回空时commit；
*/
public String saveAfter(String table,Long id) {
public String saveAfter(String table,long id) {
String sql = StringUtils.format("{? = call pc_{0}.f_save(?)}",table);
List<JdbcParam> params = ListUtils.newArrayList(JdbcParam.ofLong(id));
JdbcParam outParam = JdbcParam.ofString(null).setOut(true);