From c8707150e15be1425a096e40d44f043e9ecce5a2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 八月 2023 12:51:09 +0800
Subject: [PATCH] 修改上传文件名，医学成本的文件展示
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java | 342 +++++++++++++++++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 47 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 4
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 188 ++++++++++++----
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java | 28 -
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 14 +
10 files changed, 541 insertions(+), 97 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 30173ff..19f6304 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
@@ -168,10 +168,6 @@
// return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
// }
- @GetMapping("/getFundDetail/{id}")
- public AjaxResult getFundDetail(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceFundService.getFundDetail(id));
- }
/**
* 瀵煎嚭璐圭敤鐢宠涓诲垪琛�
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index e002b32..3f90a36 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -156,4 +156,10 @@
public AjaxResult getTaxBeforeByAfterMoney(@RequestBody TaxMoneyVO taxMoneyVo) {
return AjaxResult.success(serviceFunddetailService.getTaxBeforeByAfterMoney(taxMoneyVo));
}
+
+
+ @GetMapping("/getFundDetail/{id}")
+ public AjaxResult getFundDetail(@PathVariable("id") Long id) {
+ return AjaxResult.success(serviceFunddetailService.getFundDetail(id));
+ }
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index eb12806..6c90e57 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -123,7 +123,9 @@
{
String fileName = file.getOriginalFilename();
String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+// fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+ //涔嬪墠鐨勮�佷唬鐮佸皢鏂囦欢鍚嶆敼鎴愪簡uuid,瀹㈡埛鍙嶅簲涓嶅ソ锛岀幇鏀瑰洖鍘熸枃浠跺悕
+ fileName = DateUtils.datePath() + "/" + fileName;
return fileName;
}
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 6a01bd0..c663897 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
@@ -2,6 +2,8 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,211 +15,292 @@
/**
* 璐圭敤鐢宠鏄庣粏瀵硅薄 service_funddetail
- *
+ *
* @author ruoyi
* @date 2022-01-25
*/
@Data
@ApiModel("璐圭敤鐢宠鏄庣粏")
-public class ServiceFunddetail extends BaseEntity
-{
+public class ServiceFunddetail extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 涓婚敭ID */
+ /**
+ * 涓婚敭ID
+ */
@ApiModelProperty("涓婚敭ID")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 璧勯噾鐢宠涓昏〃ID */
+ /**
+ * 璧勯噾鐢宠涓昏〃ID
+ */
@ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
@Excel(name = "璧勯噾鐢宠涓昏〃ID")
private Long fundid;
- /** 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹� */
+ /**
+ * 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�
+ */
@ApiModelProperty("鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
@Excel(name = "鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
private String beneficiaryname;
- /** 鏀剁泭浜虹紪鍙� */
+ /**
+ * 鏀剁泭浜虹紪鍙�
+ */
@ApiModelProperty("鏀剁泭浜虹紪鍙�")
@Excel(name = "鏀剁泭浜虹紪鍙�")
private String beneficiaryno;
- /** 宸ヤ綔鍗曚綅 */
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
private String unitname;
- /** 宸ヤ綔鍗曚綅缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
private String unitno;
- /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
- /** 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle */
+ /**
+ * 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle
+ */
@ApiModelProperty("鑱岀О")
@Excel(name = "鑱岀О")
private String title;
- /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+ /**
+ * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+ */
@ApiModelProperty("璇佷欢绫诲瀷")
@Excel(name = "璇佷欢绫诲瀷")
private Long idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鎬у埆 鏍规嵁瀛楀吀sys_user_sex */
+ /**
+ * 鎬у埆 鏍规嵁瀛楀吀sys_user_sex
+ */
@ApiModelProperty("鎬у埆")
@Excel(name = "鎬у埆")
private String sex;
- /** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
+ /**
+ * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯�")
@Excel(name = "涓庢崘璧犺�呭叧绯�")
private String familyrelations;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
- /** 寮�鎴烽摱琛� */
+ /**
+ * 寮�鎴烽摱琛�
+ */
@ApiModelProperty("寮�鎴烽摱琛�")
@Excel(name = "寮�鎴烽摱琛�")
private String depositbank;
- /** 鍗″彿 */
+ /**
+ * 鍗″彿
+ */
@ApiModelProperty("鍗″彿")
@Excel(name = "鍗″彿")
private String bankcardno;
- /** 鏀鍚嶇О */
+ /**
+ * 鏀鍚嶇О
+ */
@ApiModelProperty("鏀鍚嶇О")
@Excel(name = "鏀鍚嶇О")
private String branchbankname;
- /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("閾惰鍗＄収鐗囪矾寰�")
@Excel(name = "閾惰鍗＄収鐗囪矾寰�")
private String annexbankcard;
- /** 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("鐧昏琛ㄧ収鐗囪矾寰�")
@Excel(name = "鐧昏琛ㄧ収鐗囪矾寰�")
private String annexregistform;
- /** 璧勯噾绫诲埆 */
+ /**
+ * 璧勯噾绫诲埆
+ */
@ApiModelProperty("璧勯噾绫诲埆")
@Excel(name = "璧勯噾绫诲埆")
private String applytype;
- /** 璧勯噾绫诲埆鍚嶇О */
+ /**
+ * 璧勯噾绫诲埆鍚嶇О
+ */
@ApiModelProperty("璧勯噾绫诲埆鍚嶇О")
@Excel(name = "璧勯噾绫诲埆鍚嶇О")
private String applytypename;
- /** 椤圭洰ID */
+ /**
+ * 椤圭洰ID
+ */
@ApiModelProperty("椤圭洰ID")
@Excel(name = "椤圭洰ID")
private Long itemid;
- /** 椤圭洰鍚嶇О */
+ /**
+ * 椤圭洰鍚嶇О
+ */
@ApiModelProperty("椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О")
private String itemname;
- /** 椤圭洰绫诲埆 */
+ /**
+ * 椤圭洰绫诲埆
+ */
@ApiModelProperty("椤圭洰绫诲埆")
@Excel(name = "椤圭洰绫诲埆")
private String itemtype;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦(绋庡墠閲戦)")
@Excel(name = "鐢宠閲戦")
private Double amount;
- /** 棰勬敮閲戦 */
+ /**
+ * 棰勬敮閲戦
+ */
@ApiModelProperty("棰勬敮閲戦")
@Excel(name = "棰勬敮閲戦")
private Double prepaidamount;
- /** 鎵ｇ◣閲戦 */
+ /**
+ * 鎵ｇ◣閲戦
+ */
@ApiModelProperty("鎵ｇ◣閲戦")
@Excel(name = "鎵ｇ◣閲戦")
private Double taxamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 绋庡悗閲戦 */
+ /**
+ * 绋庡悗閲戦
+ */
@ApiModelProperty("绋庡悗閲戦")
@Excel(name = "绋庡悗閲戦")
private Double taxedamount;
- /** 闄勪欢寮犳暟 */
+ /**
+ * 闄勪欢寮犳暟
+ */
@ApiModelProperty("闄勪欢寮犳暟")
@Excel(name = "闄勪欢寮犳暟")
private Long attachcount;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private String recordstatus;
- /** 涓婁紶鏍囧織 */
+ /**
+ * 涓婁紶鏍囧織
+ */
@ApiModelProperty("涓婁紶鏍囧織")
@Excel(name = "涓婁紶鏍囧織")
private String uploadflag;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@ApiModelProperty("涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date uploadtime;
- /** 鏁伴噺 */
+ /**
+ * 鏁伴噺
+ */
@ApiModelProperty("鏁伴噺")
private Double quantity;
- /** 浠锋牸 */
+ /**
+ * 浠锋牸
+ */
@ApiModelProperty("浠锋牸")
private Double price;
- /** 鎹愮尞浜轰俊鎭痠d */
+ /**
+ * 鎹愮尞浜轰俊鎭痠d
+ */
@ApiModelProperty("鎹愮尞浜轰俊鎭痠d")
private Long infoid;
- /** 鎹愮尞浜虹紪鍙� */
+ /**
+ * 鎹愮尞浜虹紪鍙�
+ */
@ApiModelProperty("鎹愮尞浜虹紪鍙�")
private String donorno;
- /** 鎹愮尞浜哄鍚� */
+ /**
+ * 鎹愮尞浜哄鍚�
+ */
@ApiModelProperty("鎹愮尞浜哄鍚�")
private String donorname;
- /** 鏈嶅姟鑼冨洿 */
+ /**
+ * 鏈嶅姟鑼冨洿
+ */
@ApiModelProperty("鏈嶅姟鑼冨洿")
private String servicesscope;
- /** 鏈嶅姟鑼冨洿鍚嶇О */
+ /**
+ * 鏈嶅姟鑼冨洿鍚嶇О
+ */
@ApiModelProperty("鏈嶅姟鑼冨洿鍚嶇О")
private String servicesscopename;
- /** 鏈嶅姟瀵硅薄 */
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
@ApiModelProperty("鏈嶅姟瀵硅薄")
private String servicetype;
- /** 鏈嶅姟瀵硅薄鍚嶇О */
+ /**
+ * 鏈嶅姟瀵硅薄鍚嶇О
+ */
@ApiModelProperty("鏈嶅姟瀵硅薄鍚嶇О")
private String servicetypename;
@@ -225,21 +308,28 @@
private Integer orderno;
- /** 浜嬬敱澶囨敞 */
+ /**
+ * 浜嬬敱澶囨敞
+ */
@ApiModelProperty("浜嬬敱澶囨敞")
@Excel(name = "浜嬬敱澶囨敞")
private String remark;
- /** 浜嬬敱澶囨敞 */
+ /**
+ * 浜嬬敱澶囨敞
+ */
@ApiModelProperty("绉戠洰绫诲瀷锛氭垚鏈敹鍏�")
private String subjecttype;
- /** 浜嬬敱澶囨敞 */
+ /**
+ * 浜嬬敱澶囨敞
+ */
@ApiModelProperty("绉戠洰绫诲瀷鍚嶇О")
private String subjecttypename;
-
- /** 闄勪欢鏂囦欢鍦板潃 */
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
@ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
private String annexfiles;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
new file mode 100644
index 0000000..13e752c
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
@@ -0,0 +1,342 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐圭敤鐢宠鏄庣粏瀵硅薄 service_funddetail
+ *
+ * @author ruoyi
+ * @date 2022-01-25
+ */
+@Data
+@ApiModel("璐圭敤鐢宠鏄庣粏")
+public class ServiceFunddetailVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭ID
+ */
+ @ApiModelProperty("涓婚敭ID")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璧勯噾鐢宠涓昏〃ID
+ */
+ @ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
+ @Excel(name = "璧勯噾鐢宠涓昏〃ID")
+ private Long fundid;
+
+ /**
+ * 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�
+ */
+ @ApiModelProperty("鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
+ @Excel(name = "鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
+ private String beneficiaryname;
+
+ /**
+ * 鏀剁泭浜虹紪鍙�
+ */
+ @ApiModelProperty("鏀剁泭浜虹紪鍙�")
+ @Excel(name = "鏀剁泭浜虹紪鍙�")
+ private String beneficiaryno;
+
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
+ @ApiModelProperty("宸ヤ綔鍗曚綅")
+ @Excel(name = "宸ヤ綔鍗曚綅")
+ private String unitname;
+
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
+ @ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
+ @Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
+ private String unitno;
+
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
+ @ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
+ @Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
+ private String unituserno;
+
+ /**
+ * 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle
+ */
+ @ApiModelProperty("鑱岀О")
+ @Excel(name = "鑱岀О")
+ private String title;
+
+ /**
+ * 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType
+ */
+ @ApiModelProperty("璇佷欢绫诲瀷")
+ @Excel(name = "璇佷欢绫诲瀷")
+ private Long idcardtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鎬у埆 鏍规嵁瀛楀吀sys_user_sex
+ */
+ @ApiModelProperty("鎬у埆")
+ @Excel(name = "鎬у埆")
+ private String sex;
+
+ /**
+ * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+ */
+ @ApiModelProperty("涓庢崘璧犺�呭叧绯�")
+ @Excel(name = "涓庢崘璧犺�呭叧绯�")
+ private String familyrelations;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /**
+ * 寮�鎴烽摱琛�
+ */
+ @ApiModelProperty("寮�鎴烽摱琛�")
+ @Excel(name = "寮�鎴烽摱琛�")
+ private String depositbank;
+
+ /**
+ * 鍗″彿
+ */
+ @ApiModelProperty("鍗″彿")
+ @Excel(name = "鍗″彿")
+ private String bankcardno;
+
+ /**
+ * 鏀鍚嶇О
+ */
+ @ApiModelProperty("鏀鍚嶇О")
+ @Excel(name = "鏀鍚嶇О")
+ private String branchbankname;
+
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
+ @ApiModelProperty("閾惰鍗＄収鐗囪矾寰�")
+ @Excel(name = "閾惰鍗＄収鐗囪矾寰�")
+ private String annexbankcard;
+
+ /**
+ * 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
+ @ApiModelProperty("鐧昏琛ㄧ収鐗囪矾寰�")
+ @Excel(name = "鐧昏琛ㄧ収鐗囪矾寰�")
+ private String annexregistform;
+
+ /**
+ * 璧勯噾绫诲埆
+ */
+ @ApiModelProperty("璧勯噾绫诲埆")
+ @Excel(name = "璧勯噾绫诲埆")
+ private String applytype;
+
+ /**
+ * 璧勯噾绫诲埆鍚嶇О
+ */
+ @ApiModelProperty("璧勯噾绫诲埆鍚嶇О")
+ @Excel(name = "璧勯噾绫诲埆鍚嶇О")
+ private String applytypename;
+
+ /**
+ * 椤圭洰ID
+ */
+ @ApiModelProperty("椤圭洰ID")
+ @Excel(name = "椤圭洰ID")
+ private Long itemid;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String itemname;
+
+ /**
+ * 椤圭洰绫诲埆
+ */
+ @ApiModelProperty("椤圭洰绫诲埆")
+ @Excel(name = "椤圭洰绫诲埆")
+ private String itemtype;
+
+ /**
+ * 鐢宠閲戦
+ */
+ @ApiModelProperty("鐢宠閲戦(绋庡墠閲戦)")
+ @Excel(name = "鐢宠閲戦")
+ private Double amount;
+
+ /**
+ * 棰勬敮閲戦
+ */
+ @ApiModelProperty("棰勬敮閲戦")
+ @Excel(name = "棰勬敮閲戦")
+ private Double prepaidamount;
+
+ /**
+ * 鎵ｇ◣閲戦
+ */
+ @ApiModelProperty("鎵ｇ◣閲戦")
+ @Excel(name = "鎵ｇ◣閲戦")
+ private Double taxamount;
+
+ /**
+ * 鍙戠エ寮犳暟
+ */
+ @ApiModelProperty("鍙戠エ寮犳暟")
+ @Excel(name = "鍙戠エ寮犳暟")
+ private Long invoicecount;
+
+ /**
+ * 绋庡悗閲戦
+ */
+ @ApiModelProperty("绋庡悗閲戦")
+ @Excel(name = "绋庡悗閲戦")
+ private Double taxedamount;
+
+ /**
+ * 闄勪欢寮犳暟
+ */
+ @ApiModelProperty("闄勪欢寮犳暟")
+ @Excel(name = "闄勪欢寮犳暟")
+ private Long attachcount;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstatus;
+
+ /**
+ * 涓婁紶鏍囧織
+ */
+ @ApiModelProperty("涓婁紶鏍囧織")
+ @Excel(name = "涓婁紶鏍囧織")
+ private String uploadflag;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @ApiModelProperty("涓婁紶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date uploadtime;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty("鏁伴噺")
+ private Double quantity;
+
+ /**
+ * 浠锋牸
+ */
+ @ApiModelProperty("浠锋牸")
+ private Double price;
+
+ /**
+ * 鎹愮尞浜轰俊鎭痠d
+ */
+ @ApiModelProperty("鎹愮尞浜轰俊鎭痠d")
+ private Long infoid;
+
+ /**
+ * 鎹愮尞浜虹紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞浜虹紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎹愮尞浜哄鍚�
+ */
+ @ApiModelProperty("鎹愮尞浜哄鍚�")
+ private String donorname;
+
+ /**
+ * 鏈嶅姟鑼冨洿
+ */
+ @ApiModelProperty("鏈嶅姟鑼冨洿")
+ private String servicesscope;
+
+ /**
+ * 鏈嶅姟鑼冨洿鍚嶇О
+ */
+ @ApiModelProperty("鏈嶅姟鑼冨洿鍚嶇О")
+ private String servicesscopename;
+
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @ApiModelProperty("鏈嶅姟瀵硅薄")
+ private String servicetype;
+
+ /**
+ * 鏈嶅姟瀵硅薄鍚嶇О
+ */
+ @ApiModelProperty("鏈嶅姟瀵硅薄鍚嶇О")
+ private String servicetypename;
+
+ private String itemcode;
+
+ private Integer orderno;
+
+ /**
+ * 浜嬬敱澶囨敞
+ */
+ @ApiModelProperty("浜嬬敱澶囨敞")
+ @Excel(name = "浜嬬敱澶囨敞")
+ private String remark;
+
+ /**
+ * 浜嬬敱澶囨敞
+ */
+ @ApiModelProperty("绉戠洰绫诲瀷锛氭垚鏈敹鍏�")
+ private String subjecttype;
+
+ /**
+ * 浜嬬敱澶囨敞
+ */
+ @ApiModelProperty("绉戠洰绫诲瀷鍚嶇О")
+ private String subjecttypename;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃闆嗗悎锛堢敤浜庢帴鏀跺墠绔紶鏉ョ殑鍦板潃锛�
+ */
+ @ApiModelProperty("闄勪欢鏂囦欢鍦板潃闆嗗悎")
+ private List annexfilesList;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ @ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
+ private String annexfiles;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java
index 9ade521..93642ea 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java
@@ -1,26 +1,12 @@
package com.ruoyi.project.domain.vo;
-import java.util.Date;
import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFunddetail;
-import com.ruoyi.project.domain.ServiceFundflow;
+import com.ruoyi.project.domain.ServiceFunddetailVO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
-import com.ruoyi.common.core.domain.BaseEntity;
/**
* 璐圭敤姹囨�诲疄浣撶被
@@ -29,13 +15,13 @@
*/
@Data
@ApiModel("璐圭敤姹囨�诲疄浣撶被")
-public class ServiceFundVO extends ServiceFund
-{
- /** 璐圭敤鏄庣粏 */
- private List<ServiceFunddetail> serviceFunddetails;
+public class ServiceFundVO extends ServiceFund {
+ /**
+ * 璐圭敤鏄庣粏
+ */
+ private List<ServiceFunddetailVO> serviceFunddetails;
- public List<ServiceFunddetail> getServiceFunddetails()
- {
+ public List<ServiceFunddetailVO> getServiceFunddetails() {
return serviceFunddetails;
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index ea57e34..322fa54 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -41,7 +41,7 @@
List<ServiceFund> selectServiceFundList(ServiceFund serviceFund);
- List<ServiceFunddetail> getFundDetail(Long id);
+
List<FundVO> selectVOList(FundVO fundVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
index 6c94f86..fba73b6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
+import com.ruoyi.project.domain.ServiceFunddetailVO;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.domain.vo.TaxedMoneyVO;
import org.springframework.web.bind.annotation.PathVariable;
@@ -57,4 +58,6 @@
List<ServiceFunddetail> selectServiceFunddetailList(ServiceFunddetail serviceFunddetail);
int deleteDetail(Long id);
+
+ List<ServiceFunddetailVO> getFundDetail(Long id);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 27aaf49..e12aa54 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -29,6 +29,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.service.IServiceFundService;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
/**
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
@@ -159,11 +160,6 @@
@Override
public List<ServiceFund> selectServiceFundList(ServiceFund serviceFund) {
return serviceFundMapper.selectServiceFundList(serviceFund);
- }
-
- @Override
- public List<ServiceFunddetail> getFundDetail(Long id) {
- return serviceFunddetailMapper.selectFundDetailListById(id);
}
@Override
@@ -680,43 +676,52 @@
updateById(serviceFundVO);
id = serviceFundVO.getId();
}
- List<ServiceFunddetail> serviceFunddetails = serviceFundVO.getServiceFunddetails();
-
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
+ }
// 鐢ㄤ簬璁板綍绋庡墠銆佺◣鍚庣殑鎬诲拰
double taxBefore = 0.0;
double taxAfter = 0.0;
- for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
- serviceFunddetail.setFundid(id);
- if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getAmount() != null && serviceFunddetail.getTaxedamount() != 0.0 && serviceFunddetail.getAmount() != 0.0) {
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+ //灏囬檮浠惰浆鎴恓son
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
+ serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
+ }
+ if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getTaxedamount() != 0.0 && serviceFunddetailVO.getAmount() != 0.0) {
// 绋庡墠绋庡悗閮戒笉涓虹┖
- if (serviceFunddetail.getId() == null) {
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
continue;
- } else if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getTaxedamount() != 0.0) {
+ } else if (serviceFunddetailVO.getTaxedamount() != null && serviceFunddetailVO.getTaxedamount() != 0.0) {
// 绋庡悗姹傜◣鍓�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())));
+ Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetailVO.getTaxedamount())));
// 绋庨噾
String taxation = TaxtUtils.getTaxation(BigDecimal.valueOf(taxationBefore));
- serviceFunddetail.setAmount(Double.valueOf(taxationBefore));
- serviceFunddetail.setTaxamount(Double.parseDouble(taxation));
+ serviceFunddetailVO.setAmount(Double.valueOf(taxationBefore));
+ serviceFunddetailVO.setTaxamount(Double.parseDouble(taxation));
}
- } else if (serviceFunddetail.getAmount() != null && serviceFunddetail.getAmount() != 0.0) {
+ } else if (serviceFunddetailVO.getAmount() != null && serviceFunddetailVO.getAmount() != 0.0) {
// 绋庡墠姹傜◣鍚�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetail.getAmount())));
- BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(BigDecimal.valueOf(tax));
- serviceFunddetail.setTaxamount(tax);
- serviceFunddetail.setTaxedamount(taxAfterMoney.doubleValue());
+ double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetailVO.getAmount())));
+ BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetailVO.getAmount()).subtract(BigDecimal.valueOf(tax));
+ serviceFunddetailVO.setTaxamount(tax);
+ serviceFunddetailVO.setTaxedamount(taxAfterMoney.doubleValue());
}
}
//鏍规嵁id鍒ゆ柇鏄柊澧炶繕鏄慨鏀�
- if (serviceFunddetail.getId() == null) {
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
serviceFunddetailService.updateById(serviceFunddetail);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index afcc2ca..698d830 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -6,8 +6,10 @@
import java.util.Date;
import java.util.List;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.domain.vo.TaxedMoneyVO;
@@ -216,5 +218,17 @@
return serviceFunddetailMapper.deleteById(id);
}
+ @Override
+ public List<ServiceFunddetailVO> getFundDetail(Long id) {
+ List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectFundDetailListById(id);
+ List<ServiceFunddetailVO> serviceFunddetailVOS = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailVO.class);
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetailVOS) {
+ if (!StringUtils.isEmpty(serviceFunddetailVO.getAnnexfiles())) {
+ List<RbDetailFile> rbDetailFiles = JSONArray.parseArray(serviceFunddetailVO.getAnnexfiles(), RbDetailFile.class);
+ serviceFunddetailVO.setAnnexfilesList(rbDetailFiles);
+ }
+ }
+ return serviceFunddetailVOS;
+ }
}
--
Gitblit v1.9.3