From 7935e43118841fa53cc54a272429976768529fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Thu, 25 Dec 2025 17:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/AddLngContractFactDto.java | 7 +++ .../dto/UpdateLngContractFactDto.java | 8 +++ .../controller/ContractFactController.java | 56 +++++++++++++++++-- 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactDto.java index 29d3889..1c5ca05 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -181,4 +182,10 @@ public class AddLngContractFactDto implements Serializable { */ @ApiModelProperty("lngContractApproRel子表") private List lngContractApproRelList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java index f8084ad..814d64f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java @@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.*; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -258,4 +259,11 @@ public class UpdateLngContractFactDto implements Serializable { }, caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY) private List lngContractApproRelList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java index bdf15ef..0683a78 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java @@ -6,6 +6,15 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -42,7 +51,7 @@ public class ContractFactController { private final IContractFactService contractFactService; private final DatalogService dataService; - @GetMapping(value = "/page") +// @GetMapping(value = "/page") @ApiOperation(value="LngContractFact列表(分页)") @SaCheckPermission("contractFact:list") public R page(@Valid LngContractFactPageDto dto){ @@ -101,7 +110,17 @@ public class ContractFactController { @ApiOperation(value = "新增LngContractFact") @SaCheckPermission("contractFact:add") public R add(@Valid @RequestBody UpdateLngContractFactDto dto){ - UpdateLngContractFactDto res = dataService.insert(dto); + UpdateLngContractFactDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngContractFactDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractFactDto after(DataOperationContent content) { + return null; + } + }); return R.ok(res.getId()); } @@ -109,15 +128,44 @@ public class ContractFactController { @ApiOperation(value = "修改LngContractFact") @SaCheckPermission("contractFact:edit") public R update(@Valid @RequestBody UpdateLngContractFactDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngContractFactDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngContractFactDto after(DataOperationContent content) { + return null; + } + })); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("contractFact:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngContractFactDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngContractFactDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngContractFactDto before(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + @Override + public UpdateLngContractFactDto after(DataOperationContent content) { + return null; + } + })); }