From b127ff30bb5128e42bc4e7c0c65b3b264ea8766d Mon Sep 17 00:00:00 2001
From: jiangxiaoming <7548901@qq.com>
Date: Thu, 5 Sep 2024 11:09:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=85=A5=E8=B4=A6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ledgerincome/infrastructure/po/EntryRulePo.java  |  2 +-
 .../repository/convert/EntryBillConvert.java         |  3 ++-
 .../com/seasky/ledgerincome/utils/VoucherUtil.java   | 12 ++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/EntryRulePo.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/EntryRulePo.java
index b1457b64..e8183950 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/EntryRulePo.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/EntryRulePo.java
@@ -30,7 +30,7 @@ public class EntryRulePo extends BasePo {
     //棰濆害
     private String controlCode;
     //琛ュ厖涓氬姟绫诲瀷
-    private Integer buinsessType;
+    private String buinsessType;
     //鍊熻捶鏂瑰悜 鍊� 1 璐�-1
     private Integer deorcr;
     //绉戠洰
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/EntryBillConvert.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/EntryBillConvert.java
index dc1d69af..7a9fbc60 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/EntryBillConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/EntryBillConvert.java
@@ -75,7 +75,8 @@ public class EntryBillConvert {
             List<String> stringList = invoiceIdList.stream().map(x -> String.valueOf(x)).collect(Collectors.toList());
             flowPo.setInvoiceId(String.join(",",stringList));
         }
-        flowPo.setInvoiceType(entity.getInvoiceType().getValue());
+        //鏆傚瓨鍙兘娌℃湁寮€绁ㄧ被鍨�
+        flowPo.setInvoiceType(entity.getInvoiceType()==null?"":entity.getInvoiceType().getValue());
         flowPo.setIncomeId(entity.getIncomeId());
         return flowPo;
     }
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java
index fc93a84c..b89bf51d 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java
@@ -61,8 +61,16 @@ public class VoucherUtil {
            String projectTypeName = incomeAggregate.getReceiptBillVo().getProjectTypeName();
            Long incomeId = incomeAggregate.getIncomeId();
            QueryWrapper<EntryRulePo> queryWrapper = new QueryWrapper<>();
-           queryWrapper.eq("income_type",incomeTypeName);
-           queryWrapper.eq("project_type",projectTypeName);
+           if(incomeTypeName == null){
+               queryWrapper.eq("income_type","Z-寰呰棰�");
+           }else{
+               queryWrapper.eq("income_type",incomeTypeName);
+           }
+           if(projectTypeName == null){
+               queryWrapper.eq("project_type","寰呰棰�");
+           }else{
+               queryWrapper.eq("project_type",projectTypeName);
+           }
            queryWrapper.eq("invoicing",isInvoicing);
            queryWrapper.eq("available", Available.YES);
            List<EntryRulePo> entryRulePos = entryRuleMapper.selectList(queryWrapper);
-- 
GitLab


From f6b70b971c347bcf45ba9a6d84552fec324bbdf6 Mon Sep 17 00:00:00 2001
From: jiangxiaoming <7548901@qq.com>
Date: Thu, 5 Sep 2024 12:13:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/EntryCommandServiceImpl.java      | 40 +++++++++----------
 .../domain/enums/VoucherStateApplyEnum.java   |  6 +--
 .../repository/convert/VoucherConvert.java    |  7 ++--
 3 files changed, 27 insertions(+), 26 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 95bf6f0c..a5a724e0 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
@@ -25,10 +25,7 @@ import com.seasky.ledgerincome.domain.aggregate.invoice.InvoiceRepository;
 import com.seasky.ledgerincome.domain.aggregate.voucher.VchDetailEntity;
 import com.seasky.ledgerincome.domain.aggregate.voucher.VoucherAggregate;
 import com.seasky.ledgerincome.domain.aggregate.voucher.VoucherRepository;
-import com.seasky.ledgerincome.domain.enums.EntryTypeEnum;
-import com.seasky.ledgerincome.domain.enums.IncomeSpeedEnum;
-import com.seasky.ledgerincome.domain.enums.InvoiceTypeEnum;
-import com.seasky.ledgerincome.domain.enums.VoucherStateEnum;
+import com.seasky.ledgerincome.domain.enums.*;
 import com.seasky.ledgerincome.interfaces.controller.BaseControllerImpl;
 import com.seasky.ledgerincome.utils.FileUtil;
 import com.seasky.ledgerincome.utils.VoucherUtil;
@@ -80,7 +77,7 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
             throw ExceptionUtil.getException(null,"闈炲緟璁ら鐨勫洖鍗曚笉鍏佽鏆傚瓨鍏ヨ处");
         }
         // 2 鍏ヨ处瑙勫垯鐢熸垚鍑瘉
-        VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateEnum.宸插叆璐�.getValue());
+        VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateApplyEnum.鐢宠涓�.getValue());
         Long voucherId = voucherRepository.save(voucherAggregate);
 
         //3 鍏ヨ处淇濆瓨
@@ -98,6 +95,8 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
                 ,flowEntityList
         );
         entryBillRepository.save(entryBillAggregate);
+        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.鍏ヨ处.getValue());
+        incomeRepository.save(incomeAggregate);
        //pdf
         String ttfPath = getTTFPath();
         try {
@@ -112,8 +111,8 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
         Long incomeId = cmd.getIncomeId();
         // 1鏌ヨ鍥炲崟
         IncomeAggregate incomeAggregate = incomeRepository.findById(incomeId);
-        if(!incomeAggregate.getReceiptBillVo().getIncomeSpeed().equals(IncomeSpeedEnum.寰呰棰�.getValue())){
-            throw ExceptionUtil.getException(null,"闈炲緟璁ら鐨勫洖鍗曚笉鍏佽鏆傚瓨鍏ヨ处");
+        if(!incomeAggregate.getReceiptBillVo().getIncomeSpeed().equals(IncomeSpeedEnum.鍏ヨ处.getValue())){
+            throw ExceptionUtil.getException(null,"闈炲叆璐︾殑鍥炲崟涓嶅厑璁告殏瀛樿浆鏀跺叆");
         }
         // 2 鍏ヨ处瑙勫垯鐢熸垚鍑瘉 鏈夊嚟璇佸彿鍜屽嚟璇乮d 灏辩洿鎺ユ煡
         Long voucherId = null;
@@ -126,11 +125,11 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
             JSONArray array = json.getJSONArray("voucherDetails");
             List<VchDetailEntity> vchDetailList = VchDetailAssembler.jsonArrayToEntity(array);
             VoucherAggregate voucherAggregate = new VoucherAggregate(incomeId, null, cmd.getVoucherDate(),
-                    cmd.getVoucherCode(), null, VoucherStateEnum.宸插叆璐�.getValue(), vchDetailList);
+                    cmd.getVoucherCode(), null, VoucherStateApplyEnum.鐢宠涓�.getValue(), vchDetailList);
             voucherId = voucherRepository.save(voucherAggregate);
         }else{
             //鍏ヨ处鐢熸垚鍑瘉
-            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateEnum.宸插叆璐�.getValue());
+            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateApplyEnum.鐢宠涓�.getValue());
             voucherId = voucherRepository.save(voucherAggregate);
         }
         //3 鍏ヨ处淇濆瓨
@@ -172,7 +171,7 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
         aggergate.setInvoiceState("鏄�");
         Long invoiceId = invoiceRepository.save(aggergate);
         //2 璐﹁鍒� 鐢熸垚鍑瘉
-        VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鏄�", VoucherStateEnum.宸插叆璐�.getValue());
+        VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鏄�", VoucherStateApplyEnum.鐢宠涓�.getValue());
         Long voucherId = voucherRepository.save(voucherAggregate);
 
         //3 淇濆瓨鍏ヨ处
@@ -246,11 +245,11 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
             JSONArray array = json.getJSONArray("voucherDetails");
             List<VchDetailEntity> vchDetailList = VchDetailAssembler.jsonArrayToEntity(array);
             VoucherAggregate voucherAggregate = new VoucherAggregate(incomeId, null, cmd.getVoucherDate(),
-                    cmd.getVoucherCode(), null, VoucherStateEnum.宸插叆璐�.getValue(), vchDetailList);
+                    cmd.getVoucherCode(), null, VoucherStateApplyEnum.鐢宠涓�.getValue(), vchDetailList);
             voucherId = voucherRepository.save(voucherAggregate);
         }else{
             //2 璐﹁鍒� 鐢熸垚鍑瘉
-            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateEnum.宸插叆璐�.getValue());
+            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateApplyEnum.鐢宠涓�.getValue());
             voucherId = voucherRepository.save(voucherAggregate);
         }
         //3 淇濆瓨鍏ヨ处
@@ -301,10 +300,10 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
             JSONArray array = json.getJSONArray("voucherDetails");
             List<VchDetailEntity> vchDetailList = VchDetailAssembler.jsonArrayToEntity(array);
             VoucherAggregate voucherAggregate = new VoucherAggregate(incomeId, null, cmd.getVoucherDate(),
-                    cmd.getVoucherCode(), null, VoucherStateEnum.宸插叆璐�.getValue(), vchDetailList);
+                    cmd.getVoucherCode(), null, VoucherStateApplyEnum.鐢宠涓�.getValue(), vchDetailList);
              voucherId = voucherRepository.save(voucherAggregate);
         }else{
-            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateEnum.宸插叆璐�.getValue());
+            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateApplyEnum.鐢宠涓�.getValue());
             voucherId = voucherRepository.save(voucherAggregate);
         }
         flowEntityList.add(new EntryBillFlowEntity(null,null,new Date(),
@@ -320,7 +319,7 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
         );
         entryBillRepository.save(entryBillAggregate);
         // 鏇存柊鍥炲崟杩涘害
-        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.瀹屾垚.getValue());
+        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.鍏ヨ处.getValue());
         incomeRepository.save(incomeAggregate);
         //PDF
         String ttfPath = getTTFPath();
@@ -353,11 +352,11 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
             JSONArray array = json.getJSONArray("voucherDetails");
             List<VchDetailEntity> vchDetailList = VchDetailAssembler.jsonArrayToEntity(array);
             VoucherAggregate voucherAggregate = new VoucherAggregate(incomeId, null, cmd.getVoucherDate(),
-                    cmd.getVoucherCode(), null, VoucherStateEnum.宸插叆璐�.getValue(), vchDetailList);
+                    cmd.getVoucherCode(), null, VoucherStateApplyEnum.鐢宠涓�.getValue(), vchDetailList);
             voucherId = voucherRepository.save(voucherAggregate);
         }else{
             //鍏ヨ处鐢熸垚鍑瘉
-            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateEnum.宸插叆璐�.getValue());
+            VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateApplyEnum.鐢宠涓�.getValue());
             voucherId = voucherRepository.save(voucherAggregate);
         }
 
@@ -381,7 +380,7 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
         invoiceRepository.removeListByInvoiceIds(invoiceIds);
 
         //6 鏇存柊鍥炲崟杩涘害
-        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.瀹屾垚.getValue());
+        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.鍏ヨ处.getValue());
         incomeRepository.save(incomeAggregate);
         //PDF
         String ttfPath = getTTFPath();
@@ -398,9 +397,10 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
         IncomeAggregate incomeAggregate = incomeRepository.findById(cmd.getIncomeId());
         //1.淇濆瓨鍙戠エ
         InvoiceAggergate aggergate = InvoiceAssembler.toSuppInvoiceAggergate(cmd);
+        aggergate.setInvoiceType(InvoiceTypeEnum.鍚屾寮€绁�.getValue());
         Long invoiceId = invoiceRepository.save(aggergate);
         //2 鍏ヨ处瑙勫垯 鐢熸垚鍑瘉
-        VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鏄�", VoucherStateEnum.宸插叆璐�.getValue());
+        VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鏄�", VoucherStateApplyEnum.鐢宠涓�.getValue());
         Long voucherId = voucherRepository.save(voucherAggregate);
         //3 淇濆瓨鍏ヨ处
         //鍏堝幓鏌gg
@@ -420,7 +420,7 @@ public class EntryCommandServiceImpl extends BaseControllerImpl implements Entry
         );
         entryBillRepository.save(entryBillAggregate);
         // 鏇存柊鍥炲崟杩涘害
-        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.瀹屾垚.getValue());
+        incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.鍏ヨ处.getValue());
         incomeRepository.save(incomeAggregate);
 
         //PDF
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/VoucherStateApplyEnum.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/VoucherStateApplyEnum.java
index 1e74964a..3dd9bcc3 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/VoucherStateApplyEnum.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/domain/enums/VoucherStateApplyEnum.java
@@ -4,10 +4,10 @@ import com.alibaba.excel.util.StringUtils;
 
 public enum VoucherStateApplyEnum {
 
-    鏈璐�("寰呭鐞�","1"),
-    鏆傚瓨("鐢宠涓�","2"),
+    寰呭鐞�("寰呭鐞�","1"),
+    鐢宠涓�("鐢宠涓�","2"),
     宸插叆璐�("宸插叆璐�","3"),
-    棰勫紑绁�("椹冲洖","3");
+    椹冲洖("椹冲洖","3");
     private final String value;
     private final String code;
     VoucherStateApplyEnum(String value,
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/VoucherConvert.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/VoucherConvert.java
index 3b8d8a9b..2dd42027 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/VoucherConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/convert/VoucherConvert.java
@@ -30,9 +30,10 @@ public class VoucherConvert {
      }
 
      public static VoucherPo voucherAggregateToPo(VoucherAggregate aggregate){
-
-          return new VoucherPo(aggregate.getIncomeId(),aggregate.getVoucherState(),
-                  aggregate.getVoucherDate(),aggregate.getVoucherCode(),aggregate.getRejectReason());
+          VoucherPo voucherPo = new VoucherPo(aggregate.getIncomeId(), aggregate.getVoucherState(),
+                  aggregate.getVoucherDate(), aggregate.getVoucherCode(), aggregate.getRejectReason());
+          voucherPo.setId(aggregate.getVoucherId());
+          return voucherPo;
      }
 
      public static VoucherDetailPo entityDetailToDetailPo(VchDetailEntity entity){
-- 
GitLab