From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 二月 2025 13:40:06 +0800 Subject: [PATCH] 管理后台bug修改 --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 139 insertions(+), 3 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java index 4e4d8df..deab3c7 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java @@ -1,10 +1,31 @@ package com.sinata.system.service.impl; -import com.sinata.system.domain.MwContract; -import com.sinata.system.mapper.MwContractMapper; -import com.sinata.system.service.MwContractService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sinata.common.entity.PageDTO; +import com.sinata.common.exception.ServiceException; +import com.sinata.common.utils.BeanUtils; +import com.sinata.common.utils.CollUtils; +import com.sinata.common.utils.StringUtils; +import com.sinata.system.domain.MwAttachment; +import com.sinata.system.domain.MwContract; +import com.sinata.system.domain.dto.MwContractDTO; +import com.sinata.system.domain.query.MwContractQuery; +import com.sinata.system.domain.vo.MwAttachmentVO; +import com.sinata.system.domain.vo.MwContractVO; +import com.sinata.system.enums.AttachmentTypeEnum; +import com.sinata.system.mapper.MwContractMapper; +import com.sinata.system.service.MwAttachmentService; +import com.sinata.system.service.MwContractService; +import com.sinata.system.service.SysDepartmentService; +import lombok.RequiredArgsConstructor; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; +import java.util.Objects; /** * <p> @@ -15,6 +36,121 @@ * @since 2024-12-02 */ @Service +@RequiredArgsConstructor public class MwContractServiceImpl extends ServiceImpl<MwContractMapper, MwContract> implements MwContractService { + private final SysDepartmentService sysDepartmentService; + private final MwAttachmentService mwAttachmentService; + /** + * 合同分页列表 + * + * @param query + * @return + */ + @Override + public PageDTO<MwContractVO> pageList(MwContractQuery query) { + String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId()); + if (StringUtils.isBlank(treeCode)) { + return PageDTO.empty(0L, 0L); + } + Page<MwContractVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode); + return PageDTO.of(page); + } + + /** + * 详情 + * + * @param id + * @return + */ + @Override + public MwContractVO detail(Long id) { + MwContractVO mwContractVO = BeanUtils.copyBean(getById(id), MwContractVO.class); + if (Objects.nonNull(mwContractVO)) { + List<MwAttachment> list = mwAttachmentService.lambdaQuery().eq(MwAttachment::getType, AttachmentTypeEnum.CONTRACT.getCode()).eq(MwAttachment::getTargetId, id).list(); + mwContractVO.setAttachmentList(BeanUtils.copyToList(list, MwAttachmentVO.class)); + } + return mwContractVO; + } + + /** + * 新增合同 + * + * @param dto + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void add(MwContractDTO dto) { + MwContract mwContract = BeanUtils.copyBean(dto, MwContract.class); + try { + save(mwContract); + } catch (DuplicateKeyException e) { + throw new ServiceException("合同编号重复"); + } + + if (CollUtils.isNotEmpty(dto.getAttachmentList())) { + List<MwAttachment> mwAttachments = BeanUtils.copyToList(dto.getAttachmentList(), MwAttachment.class); + mwAttachments.forEach(attachment -> { + attachment.setTargetId(mwContract.getId()); + attachment.setType(AttachmentTypeEnum.CONTRACT.getCode()); + }); + mwAttachmentService.saveBatch(mwAttachments); + } + } + + /** + * 编辑合同 + * + * @param dto + * @return + */ + @Override + public void edit(MwContractDTO dto) { + if (Objects.isNull(dto.getId())) { + throw new ServiceException("合同id不能为空"); + } + MwContract mwContract = BeanUtils.copyBean(dto, MwContract.class); + + try { + updateById(mwContract); + } catch (DuplicateKeyException e) { + throw new ServiceException("合同编号重复"); + } + if (CollUtils.isNotEmpty(dto.getAttachmentList())) { + //删除原来的附件 + mwAttachmentService.lambdaUpdate().eq(MwAttachment::getType, AttachmentTypeEnum.CONTRACT.getCode()).eq(MwAttachment::getTargetId, dto.getId()).remove(); + List<MwAttachment> mwAttachments = BeanUtils.copyToList(dto.getAttachmentList(), MwAttachment.class); + mwAttachments.forEach(attachment -> { + attachment.setTargetId(mwContract.getId()); + attachment.setType(AttachmentTypeEnum.CONTRACT.getCode()); + }); + mwAttachmentService.saveBatch(mwAttachments); + } + } + + /** + * 删除 + * + * @param id + * @return + */ + @Override + public void delete(Long id) { + //删除附件 + mwAttachmentService.lambdaUpdate().eq(MwAttachment::getType, AttachmentTypeEnum.CONTRACT.getCode()).eq(MwAttachment::getTargetId, id).remove(); + //执行删除 + removeById(id); + } + + /** + * 查询未过期合同列表 + * + * @param date + * @return + */ + @Override + public List<MwContractVO> queryListTerminationDateBeforeNow(Date date) { + return baseMapper.queryListTerminationDateBeforeNow(date); + } } -- Gitblit v1.7.1