From 0fc5598a2110ebea3f8958eb4d47dd8239f8db45 Mon Sep 17 00:00:00 2001
From: jiangxiaoming <jiangxiaoming@seaskysh.com>
Date: Mon, 13 Jan 2025 15:34:09 +0800
Subject: [PATCH 1/2] 12
---
.../command/EntryCommandServiceImpl.java | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
index 185035ec..e062c2d9 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
@@ -1222,32 +1222,32 @@ public class EntryCommandServiceImpl implements EntryCommandService {
}
return false;
});
- if(collect==null ||collect.size()==0){
- //閲嶆柊鐢熸垚鍏ヨ处鐢宠鍗�
- IncomeAggregate incomeAggregate = incomeRepository.findById(incomeId);
- String userName = userInfoUtil.getLoginInfoOut().getUserName();
- QueryWrapper<EntryBillFlowPo> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("income_id",incomeId);
- queryWrapper.last("order by create_date desc limit 1");
- EntryBillFlowPo flowPo = entryBillFlowMapper.selectOne(queryWrapper);
- if(flowPo!=null){
- String entryType = flowPo.getEntryType();
- try{
- String smallTile = "鏀跺叆鍏ヨ处";
- if(entryType.equals(EntryTypeEnum.鍒版杞殏瀛�.getValue())){
- smallTile ="鏆傚瓨鍏ヨ处";
- }
- if(entryType.contains("琛ュ紑绁ㄥ叆璐�")){
- smallTile ="琛ュ紑绁ㄥ叆璐�";
- }
- Long batId = flowPo.getBatchId();
- fileTypeArr = FileUtil.downloadVoucherPDFNotSave(smallTile, userName, Arrays.asList(incomeAggregate),batId,pdfResource);
- }catch (Exception e){
- e.printStackTrace();
+ }
+ if(collect==null ||collect.size()==0){
+ //閲嶆柊鐢熸垚鍏ヨ处鐢宠鍗�
+ IncomeAggregate incomeAggregate = incomeRepository.findById(incomeId);
+ String userName = userInfoUtil.getLoginInfoOut().getUserName();
+ QueryWrapper<EntryBillFlowPo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("income_id",incomeId);
+ queryWrapper.last("order by create_date desc limit 1");
+ EntryBillFlowPo flowPo = entryBillFlowMapper.selectOne(queryWrapper);
+ if(flowPo!=null){
+ String entryType = flowPo.getEntryType();
+ try{
+ String smallTile = "鏀跺叆鍏ヨ处";
+ if(entryType.equals(EntryTypeEnum.鍒版杞殏瀛�.getValue())){
+ smallTile ="鏆傚瓨鍏ヨ处";
}
+ if(entryType.contains("琛ュ紑绁ㄥ叆璐�")){
+ smallTile ="琛ュ紑绁ㄥ叆璐�";
+ }
+ Long batId = flowPo.getBatchId();
+ fileTypeArr = FileUtil.downloadVoucherPDFNotSave(smallTile, userName, Arrays.asList(incomeAggregate),batId,pdfResource);
+ }catch (Exception e){
+ e.printStackTrace();
}
-
}
+
}
}
if(fileOutList == null || fileOutList.isEmpty()){
--
GitLab
From d4bf47a075b2dd4014a452fd7b2aa483d79fc851 Mon Sep 17 00:00:00 2001
From: jiangxiaoming <jiangxiaoming@seaskysh.com>
Date: Fri, 17 Jan 2025 09:40:50 +0800
Subject: [PATCH 2/2] 111
---
.../command/EntryCommandServiceImpl.java | 15 +++------------
.../command/InvoiceCommandServieceImpl.java | 3 +--
.../ledgerincome/domain/enums/FileTypeEmun.java | 2 +-
3 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
index e062c2d9..91cd8881 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
@@ -7,36 +7,28 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
import com.itextpdf.text.pdf.PdfWriter;
import com.seasky.core.common.Error;
import com.seasky.core.common.ResponseCode;
-import com.seasky.core.ddd.utils.MapperUtils;
import com.seasky.core.exception.DataBusinessException;
import com.seasky.core.util.ExceptionUtil;
import com.seasky.ledgerincome.application.command.api.EntryCommandService;
import com.seasky.ledgerincome.application.command.api.FileCommandService;
-import com.seasky.ledgerincome.application.command.assembler.InvoiceAssembler;
import com.seasky.ledgerincome.application.command.assembler.VchDetailAssembler;
import com.seasky.ledgerincome.application.command.dto.CompleteIncomeCmd;
import com.seasky.ledgerincome.application.command.dto.EntryTempCmd;
-import com.seasky.ledgerincome.application.command.dto.PreInvoiceDetailCmd;
import com.seasky.ledgerincome.application.command.dto.SuppInvoiceCmd;
import com.seasky.ledgerincome.application.query.api.FileQueryService;
import com.seasky.ledgerincome.application.query.api.IncomeInvoiceQueryService;
import com.seasky.ledgerincome.application.query.api.IncomeQueryService;
import com.seasky.ledgerincome.application.query.dto.FileQry;
import com.seasky.ledgerincome.application.query.dto.out.FileOut;
-import com.seasky.ledgerincome.application.query.dto.out.IncomeOut;
import com.seasky.ledgerincome.application.query.dto.out.UserInfoOut;
-import com.seasky.ledgerincome.application.query.dto.out.VoucherOut;
import com.seasky.ledgerincome.domain.aggregate.entrybill.EntryBillAggregate;
import com.seasky.ledgerincome.domain.aggregate.entrybill.EntryBillFlowEntity;
import com.seasky.ledgerincome.domain.aggregate.entrybill.EntryBillRepository;
import com.seasky.ledgerincome.domain.aggregate.income.IncomeAggregate;
import com.seasky.ledgerincome.domain.aggregate.income.IncomeRepository;
-import com.seasky.ledgerincome.domain.aggregate.invoice.InvoiceAggergate;
-import com.seasky.ledgerincome.domain.aggregate.invoice.InvoiceDetailEntity;
import com.seasky.ledgerincome.domain.aggregate.invoice.InvoiceRepository;
import com.seasky.ledgerincome.domain.aggregate.voucher.VchDetailEntity;
import com.seasky.ledgerincome.domain.aggregate.voucher.VoucherAggregate;
@@ -44,7 +36,6 @@ import com.seasky.ledgerincome.domain.aggregate.voucher.VoucherRepository;
import com.seasky.ledgerincome.domain.enums.*;
import com.seasky.ledgerincome.infrastructure.mapper.api.EntryBillFlowMapper;
import com.seasky.ledgerincome.infrastructure.po.EntryBillFlowPo;
-import com.seasky.ledgerincome.infrastructure.po.VoucherPo;
import com.seasky.ledgerincome.to.VoucherTo;
import com.seasky.ledgerincome.utils.*;
import lombok.extern.slf4j.Slf4j;
@@ -52,7 +43,6 @@ import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -1186,7 +1176,7 @@ public class EntryCommandServiceImpl implements EntryCommandService {
FileQry fileQry = new FileQry();
fileQry.setIncomeId(incomeIds);
fileQry.setFileType(Arrays.asList(FileTypeEmun.鍏ヨ处鐢宠鍗�.getValue(),
- FileTypeEmun.鏀舵鍥炲崟.getValue(),FileTypeEmun.澧炲€肩◣鏅€氬彂绁�.getValue(),FileTypeEmun.澧炲€肩◣鍙戠エ.getValue()));
+ FileTypeEmun.鏀舵鍥炲崟.getValue(),FileTypeEmun.澧炲€肩◣鏅€氬彂绁�.getValue(),FileTypeEmun.澧炲€肩◣涓撶敤鍙戠エ.getValue()));
List<FileOut> fileOutList = fileQueryService.getFileListAndImage(fileQry);
if(incomeIds.size()==1 && fileOutList!=null && fileOutList.size() >0){// 鍘婚噸鍏ヨ处鐢宠鍗曞彧鐣欎竴涓�
fileOutList = fileOutList.stream()
@@ -1533,8 +1523,9 @@ public class EntryCommandServiceImpl implements EntryCommandService {
Long finalEntryFlowId = batchId;
map.keySet().forEach(batId->{
IncomeAggregate incomeAggregate = map.get(batId);
+ String incomeTypeName = incomeAggregate.getReceiptBillVo().getIncomeTypeName();
VoucherTo to = new VoucherTo(
- batId+"",userName, "",
+ batId+"",userName, incomeTypeName,
userName,
incomeAggregate.getPaymentAccount().getAccountName(),
incomeAggregate.getReceiptBillVo().getBillNo());
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/InvoiceCommandServieceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/InvoiceCommandServieceImpl.java
index 6f37832c..ae0e75ce 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/InvoiceCommandServieceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/InvoiceCommandServieceImpl.java
@@ -2,7 +2,6 @@ package com.seasky.ledgerincome.application.command;
import cn.hutool.core.util.IdUtil;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.itextpdf.text.DocumentException;
import com.seasky.core.common.Error;
@@ -413,7 +412,7 @@ public class InvoiceCommandServieceImpl extends BaseCommandAbstractService<Invoi
fileSaveFileInfoCmd.setFileBusiness(fileBusinessCmd);
//**淇濆瓨鏂囦欢
String fileType = BillTypeEnum.澧炲€肩◣涓撶敤鍙戠エ.toString().equals(invoice.getBillType()) ?
- FileTypeEmun.澧炲€肩◣鍙戠エ.getCode() : FileTypeEmun.澧炲€肩◣鏅€氬彂绁�.getCode();
+ FileTypeEmun.澧炲€肩◣涓撶敤鍙戠エ.getCode() : FileTypeEmun.澧炲€肩◣鏅€氬彂绁�.getCode();
FileContentCmd fileContentCmd = new FileContentCmd();
fileContentCmd.setFileStream(bytes);
fileContentCmd.setFileName("鍙戠エ_"+invoice.getInvoiceId().toString() + ".pdf");
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/FileTypeEmun.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/FileTypeEmun.java
index c06d4f3b..a31939a4 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/FileTypeEmun.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/FileTypeEmun.java
@@ -1,7 +1,7 @@
package com.seasky.ledgerincome.domain.enums;
public enum FileTypeEmun {
- 澧炲€肩◣鍙戠エ("澧炲€肩◣鍙戠エ","澧炲€肩◣鍙戠エ"),
+ 澧炲€肩◣涓撶敤鍙戠エ("澧炲€肩◣涓撶敤鍙戠エ","澧炲€肩◣涓撶敤鍙戠エ"),
澧炲€肩◣鏅€氬彂绁�("澧炲€肩◣鏅€氬彂绁�","澧炲€肩◣鏅€氬彂绁�"),
鍏ヨ处鐢宠鍗�("鍏ヨ处鐢宠鍗�","鍏ヨ处鐢宠鍗�"),
鏀舵鍥炲崟("鏀舵鍥炲崟","鏀舵鍥炲崟"),
--
GitLab