From 2e3c39a06979b065df0e0c3c8559154de1cc46c1 Mon Sep 17 00:00:00 2001
From: purple7433 <743367900@qq.com>
Date: Tue, 29 Aug 2023 12:59:35 +0800
Subject: [PATCH] update
---
.../api/IInvoiceSettingNewController.java | 6 +++++-
.../claimAudit/ClaimAuditQueryService.java | 2 ++
.../ClaimAuditQueryServiceImpl.java | 8 ++++++++
.../InvoiceSettingNewController.java | 19 +++++++++++++++++++
4 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java
index f834ccda..b84e7169 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/api/IInvoiceSettingNewController.java
@@ -22,7 +22,11 @@ public interface IInvoiceSettingNewController {
@PostMapping(path = "pc/v1/listModelName")
Result<ModelOut> listModelName();
- @ApiOperation("鏍规嵁妯″瀷鍚嶇О鑾峰彇灞炴€ч泦鍚�")
+ @ApiOperation("鏍规嵁妯″瀷鍚嶇О鑾峰彇绁ㄦ嵁灞炴€ч泦鍚�")
@PostMapping(path = "pc/v1/listModelPropertyByModelName")
Result<ModelPropertyOut> listModelPropertyByModelName(@RequestBody ModelQry qry);
+
+ @ApiOperation("鑾峰彇绁ㄦ嵁灞炴€ч泦鍚�")
+ @PostMapping(path = "pc/v1/listModelProperty")
+ Result<ModelPropertyOut> listModelProperty();
}
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/query/claimAudit/ClaimAuditQueryService.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/query/claimAudit/ClaimAuditQueryService.java
index 107bda2a..b15da2e6 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/query/claimAudit/ClaimAuditQueryService.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/query/claimAudit/ClaimAuditQueryService.java
@@ -16,6 +16,8 @@ public interface ClaimAuditQueryService {
List<BillTypePropertyOut> listBillTypePropertyByBillType(BillTypePropertyQry qry);
+ List<BillTypePropertyOut> listBillTypeProperty();
+
JSONObject invoiceVerify(@Valid HeHeInvoiceQry heHeInvoiceQry);
VerifyOut queryStatisticByParam(HeHeInvoiceQry qry);
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
index 7dc1faf7..8c897614 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/claimAudit/ClaimAuditQueryServiceImpl.java
@@ -96,6 +96,14 @@ public class ClaimAuditQueryServiceImpl implements ClaimAuditQueryService {
return MapperUtils.INSTANCE.mapAsList(BillTypePropertyOut.class, invoicePropertySettingPos);
}
+ @Override
+ public List<BillTypePropertyOut> listBillTypeProperty() {
+ QueryWrapper<InvoicePropertySettingPo> wrapper = new QueryWrapper<>();
+ wrapper.orderByAsc("sort");
+ List<InvoicePropertySettingPo> invoicePropertySettingPos = invoicePropertySettingMapper.selectList(wrapper);
+ return MapperUtils.INSTANCE.mapAsList(BillTypePropertyOut.class, invoicePropertySettingPos);
+ }
+
@Override
public JSONObject invoiceVerify(HeHeInvoiceQry heHeInvoiceQry) {
//鏍￠獙璇ョエ绉嶆槸鍚﹀彲浠ラ獙鐪�
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java
index c305d0f8..a7025cd4 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/interfaces/controller/InvoiceSettingNewController.java
@@ -63,4 +63,23 @@ public class InvoiceSettingNewController implements IInvoiceSettingNewController
}
return ok(ResponseCode.SUCCESS, modelPropertyOutList);
}
+
+ @Override
+ public Result<ModelPropertyOut> listModelProperty() {
+ List<BillTypePropertyOut> billTypePropertyOutList = qryService.listBillTypeProperty();
+ List<ModelPropertyOut> modelPropertyOutList = new ArrayList<>();
+ if (!ObjectUtil.isEmpty(billTypePropertyOutList)) {
+ for (BillTypePropertyOut billTypePropertyOut : billTypePropertyOutList) {
+ if (billTypePropertyOut.getPropertyCode().startsWith("$")) {
+ continue;
+ }
+ ModelPropertyOut modelPropertyOut = new ModelPropertyOut();
+ modelPropertyOut.setPropertyCode(billTypePropertyOut.getPropertyCode());
+ modelPropertyOut.setPropertyName(billTypePropertyOut.getPropertyName());
+ modelPropertyOut.setPropertyType(billTypePropertyOut.getPropertyType());
+ modelPropertyOutList.add(modelPropertyOut);
+ }
+ }
+ return ok(ResponseCode.SUCCESS, modelPropertyOutList);
+ }
}
--
GitLab