lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lcj:4b96702dc933eaa8f15afb8f65a8783579a9d749
Branches Tags
lcj:dev lcj:prod
...
compare: lcj:8cfc34dbcb9ecb9974ad6b99a912cecebf9d1e4d
Branches Tags
lcj:dev lcj:prod

2 Commits
4b96702dc9 ... 8cfc34dbcb

Author SHA1 Message Date
屈展航
8cfc34dbcb Merge remote-tracking branch 'origin/dev' into dev 2025-10-24 17:46:29 +08:00
屈展航
23a749973d 10-24-修复 2025-10-24 17:45:59 +08:00
1 changed files with 16 additions and 16 deletions
Expand all files Collapse all files

32
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java
View File

@ -1,35 +1,35 @@
package org.dromara.xzd.service.impl; 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.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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 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.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl; 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.XzdContractAccountVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdProjectVo; 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.domain.XzdJsDeductionItems;
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl; import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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 org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection;
/** /**
* 承包合同竣工结算调整Service业务层处理 * 承包合同竣工结算调整Service业务层处理
@ -310,9 +310,9 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
//获取竣工决算对象 //获取竣工决算对象
XzdContractAccountVo xzdContractAccountVo = xzdContractAccountService.queryById(vo.getFinalAccountId()); XzdContractAccountVo xzdContractAccountVo = xzdContractAccountService.queryById(vo.getFinalAccountId());
if (xzdContractAccountVo != null){ if (xzdContractAccountVo != null){
List<XzdContractAccountVo> accountVo = List.of(xzdContractAccountVo); // List<XzdContractAccountVo> accountVo = List.of(xzdContractAccountVo);
xzdContractAccountService.setValue(accountVo); // xzdContractAccountService.setValue(accountVo);
xzdContractAccountVo = accountVo.getFirst(); // xzdContractAccountVo = accountVo.getFirst();
//竣工决算 //竣工决算
vo.setContractAccount(xzdContractAccountVo); vo.setContractAccount(xzdContractAccountVo);
//决算标题 //决算标题