From 4c90f45ab8dd0385f119fdfd2b7cac6d3e1dfe79 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 10 Feb 2026 11:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1=E9=81=93?= =?UTF-8?q?=E6=B0=94=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/vo/LngPngSettleHdrPurVo.java | 8 ++ .../PngMeasureSalesPurController.java | 2 +- .../controller/PngSettleHdrPurController.java | 34 ++--- ....java => PngSettleHdrSalesController.java} | 10 +- .../dayPlan/entity/LngPngSettleHdrPur.java | 8 +- .../dayPlan/entity/LngPngSettlePur.java | 8 +- .../mapper/LngPngSettleHdrPurMapper.java | 4 +- .../service/IPngSettleHdrPurService.java | 12 +- .../dayPlan/service/IPngSettleHdrService.java | 6 + .../impl/PngSettleHdrPurServiceImpl.java | 133 +++++++++++++++--- .../service/impl/PngSettleHdrServiceImpl.java | 66 ++++++++- 11 files changed, 242 insertions(+), 49 deletions(-) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/{PngSettleHdrController.java => PngSettleHdrSalesController.java} (95%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java index abb859a..e99dab7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -178,5 +180,11 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode @ApiModelProperty("lngPngSettlePur子表") private List lngPngSettlePurList; + //附件 + private List lngFileUploadList; + + //对账单 + private List billList; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java index f519692..b5e03bf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java @@ -202,7 +202,7 @@ public class PngMeasureSalesPurController { @DeleteMapping @ApiOperation(value = "删除") - //@SaCheckPermission("pngMeasureSalesPur:delete") + @SaCheckPermission("pngMeasureSalesPur:delete") public R delete(@Valid @RequestBody List ids){ return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids)); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java index d29ba1d..58c9ac7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java @@ -24,8 +24,10 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto; import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -57,18 +59,13 @@ public class PngSettleHdrPurController { @SaCheckPermission("pngSettleHdrPur:list") public R page(@Valid LngPngSettleHdrPageDto dto){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdr::getId,dto.getId()) - .like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdr::getCpCode,dto.getCpCode()) - .like(StrUtil.isNotBlank(dto.getSettleDesc()),LngPngSettleHdr::getSettleDesc,dto.getSettleDesc()) - .eq(ObjectUtil.isNotNull(dto.getQtySettleGj()),LngPngSettleHdr::getQtySettleGj,dto.getQtySettleGj()) - .eq(ObjectUtil.isNotNull(dto.getQtySettleM3()),LngPngSettleHdr::getQtySettleM3,dto.getQtySettleM3()) - .eq(ObjectUtil.isNotNull(dto.getAmount()),LngPngSettleHdr::getAmount,dto.getAmount()) - .like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdr::getApproCode,dto.getApproCode()) - .orderByDesc(LngPngSettleHdr::getId) - .select(LngPngSettleHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrPageVo.class).contains(x.getProperty())); - IPage page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper); + .eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdrPur::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdrPur::getCpCode,dto.getCpCode()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdrPur::getApproCode,dto.getApproCode()) + .orderByDesc(LngPngSettleHdrPur::getId); + IPage page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class); return R.ok(pageOutput); } @@ -77,11 +74,8 @@ public class PngSettleHdrPurController { @ApiOperation(value="根据id查询LngPngSettleHdr信息") @SaCheckPermission("pngSettleHdrPur:detail") public R info(@RequestParam Long id){ - LngPngSettleHdr lngPngSettleHdr = pngSettleHdrPurService.getByIdDeep(id); - if (lngPngSettleHdr == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class)); + LngPngSettleHdrPurVo lngPngSettleHdrVo = pngSettleHdrPurService.getInfoById(id); + return R.ok(lngPngSettleHdrVo); } @GetMapping(value = "/datalog") @@ -116,5 +110,11 @@ public class PngSettleHdrPurController { } - + @PostMapping(value="/cancel") + @ApiOperation(value = "取消结算") + @SaCheckPermission("pngSettleHdrPur:cancel") + public R cancel(@Valid @RequestBody List ids){ + pngSettleHdrPurService.cancel(ids); + return R.ok(); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java similarity index 95% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java index d25c857..198f831 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java @@ -47,7 +47,7 @@ import lombok.AllArgsConstructor; @RequestMapping("/dayPlan/pngSettleHdr") @Api(value = "/dayPlan" + "/pngSettleHdr",tags = "管道气销售结算代码") @AllArgsConstructor -public class PngSettleHdrController { +public class PngSettleHdrSalesController { private final IPngSettleHdrService pngSettleHdrService; @@ -159,5 +159,13 @@ public class PngSettleHdrController { } + @PostMapping(value="/cancel") + @ApiOperation(value = "取消结算") + @SaCheckPermission("pngSettleHdr:cancel") + public R cancel(@Valid @RequestBody List ids){ + pngSettleHdrService.cancel(ids); + return R.ok(); + } + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java index e6c8e44..d924cc3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java @@ -186,12 +186,6 @@ public class LngPngSettleHdrPur implements Serializable { @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "settleHdrId") private List lngPngSettlePurList; - /** - * lngPngSettlePurDtl - */ - @ApiModelProperty("lngPngSettlePurDtl子表") - @TableField(exist = false) - @EntityMapping(thisField = "id", joinField = "settleId") - private List lngPngSettlePurDtlList; + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java index 2943d59..2c0de67 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java @@ -276,6 +276,12 @@ public class LngPngSettlePur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long ruleUserId; - + /** + * lngPngSettlePurDtl + */ + @ApiModelProperty("lngPngSettlePurDtl子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "settleId") + private List lngPngSettlePurDtlList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java index 52be863..2c246b4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java @@ -3,6 +3,8 @@ package com.xjrsoft.module.dayPlan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; + import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngPngSettleHdrPurMapper extends MPJBaseMapper,BaseMapper { +public interface LngPngSettleHdrPurMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java index c862bea..6b84634 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java @@ -1,9 +1,15 @@ package com.xjrsoft.module.dayPlan.service; +import java.util.List; + +import javax.validation.Valid; + import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo; /** * @title: service @@ -12,6 +18,10 @@ import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; * @Version 1.0 */ -public interface IPngSettleHdrPurService extends MPJBaseService, MPJDeepService, MPJRelationService { +public interface IPngSettleHdrPurService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngPngSettleHdrPurVo getInfoById(Long id); + + void cancel(@Valid List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java index 8803232..0a29aeb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java @@ -1,5 +1,9 @@ package com.xjrsoft.module.dayPlan.service; +import java.util.List; + +import javax.validation.Valid; + import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; @@ -16,5 +20,7 @@ import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; public interface IPngSettleHdrService extends MPJBaseService, MPJDeepService, MPJRelationService { LngPngSettleHdrVo getInfoById(Long id); + + void cancel(@Valid List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java index 4f306d5..0272ad7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java @@ -1,21 +1,39 @@ package com.xjrsoft.module.dayPlan.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper; -import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper; -import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper; -import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +import javax.validation.Valid; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.ApproveCodeEnum; +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.CollectionUtils; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrPurDto; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrPurMapper; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper; +import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +import lombok.AllArgsConstructor; +import shade.powerjob.com.google.common.collect.Lists; /** * @title: service @@ -25,11 +43,88 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; */ @Service @AllArgsConstructor -public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrPurService { - private final LngPngSettleHdrMapper pngSettleHdrPurLngPngSettleHdrMapper; +public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrPurService { + + private final LngPngSettleHdrPurMapper lngPngSettleHdrPurMapper; - private final LngPngSettlePurMapper pngSettleHdrPurLngPngSettlePurMapper; - private final LngPngSettlePurDtlMapper pngSettleHdrPurLngPngSettlePurDtlMapper; + private final LngPngSettlePurMapper lngPngSettlePurMapper; + + private final LngPngSettlePurDtlMapper lngPngSettlePurDtlMapper; + + private final IFileClient fileClient; + + private final DatalogService dataService; + + + @Override + public LngPngSettleHdrPurVo getInfoById(Long id) { + LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id); + if(lngPngSettleHdr == null) { + return null; + } + + if(CollectionUtils.isNotEmpty(lngPngSettleHdr.getLngPngSettlePurList())) { + for(LngPngSettlePur ss:lngPngSettleHdr.getLngPngSettlePurList()) { + List list = lngPngSettlePurDtlMapper.selectList(new LambdaQueryWrapper() + .eq(LngPngSettlePurDtl::getSettleId, ss.getId())); + ss.setLngPngSettlePurDtlList(list); + } + } + LngPngSettleHdrPurVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrPurVo.class); + List fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + + List billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId()); + vo.setLngFileUploadList(billFileList); + return vo; + } + + + @Override + public void cancel(@Valid List ids) { + List tempList = Lists.newArrayList(); + for(Long id:ids) { + LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id); + if (lngPngSettleHdr == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); + + } + /** + if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) && + !ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) { + throw new BusinessException(BusinessCode.of(10500,"审批状态变化，不能提交")); + } + **/ + lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode()); + + tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrPurDto.class)); + } + dataService.updateBatch(tempList,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}", + 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(); + } + }); + + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java index 8ee7195..9e4d0d8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java @@ -1,13 +1,25 @@ package com.xjrsoft.module.dayPlan.service.impl; -import java.util.Collection; import java.util.List; +import javax.validation.Valid; + import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.ApproveCodeEnum; +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.CollectionUtils; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; @@ -21,6 +33,7 @@ import com.xjrsoft.module.system.vo.LngFileUploadVo; import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; +import shade.powerjob.com.google.common.collect.Lists; /** * @title: service @@ -39,6 +52,8 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); + + List billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId()); + vo.setLngFileUploadList(billFileList); return vo; } + + @Override + public void cancel(@Valid List ids) { + List tempList = Lists.newArrayList(); + for(Long id:ids) { + LngPngSettleHdr lngPngSettleHdr = this.getByIdDeep(id); + if (lngPngSettleHdr == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); + + } + /** + if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) && + !ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) { + throw new BusinessException(BusinessCode.of(10500,"审批状态变化，不能提交")); + } + **/ + lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode()); + + tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrDto.class)); + } + dataService.updateBatch(tempList,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrDto after(DataOperationContent content) { + + String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}", + 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(); + } + }); + + } }