diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java index a8861eec..12385d38 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/controller/XzdSpykpSpdjController.java @@ -1,26 +1,27 @@ package org.dromara.xzd.spykp.spdj.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.xzd.spykp.spdj.domain.vo.XzdSpykpSpdjVo; -import org.dromara.xzd.spykp.spdj.domain.bo.XzdSpykpSpdjBo; -import org.dromara.xzd.spykp.spdj.service.IXzdSpykpSpdjService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.xzd.spykp.spdj.domain.bo.XzdSpykpSpdjBo; +import org.dromara.xzd.spykp.spdj.domain.vo.XzdSpykpSpdjVo; +import org.dromara.xzd.spykp.spdj.service.IXzdSpykpSpdjService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 收票登记 @@ -31,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/spdj/spdj") +@RequestMapping("/xzd/spdj/spdj") public class XzdSpykpSpdjController extends BaseController { private final IXzdSpykpSpdjService xzdSpykpSpdjService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java index 8b6fbbba..c9d7bb53 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/XzdSpykpSpdj.java @@ -252,5 +252,9 @@ public class XzdSpykpSpdj extends BaseEntity { */ private Long contractId; + /** + * 审核状态 + */ + private String shzt; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java index 33bb71f1..6917d2a6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/bo/XzdSpykpSpdjBo.java @@ -250,5 +250,8 @@ public class XzdSpykpSpdjBo extends BaseEntity { */ private Long contractId; - + /** + * 审核状态 + */ + private String shzt; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java index b104645f..b6d3f6cd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/domain/vo/XzdSpykpSpdjVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; import java.io.Serial; @@ -190,6 +192,7 @@ public class XzdSpykpSpdjVo implements Serializable { /** * 销方(客户)名称 */ + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "xfId") private String xfmc; /** @@ -323,4 +326,8 @@ public class XzdSpykpSpdjVo implements Serializable { */ private String contractName; + /** + * 审核状态 + */ + private String shzt; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java index 69e407ea..e342089c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java @@ -1,15 +1,18 @@ package org.dromara.xzd.spykp.spdj.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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 com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.event.ProcessDeleteEvent; +import org.dromara.common.core.domain.event.ProcessEvent; +import org.dromara.common.core.domain.event.ProcessTaskEvent; +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.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.impl.SysDeptServiceImpl; @@ -17,22 +20,23 @@ import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.xzd.domain.XzdContractDetails; import org.dromara.xzd.domain.XzdProject; -import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.service.IXzdCorrespondentList; import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl; import org.dromara.xzd.service.impl.XzdProjectServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; import org.dromara.xzd.spykp.spdj.domain.bo.XzdSpykpSpdjBo; import org.dromara.xzd.spykp.spdj.domain.vo.XzdSpykpSpdjVo; -import org.dromara.xzd.spykp.spdj.domain.XzdSpykpSpdj; import org.dromara.xzd.spykp.spdj.mapper.XzdSpykpSpdjMapper; import org.dromara.xzd.spykp.spdj.service.IXzdSpykpSpdjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; +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业务层处理 @@ -42,6 +46,7 @@ import java.util.Collection; */ @RequiredArgsConstructor @Service +@Slf4j public class XzdSpykpSpdjServiceImpl extends ServiceImpl implements IXzdSpykpSpdjService { private final XzdSpykpSpdjMapper baseMapper; @@ -173,44 +178,44 @@ public class XzdSpykpSpdjServiceImpl extends ServiceImpl oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); - for (Long l : oldFileId) { - if (!nowFileId.contains(l)) { - sysOssService.deleteWithValidByIds(List.of(l), false); - } - } - } - }else { - if (old.getFileId()!= null && !old.getFileId().isEmpty()){ - List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - sysOssService.deleteWithValidByIds(deleteIds, false); - } - } - //发票图片 - if (bo.getFptp() != null){ - if (!bo.getFptp().equals(old.getFptp())){ - sysOssService.deleteWithValidByIds(List.of(old.getFptp()), false); - } - }else { - if (old.getFptp()!= null){ - sysOssService.deleteWithValidByIds(List.of(old.getFptp()), false); - } - } - //证明信息文件 - if (bo.getZmxxwj() != null){ - if (!bo.getZmxxwj().equals(old.getZmxxwj())){ - sysOssService.deleteWithValidByIds(List.of(old.getZmxxwj()), false); - } - }else { - if (old.getZmxxwj()!= null){ - sysOssService.deleteWithValidByIds(List.of(old.getZmxxwj()), false); - } - } +// if (bo.getFileId() != null && !bo.getFileId().isEmpty()){ +// if (old.getFileId() != null && !old.getFileId().isEmpty()) { +// List oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); +// for (Long l : oldFileId) { +// if (!nowFileId.contains(l)) { +// sysOssService.deleteWithValidByIds(List.of(l), false); +// } +// } +// } +// }else { +// if (old.getFileId()!= null && !old.getFileId().isEmpty()){ +// List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// sysOssService.deleteWithValidByIds(deleteIds, false); +// } +// } +// //发票图片 +// if (bo.getFptp() != null){ +// if (!bo.getFptp().equals(old.getFptp())){ +// sysOssService.deleteWithValidByIds(List.of(old.getFptp()), false); +// } +// }else { +// if (old.getFptp()!= null){ +// sysOssService.deleteWithValidByIds(List.of(old.getFptp()), false); +// } +// } +// //证明信息文件 +// if (bo.getZmxxwj() != null){ +// if (!bo.getZmxxwj().equals(old.getZmxxwj())){ +// sysOssService.deleteWithValidByIds(List.of(old.getZmxxwj()), false); +// } +// }else { +// if (old.getZmxxwj()!= null){ +// sysOssService.deleteWithValidByIds(List.of(old.getZmxxwj()), false); +// } +// } return baseMapper.updateById(update) > 0; } @@ -269,14 +274,14 @@ public class XzdSpykpSpdjServiceImpl extends ServiceImpl byid2 = iXzdCorrespondentList.getCustomerByid(vo.getXfId()); - if (byid2 != null) { - if (byid2.getData().getXzdCustomerinformation() != null) { - vo.setXfmc(byid2.getData().getXzdCustomerinformation().getUnitName()); - } - } - } +// if (vo.getXfId() != null){ +// R byid2 = iXzdCorrespondentList.getCustomerByid(vo.getXfId()); +// if (byid2 != null) { +// if (byid2.getData().getXzdCustomerinformation() != null) { +// vo.setXfmc(byid2.getData().getXzdCustomerinformation().getUnitName()); +// } +// } +// } //经办人 if (vo.getJbrId() != null){ SysUserVo sysUserVo = sysUserService.selectUserById(vo.getJbrId()); @@ -308,4 +313,51 @@ public class XzdSpykpSpdjServiceImpl extends ServiceImpl