From 23a749973d4a7df12b1728eafe8945f3e75d6f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Fri, 24 Oct 2025 17:45:59 +0800 Subject: [PATCH] =?UTF-8?q?10-24-=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rkcontractCompletionAdjustServiceImpl.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java index 5e7186ec..71013178 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java @@ -1,35 +1,35 @@ package org.dromara.xzd.service.impl; -import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; -import org.dromara.xzd.domain.*; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.xzd.domain.XzdWorkcontractCompletionAdjust; +import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo; import org.dromara.xzd.domain.vo.XzdContractAccountVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo; +import org.dromara.xzd.mapper.XzdWorkcontractCompletionAdjustMapper; +import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService; import org.dromara.xzd.settlement.domain.XzdJsDeductionItems; import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo; -import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo; -import org.dromara.xzd.mapper.XzdWorkcontractCompletionAdjustMapper; -import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 承包合同竣工结算调整Service业务层处理 @@ -310,9 +310,9 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl accountVo = List.of(xzdContractAccountVo); - xzdContractAccountService.setValue(accountVo); - xzdContractAccountVo = accountVo.getFirst(); +// List accountVo = List.of(xzdContractAccountVo); +// xzdContractAccountService.setValue(accountVo); +// xzdContractAccountVo = accountVo.getFirst(); //竣工决算 vo.setContractAccount(xzdContractAccountVo); //决算标题