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
This commit is contained in:
张福财
2025-10-30 20:44:21 +08:00
parent ce6bc91e91 2ff6926956
commit 6e718eeb31
7 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBDocCpPageVo.java
View File

@ -1,14 +1,9 @@
package com.xjrsoft.module.mdm.vo; package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType; import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime; import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime; import lombok.Data;
import java.math.BigDecimal;
/** /**
* @title: 分页列表出参 * @title: 分页列表出参
@ -38,25 +33,25 @@ public class LngBDocCpPageVo {
* 供应商适用(Y-是，N-否) * 供应商适用(Y-是，N-否)
*/ */
@ApiModelProperty("供应商适用(Y-是，N-否)") @ApiModelProperty("供应商适用(Y-是，N-否)")
@Trans(type = TransType.DIC, id = "1676483934342787074") @Trans(type = TransType.DIC, id = "1978056598125330433")
private String suSign; private String suSign;
/** /**
* 供应商必须提供(Y-是，N-否；供应商适用N时置为N且只读) * 供应商必须提供(Y-是，N-否；供应商适用N时置为N且只读)
*/ */
@ApiModelProperty("供应商必须提供(Y-是，N-否；供应商适用N时置为N且只读)") @ApiModelProperty("供应商必须提供(Y-是，N-否；供应商适用N时置为N且只读)")
@Trans(type = TransType.DIC, id = "1676831752869834753") @Trans(type = TransType.DIC, id = "1978056598125330433")
private String suNecSign; private String suNecSign;
/** /**
* 客户适用(Y-是，N-否) * 客户适用(Y-是，N-否)
*/ */
@ApiModelProperty("客户适用(Y-是，N-否)") @ApiModelProperty("客户适用(Y-是，N-否)")
@Trans(type = TransType.DIC, id = "1679007059387240450") @Trans(type = TransType.DIC, id = "1978056598125330433")
private String cuSign; private String cuSign;
/** /**
* 客户必须提供(Y-是，N-否；客户适用N时置为N且只读) * 客户必须提供(Y-是，N-否；客户适用N时置为N且只读)
*/ */
@ApiModelProperty("客户必须提供(Y-是，N-否；客户适用N时置为N且只读)") @ApiModelProperty("客户必须提供(Y-是，N-否；客户适用N时置为N且只读)")
@Trans(type = TransType.DIC, id = "1679010661178691585") @Trans(type = TransType.DIC, id = "1978056598125330433")
private String cuNecSign; private String cuNecSign;
/** /**
* 有效标志(Y-有效，N-无效) * 有效标志(Y-有效，N-无效)

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java
View File

@ -80,7 +80,7 @@ public class BankServiceImpl extends ServiceImpl<LngBBankMapper, LngBBank> imple
DataLogTools.disable(UpdateLngBBankDto.class,ids); DataLogTools.disable(UpdateLngBBankDto.class,ids);
for (Long id : ids) { for (Long id : ids) {
String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_BANK, id); String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_BANK, id);
if (StringUtils.isNotBlank(msg)) { if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java
View File

@ -76,7 +76,7 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
public boolean disable(List<Long> ids) { public boolean disable(List<Long> ids) {
dataService.disable(UpdateLngBRegionDto.class,ids); dataService.disable(UpdateLngBRegionDto.class,ids);
for (Long id : ids) { for (Long id : ids) {
String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_REGION, id); String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_REGION, id);
if (StringUtils.isNotBlank(msg)) { if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java
View File

@ -72,7 +72,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl<LngBFeeMapper, LngBFee>
public Boolean disable(List<Long> ids) { public Boolean disable(List<Long> ids) {
DataLogTools.disable(UpdateLngBBankDto.class,ids); DataLogTools.disable(UpdateLngBBankDto.class,ids);
for (Long id : ids) { for (Long id : ids) {
String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_FEE, id); String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_FEE, id);
if (StringUtils.isNotBlank(msg)) { if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java
View File

@ -80,7 +80,7 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl<LngBStationPngM
DataLogTools.disable(UpdateLngBStationPngDto.class,ids); DataLogTools.disable(UpdateLngBStationPngDto.class,ids);
for (Long id : ids) { for (Long id : ids) {
String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_STATION_PNG, id); String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_STATION_PNG, id);
if (StringUtils.isNotBlank(msg)) { if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java
View File

@ -88,7 +88,7 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl<LngBPngLineMapper,
DataLogTools.disable(UpdateLngBPngLineDto.class,ids); DataLogTools.disable(UpdateLngBPngLineDto.class,ids);
for (Long id : ids) { for (Long id : ids) {
String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PNG_LINE, id); String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_PNG_LINE, id);
if (StringUtils.isNotBlank(msg)) { if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java
View File

@ -72,7 +72,7 @@ public class TaxRateServiceImpl extends ServiceImpl<LngBTaxMapper, LngBTax> impl
public Boolean disable(List<Long> ids) { public Boolean disable(List<Long> ids) {
DataLogTools.disable(UpdateLngBBankDto.class,ids); DataLogTools.disable(UpdateLngBBankDto.class,ids);
for (Long id : ids) { for (Long id : ids) {
String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_TAX, id); String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_TAX, id);
if (StringUtils.isNotBlank(msg)) { if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }