diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java index 2b449347..c3004d04 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java @@ -1,20 +1,16 @@ package org.dromara.xzd.service.impl; -import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.annotation.TableName; +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 io.github.linpeilie.annotations.AutoMapper; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; 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 lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.utils.BatchNumberGenerator; -import org.dromara.ctr.domain.ContractPaymentClause; import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.impl.SysDeptServiceImpl; @@ -23,22 +19,24 @@ import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; import org.dromara.xzd.domain.*; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.dto.QuerCorrespondentDto; -import org.dromara.xzd.domain.vo.*; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; +import org.dromara.xzd.domain.vo.XzdProjectVo; +import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.mapper.XzdContractDetailsMapper; +import org.dromara.xzd.service.IXzdContractDetailsService; import org.dromara.xzd.service.IXzdCorrespondentList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.dromara.xzd.domain.bo.XzdContractDetailsBo; -import org.dromara.xzd.mapper.XzdContractDetailsMapper; -import org.dromara.xzd.service.IXzdContractDetailsService; import org.springframework.transaction.annotation.Transactional; -import java.lang.annotation.Annotation; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 承包合同信息Service业务层处理 @@ -465,10 +463,6 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl nowFile = new ArrayList<>(); + List oldFile = new ArrayList<>(); for (XzdSupplierQualification businessChange : bo.getQualifications()) { businessChange.setSupplierId(update.getId()); + for (String s : businessChange.getFileId().split(",")) { + nowFile.add(Long.valueOf(s)); + } + } + for (XzdSupplierQualification qualification : old.getQualifications()) { + if (qualification.getFileId() != null){ + String[] split = qualification.getFileId().split(","); + List fileIdList = Arrays.stream(split) + .map(Long::valueOf) + .toList(); + oldFile.addAll(fileIdList); + } + } + for (Long l : oldFile) { + if (!nowFile.contains(l)) { + sysOssService.deleteWithValidByIds(List.of(l), false); + } } xzdSupplierQualificationService.saveBatch(bo.getQualifications()); }else { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java index 1c4aa2d5..0fc3b7c0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java @@ -1,17 +1,16 @@ package org.dromara.xzd.spykp.sjsqd.service.impl; -import cn.hutool.core.util.IdUtil; +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.domain.R; import org.dromara.common.core.domain.model.LoginUser; 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 lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.domain.vo.SysDeptVo; @@ -27,18 +26,18 @@ import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl; import org.dromara.xzd.service.impl.XzdProjectServiceImpl; import org.dromara.xzd.service.impl.XzdSolutionSelectionServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd; import org.dromara.xzd.spykp.sjsqd.domain.bo.XzdSpykpSjsqdBo; import org.dromara.xzd.spykp.sjsqd.domain.vo.XzdSpykpSjsqdVo; -import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd; import org.dromara.xzd.spykp.sjsqd.mapper.XzdSpykpSjsqdMapper; import org.dromara.xzd.spykp.sjsqd.service.IXzdSpykpSjsqdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 收据申请单Service业务层处理 @@ -76,6 +75,7 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl vo1 = List.of(vo); + setValue(vo1); return vo1.getFirst(); }