|
@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-import lombok.Data;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
-import org.apache.pdfbox.pdmodel.PDDocument;
|
|
|
import org.springblade.common.utils.SnowFlakeUtil;
|
|
|
import org.springblade.control.dto.EMInvoiceInfoDTO;
|
|
|
import org.springblade.control.entity.*;
|
|
@@ -18,16 +16,9 @@ import org.springblade.control.vo.EMInvoiceInfoVO;
|
|
|
import org.springblade.core.log.exception.ServiceException;
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
-import org.springblade.core.oss.model.BladeFile;
|
|
|
import org.springblade.core.secure.utils.SecureUtil;
|
|
|
import org.springblade.core.tool.utils.BeanUtil;
|
|
|
-import org.springblade.core.tool.utils.FileUtil;
|
|
|
import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
-import org.springblade.resource.builder.oss.OssBuilder;
|
|
|
-import org.springblade.resource.entity.Attach;
|
|
|
-import org.springblade.resource.feign.CommonFileClient;
|
|
|
-import org.springblade.resource.service.IAttachService;
|
|
|
-import org.springblade.resource.vo.NewBladeFile;
|
|
|
import org.springblade.system.user.entity.User;
|
|
|
import org.springblade.system.user.feign.IUserClient;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -36,7 +27,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
-import java.io.ByteArrayInputStream;
|
|
|
import java.io.IOException;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
@@ -48,9 +38,9 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<EMInvoiceMapper, EMInv
|
|
|
|
|
|
private final IUserClient iUserClient;
|
|
|
private final JdbcTemplate jdbcTemplate;
|
|
|
- private final OssBuilder ossBuilder;
|
|
|
+ /*private final OssBuilder ossBuilder;
|
|
|
private final CommonFileClient commonFileClient;
|
|
|
- private final IAttachService attachService;
|
|
|
+ private final IAttachService attachService;*/
|
|
|
private final TaskProcessServiceImpl taskProcessService;
|
|
|
|
|
|
@Override
|
|
@@ -205,7 +195,7 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<EMInvoiceMapper, EMInv
|
|
|
EMInvoiceInfo obj = baseMapper.selectById(id);
|
|
|
if (obj != null && obj.getStatus().equals(2)) { //已通过(已审批)
|
|
|
//上传原图
|
|
|
- ByteArrayInputStream inputStream = new ByteArrayInputStream(file.getBytes());
|
|
|
+ /*ByteArrayInputStream inputStream = new ByteArrayInputStream(file.getBytes());
|
|
|
BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), inputStream);
|
|
|
|
|
|
//处理PDF文件
|
|
@@ -248,7 +238,7 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<EMInvoiceMapper, EMInv
|
|
|
//修改pdf路径
|
|
|
this.update(Wrappers.<EMInvoiceInfo>lambdaUpdate().set(EMInvoiceInfo::getInvoicePdfUrl, newBladeFile.getPdfUrl()).eq(EMInvoiceInfo::getId, id));
|
|
|
return true;
|
|
|
- }
|
|
|
+ }*/
|
|
|
} else {
|
|
|
throw new ServiceException("当前发票记录信息不是已审批通过状态,无法上传!");
|
|
|
}
|