From 368d926041f342ed097e7f692927d9ae484f2a60 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 七月 2023 14:08:17 +0800
Subject: [PATCH] 新增SubjectTypeName
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 10 ++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 8 ++++++++
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index b266873..40f426c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -741,7 +741,7 @@
List<Double> sqljList = new ArrayList<>();
List<Double> ksljList = new ArrayList<>();
List<Double> shljList = new ArrayList<>();
- Map<String, Optional<ServiceFunddetailAssort>> result = fd.stream().collect(Collectors.groupingBy(ServiceFunddetail::getApplytypename, Collectors.mapping(obj -> new ServiceFunddetailAssort(obj.getAmount(), obj.getTaxamount(), obj.getTaxedamount()), Collectors.reducing(ServiceFunddetailAssort::add))));
+ Map<String, Optional<ServiceFunddetailAssort>> result = fd.stream().collect(Collectors.groupingBy(ServiceFunddetail::getSubjectTypeName, Collectors.mapping(obj -> new ServiceFunddetailAssort(obj.getAmount(), obj.getTaxamount(), obj.getTaxedamount()), Collectors.reducing(ServiceFunddetailAssort::add))));
result.forEach((FWFL, serviceFunddetailAssort) -> {
Map<String, Object> map1 = new HashMap<String, Object>();
map1.put("FWFL", FWFL);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 0910510..ca58ef8 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -230,6 +230,14 @@
@Excel(name = "浜嬬敱澶囨敞")
private String remark;
+ /** 浜嬬敱澶囨敞 */
+ @ApiModelProperty("绉戠洰绫诲瀷锛氭垚鏈敹鍏�")
+ private String SubjectType;
+
+ /** 浜嬬敱澶囨敞 */
+ @ApiModelProperty("绉戠洰绫诲瀷鍚嶇О")
+ private String SubjectTypeName;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 559137a..9bdecac 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -54,6 +54,8 @@
<result property="servicetypename" column="SERVICETYPENAME"/>
<result property="orderno" column="OrderNo"/>
<result property="itemcode" column="ItemCode"/>
+ <result property="SubjectType" column="subjecttype"/>
+ <result property="SubjectTypeName" column="subjecttypename"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -105,7 +107,9 @@
SERVICESSCOPE,
SERVICESSCOPENAME,
SERVICETYPE,
- SERVICETYPENAME
+ SERVICETYPENAME,
+ subjecttype,
+ subjecttypename
from service_funddetail
</sql>
@@ -218,7 +222,9 @@
a.SERVICESSCOPE,
a.SERVICESSCOPENAME,
a.SERVICETYPE,
- a.SERVICETYPENAME
+ a.SERVICETYPENAME,
+ a.subjecttype,
+ a.subjecttypename
from service_funddetail a,
service_fund b
where a.del_flag = '0'
--
Gitblit v1.9.3