From a745f996610a62ebc02fc254ff7a615ff2428bb3 Mon Sep 17 00:00:00 2001
From: jiangxiaoming <7548901@qq.com>
Date: Wed, 4 Sep 2024 13:53:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=8F=AA=E6=9C=89?=
=?UTF-8?q?=E4=B8=80=E6=9D=A1=E6=88=96=E6=94=B9=E4=B8=94=20=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../query/dto/out/AllocationRuleOut.java | 2 ++
.../reader/IncomeTypeQueryServiceImpl.java | 1 +
.../service/IncomeTypeServiceImpl.java | 13 ++++++++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/AllocationRuleOut.java b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/AllocationRuleOut.java
index 30db6b65..8cd13560 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/AllocationRuleOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/AllocationRuleOut.java
@@ -24,4 +24,6 @@ public class AllocationRuleOut {
private String relationship;
@ApiModelProperty(value = "绛涢€夊€�")
private String filterValue;
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer index;
}
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/IncomeTypeQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/IncomeTypeQueryServiceImpl.java
index 39cfe37d..73206f4f 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/IncomeTypeQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/IncomeTypeQueryServiceImpl.java
@@ -83,6 +83,7 @@ public class IncomeTypeQueryServiceImpl implements IncomeTypeQueryService {
allocationRuleOut.setFilterAttr(jsonObject.getString("filterAttr"));
allocationRuleOut.setRelationship(jsonObject.getString("relationship"));
allocationRuleOut.setFilterValue(jsonObject.getString("filterValue"));
+ allocationRuleOut.setIndex(jsonObject.getInteger("index"));
list.add(allocationRuleOut);
}
return list;
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/service/IncomeTypeServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/service/IncomeTypeServiceImpl.java
index b9a31cb8..f665784d 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/service/IncomeTypeServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/service/IncomeTypeServiceImpl.java
@@ -10,6 +10,7 @@ import com.seasky.ledgerincome.application.command.dto.AllocationRuleSaveCmd;
import com.seasky.ledgerincome.application.command.dto.AuthCmd;
import com.seasky.ledgerincome.design.*;
import com.seasky.ledgerincome.domain.aggregate.income.IncomeRepository;
+import com.seasky.ledgerincome.domain.enums.RelationshipEnum;
import com.seasky.ledgerincome.infrastructure.mapper.api.IncomeMapper;
import com.seasky.ledgerincome.infrastructure.mapper.api.IncomeTypeMapper;
import com.seasky.ledgerincome.infrastructure.po.IncomePo;
@@ -81,7 +82,17 @@ public class IncomeTypeServiceImpl extends AbstractService<IncomePo, IncomeMappe
validationStrategies.put("filterAttr", new FilterAttrValidationStrategy());
validationStrategies.put("operator", new OperatorValidationStrategy());
validationStrategies.put("filterValue", new FilterValueValidationStrategy());
- for (Map<String, String> map:list) {
+ for (int i=0;i<list.size();i++) {
+ //琛ュ伩搴忓彿
+ Map<String, String> map = list.get(i);
+ if(map.get("index")==null){
+ map.put("index",(i+1)+"");
+ }
+ //绗竴鏉℃垨鏀规垚涓�
+ if(i==0 && RelationshipEnum.鎴�.getValue().equals(map.get("relationship"))){
+ map.put("relationship", RelationshipEnum.涓�.getValue());
+ }
+
for (Map.Entry<String, String> entry : map.entrySet()) {
String key = entry.getKey();
String entryValue = entry.getValue();
--
GitLab
From 7ef11b669819757d53d0d0edcc9e65865e0f36bc Mon Sep 17 00:00:00 2001
From: jiangxiaoming <7548901@qq.com>
Date: Wed, 4 Sep 2024 14:09:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=9E=E5=8D=95=E5=AF=BC=E5=85=A5banknam?=
=?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../application/command/assembler/IncomeAssembler.java | 2 +-
.../com/seasky/ledgerincome/infrastructure/po/IncomePo.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java
index a5230baa..7090e0c1 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java
@@ -16,7 +16,7 @@ public class IncomeAssembler {
public static IncomePo toPo(ReceiptBillCmd vo, String incomeType) {
Snowflake snowflake = IdUtil.getSnowflake(1, 1);
long id = snowflake.nextId(); //
- IncomePo incomePo = new IncomePo(vo.getBillNo(), vo.getTrDate(), vo.getCrBankName(), vo.getDbAccName(),
+ IncomePo incomePo = new IncomePo(vo.getBillNo(), vo.getBankName(),vo.getTrDate(), vo.getCrBankName(), vo.getDbAccName(),
vo.getCrAccNo(), vo.getAmount(), vo.getPostscript(), vo.getAbstractStr(), vo.getDbAccNo(), vo.getCrAccName(), incomeType);
incomePo.setId(id);
incomePo.setIncomeSpeed(IncomeSpeedEnum.棰勫垎閰�.getValue());
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomePo.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomePo.java
index 41a7ede7..ae36c409 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomePo.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomePo.java
@@ -41,7 +41,7 @@ public class IncomePo extends BasePo {
private String wrongVoucherNo;
private Date wrongVoucherDate;
public String repairProject;
- public IncomePo(String billNo, Date trDate, String crBankName, String crAccName,String crAccNo, BigDecimal amount, String postscript, String abstractStr, String dbAccNo, String dbAccName, String incomeType) {
+ public IncomePo(String billNo,String bankName, Date trDate, String crBankName, String crAccName,String crAccNo, BigDecimal amount, String postscript, String abstractStr, String dbAccNo, String dbAccName, String incomeType) {
this.billNo = billNo;
this.incomeDate = trDate;
this.bankName = crBankName;
@@ -53,6 +53,7 @@ public class IncomePo extends BasePo {
this.paymentAccount = dbAccNo;
this.incomeName = dbAccName;
this.preIncomeType = incomeType;
+ this.bankName = bankName;
}
public IncomePo(Long id,String billNo, String bankName, Date incomeDate, BigDecimal incomeAmount,
--
GitLab
From 7a6c7f9a9f73d415df47d8eeeb2a41c7b5244d51 Mon Sep 17 00:00:00 2001
From: jiangxiaoming <7548901@qq.com>
Date: Wed, 4 Sep 2024 14:22:09 +0800
Subject: [PATCH 3/3] 3
---
.../application/command/assembler/IncomeAssembler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java
index 7090e0c1..c9cdaa04 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java
@@ -15,7 +15,7 @@ public class IncomeAssembler {
//鍥炲崟瀵煎叆浣跨敤
public static IncomePo toPo(ReceiptBillCmd vo, String incomeType) {
Snowflake snowflake = IdUtil.getSnowflake(1, 1);
- long id = snowflake.nextId(); //
+ long id = snowflake.nextId();
IncomePo incomePo = new IncomePo(vo.getBillNo(), vo.getBankName(),vo.getTrDate(), vo.getCrBankName(), vo.getDbAccName(),
vo.getCrAccNo(), vo.getAmount(), vo.getPostscript(), vo.getAbstractStr(), vo.getDbAccNo(), vo.getCrAccName(), incomeType);
incomePo.setId(id);
--
GitLab