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 30db6b658270ba74e8cd72fa710026a2668027dd..8cd135609bbf123f22715fdad14545b0d09158ed 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/application/command/assembler/IncomeAssembler.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/IncomeAssembler.java index a5230baa629b5c447ae3b7dcfc6b2744092cb9df..c9cdaa042e27f2e7bcfc811e695d86670eb58de8 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,8 +15,8 @@ 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(), + 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); 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 41a7ede7bf6d6b778b5766d97ee12cd4da71b138..ae36c409bb5d12d0432517589b7e2ad0e7ae0961 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, 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 39cfe37d9861cd3b65a4e20f1a38dc53e6ce4cd7..73206f4f679b54c7a9f5c7cc88f12e57dc0da54c 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 b9a31cb8a2a2909bc4f20df866b2b67f888722d7..f665784d4d5957b2da73f52808099830d94daf9c 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();