From bdb5b994b566f50dd0acac4b02fc697c656fc94e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 21 九月 2023 17:30:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 14
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 14 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 201 +++++++++++++++++++------
ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml | 6
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 6
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 181 +++++++++++++++++-----
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 4
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java | 3
14 files changed, 347 insertions(+), 113 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 8ceede6..87f9310 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -221,13 +221,13 @@
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {
-
- boolean b = serviceReimbursementService.save(serviceReimbursement);
-// if (b) {
-// addReiSharedDatd(serviceReimbursement, 1);
-// }
- Long id = serviceReimbursement.getId();
- return AjaxResult.success(id);
+ if (!Objects.isNull(serviceReimbursement)) {
+ serviceReimbursement.setCheckstatus(serviceReimbursement.getCheckstatus() == null ? 1 : serviceReimbursement.getCheckstatus());
+ boolean b = serviceReimbursementService.save(serviceReimbursement);
+ Long id = serviceReimbursement.getId();
+ return AjaxResult.success(id);
+ }
+ return error();
}
// public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index a712532..c60dcd8 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,200 +14,275 @@
/**
* 璐圭敤鐢宠涓诲璞� service_fund
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
@Data
@ApiModel("璐圭敤鐢宠涓�")
-public class ServiceFund extends BaseEntity
-{
+public class ServiceFund extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鐢宠浜虹紪鍙� */
+ /**
+ * 鐢宠浜虹紪鍙�
+ */
@ApiModelProperty("鐢宠浜虹紪鍙�")
@Excel(name = "鐢宠浜虹紪鍙�")
private String userno;
- /** 鐢宠浜哄鍚� */
+ /**
+ * 鐢宠浜哄鍚�
+ */
@ApiModelProperty("鐢宠浜哄鍚�")
@Excel(name = "鐢宠浜哄鍚�")
private String username;
- /** 宸ヤ綔鍗曚綅 */
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
private String unitname;
- /** 宸ヤ綔鍗曚綅缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
private String unitno;
- /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
- /** 瀹跺睘鑱旂郴鐢佃瘽 */
+ /**
+ * 瀹跺睘鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("瀹跺睘鑱旂郴鐢佃瘽")
@Excel(name = "瀹跺睘鑱旂郴鐢佃瘽")
private String phone;
- /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexbankcard;
- /** 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexregistform;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
private Double amountrequested;
- /** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
+ /**
+ * 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType
+ */
@ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
@Excel(name = "璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
private String applytype;
- /** 棰勬敮璐圭敤 */
+ /**
+ * 棰勬敮璐圭敤
+ */
@ApiModelProperty("棰勬敮璐圭敤")
@Excel(name = "棰勬敮璐圭敤")
private Double prepaidamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 闄勪欢鏁� */
+ /**
+ * 闄勪欢鏁�
+ */
@ApiModelProperty("闄勪欢鏁�")
@Excel(name = "闄勪欢鏁�")
private Long attachcount;
- /** 閮ㄩ棬涓荤宸ュ彿 */
+ /**
+ * 閮ㄩ棬涓荤宸ュ彿
+ */
@ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
@Excel(name = "閮ㄩ棬涓荤宸ュ彿")
private String managerno;
- /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ /**
+ * 閮ㄩ棬涓荤鍚嶅瓧
+ */
@ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
@Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
private String managername;
- /** 閮ㄩ棬缂栧彿 */
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿")
private String deptmentno;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptmentname;
- /** 涓績绛惧瓧 */
+ /**
+ * 涓績绛惧瓧
+ */
@ApiModelProperty("涓績绛惧瓧")
@Excel(name = "涓績绛惧瓧")
private String opochecker;
- /** 闄㈤暱绛惧瓧 */
+ /**
+ * 闄㈤暱绛惧瓧
+ */
@ApiModelProperty("闄㈤暱绛惧瓧")
@Excel(name = "闄㈤暱绛惧瓧")
private String president;
- /** 璐㈠姟鍓櫌闀跨瀛� */
+ /**
+ * 璐㈠姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 涓氬姟鍓櫌闀跨瀛� */
+ /**
+ * 涓氬姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@Excel(name = "涓氬姟鍓櫌闀跨瀛�")
private String busvicepresident;
- /** 鍔炲叕瀹や富浠荤瀛� */
+ /**
+ * 鍔炲叕瀹や富浠荤瀛�
+ */
@ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
@Excel(name = "鍔炲叕瀹や富浠荤瀛�")
private String officedirector;
- /** 璐㈠姟瀹や富浠荤瀛� */
+ /**
+ * 璐㈠姟瀹や富浠荤瀛�
+ */
@ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
@Excel(name = "璐㈠姟瀹や富浠荤瀛�")
private String financedirector;
- /** 璐㈠姟瀹℃牳 */
+ /**
+ * 璐㈠姟瀹℃牳
+ */
@ApiModelProperty("璐㈠姟瀹℃牳")
@Excel(name = "璐㈠姟瀹℃牳")
private String financechecher;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private Integer 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 totalcost;
- /** 鑾峰彇涓撳鎬昏垂鐢� */
+ /**
+ * 鑾峰彇涓撳鎬昏垂鐢�
+ */
@ApiModelProperty("鑾峰彇涓撳鎬昏垂鐢�")
private Double procurementcost;
- /** 涓撳璐圭敤鎬婚噾棰� */
+ /**
+ * 涓撳璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("涓撳璐圭敤鎬婚噾棰�")
private Double expertcost;
- /** 浼︾悊瀹℃煡璐圭敤鎬婚噾棰� */
+ /**
+ * 浼︾悊瀹℃煡璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
private Double ethicscost;
- /** 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
private Double medicalcost;
- /** 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
private Double familycost;
- /** 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
private Double aftercarecost;
@ApiModelProperty("鎹愮尞鑰呭鍚�")
private String donorname;
- /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+ */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆")
private Long flowlevel;
@@ -216,17 +292,23 @@
@ApiModelProperty("閫�鍥炲鏍哥骇鍒�")
private Integer backflowlevel;
- /** 绋庡墠閲戦 */
+ /**
+ * 绋庡墠閲戦
+ */
@ApiModelProperty("绋庡墠閲戦")
@Excel(name = "绋庡墠閲戦")
private Double pretaxcost;
- /** 绋庡悗閲戦 */
+ /**
+ * 绋庡悗閲戦
+ */
@ApiModelProperty("绋庡悗閲戦")
@Excel(name = "绋庡悗閲戦")
private Double taxedcost;
- /** 浜嬬敱澶囨敞 */
+ /**
+ * 浜嬬敱澶囨敞
+ */
@ApiModelProperty("浜嬬敱澶囨敞")
@Excel(name = "浜嬬敱澶囨敞")
private String remark;
@@ -237,9 +319,18 @@
@ApiModelProperty("浠樻鏃ユ湡")
private String riqi;
- /** 缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず) */
+ /**
+ * 缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず)
+ */
@ApiModelProperty("缂栧彿(鎵撳嵃鐨勬椂鍊欙紝鍦ㄦ枃妗ｄ笂鏄剧ず)")
@Excel(name = "缂栧彿")
private String bh;
+
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ @Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ private Integer checkstatus;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index a6e79da..9d88f84 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -14,246 +14,337 @@
/**
* 璐圭敤鐢宠涓诲璞� service_fund_shared
- *
+ *
* @author ruoyi
* @date 2023-03-27
*/
@Data
@ApiModel("璐圭敤鐢宠涓�")
-public class ServiceFundShared extends BaseEntity
-{
+public class ServiceFundShared extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鎹愮尞鑰呭鍚� */
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
@ApiModelProperty("鎹愮尞鑰呭鍚�")
@Excel(name = "鎹愮尞鑰呭鍚�")
private String donorname;
- /** 鐢宠浜虹紪鍙� */
+ /**
+ * 鐢宠浜虹紪鍙�
+ */
@ApiModelProperty("鐢宠浜虹紪鍙�")
@Excel(name = "鐢宠浜虹紪鍙�")
private String userno;
- /** 鐢宠浜哄鍚� */
+ /**
+ * 鐢宠浜哄鍚�
+ */
@ApiModelProperty("鐢宠浜哄鍚�")
@Excel(name = "鐢宠浜哄鍚�")
private String username;
- /** 宸ヤ綔鍗曚綅 */
+ /**
+ * 宸ヤ綔鍗曚綅
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅")
@Excel(name = "宸ヤ綔鍗曚綅")
private String unitname;
- /** 宸ヤ綔鍗曚綅缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅缂栧彿")
private String unitno;
- /** 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿 */
+ /**
+ * 宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿
+ */
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
- /** 瀹跺睘鑱旂郴鐢佃瘽 */
+ /**
+ * 瀹跺睘鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("瀹跺睘鑱旂郴鐢佃瘽")
@Excel(name = "瀹跺睘鑱旂郴鐢佃瘽")
private String phone;
- /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexbankcard;
- /** 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ /**
+ * 鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑
+ */
@ApiModelProperty("鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
@Excel(name = "鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
private String annexregistform;
- /** 绋庡墠閲戦鍚堣 */
+ /**
+ * 绋庡墠閲戦鍚堣
+ */
@ApiModelProperty("绋庡墠閲戦鍚堣")
@Excel(name = "绋庡墠閲戦鍚堣")
private Double pretaxcost;
- /** 绋庡悗閲戦鍚堣 */
+ /**
+ * 绋庡悗閲戦鍚堣
+ */
@ApiModelProperty("绋庡悗閲戦鍚堣")
@Excel(name = "绋庡悗閲戦鍚堣")
private Double taxedcost;
- /** 璐圭敤鎬婚噾棰� */
+ /**
+ * 璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("璐圭敤鎬婚噾棰�")
@Excel(name = "璐圭敤鎬婚噾棰�")
private Double totalcost;
- /** 鑾峰彇涓撳鎬昏垂鐢� */
+ /**
+ * 鑾峰彇涓撳鎬昏垂鐢�
+ */
@ApiModelProperty("鑾峰彇涓撳鎬昏垂鐢�")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
//@TableId(type = IdType.AUTO)
private Double procurementcost;
- /** 涓撳璐圭敤鎬婚噾棰� */
+ /**
+ * 涓撳璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("涓撳璐圭敤鎬婚噾棰�")
@Excel(name = "涓撳璐圭敤鎬婚噾棰�")
private Double expertcost;
- /** 浼︾悊瀹℃煡璐圭敤鎬婚噾棰� */
+ /**
+ * 浼︾悊瀹℃煡璐圭敤鎬婚噾棰�
+ */
@ApiModelProperty("浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
@Excel(name = "浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
private Double ethicscost;
- /** 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
@Excel(name = "鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
private Double medicalcost;
- /** 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
@Excel(name = "鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
private Double familycost;
- /** 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰� */
+ /**
+ * 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�
+ */
@ApiModelProperty("鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
@Excel(name = "鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
private Double aftercarecost;
- /** 鐢宠閲戦 */
+ /**
+ * 鐢宠閲戦
+ */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
private Double amountrequested;
- /** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
+ /**
+ * 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType
+ */
@ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
@Excel(name = "璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
private String applytype;
- /** 棰勬敮璐圭敤 */
+ /**
+ * 棰勬敮璐圭敤
+ */
@ApiModelProperty("棰勬敮璐圭敤")
@Excel(name = "棰勬敮璐圭敤")
private BigDecimal prepaidamount;
- /** 鍙戠エ寮犳暟 */
+ /**
+ * 鍙戠エ寮犳暟
+ */
@ApiModelProperty("鍙戠エ寮犳暟")
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
- /** 闄勪欢鏁� */
+ /**
+ * 闄勪欢鏁�
+ */
@ApiModelProperty("闄勪欢鏁�")
@Excel(name = "闄勪欢鏁�")
private Long attachcount;
- /** 閮ㄩ棬涓荤宸ュ彿 */
+ /**
+ * 閮ㄩ棬涓荤宸ュ彿
+ */
@ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
@Excel(name = "閮ㄩ棬涓荤宸ュ彿")
private String managerno;
- /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ /**
+ * 閮ㄩ棬涓荤鍚嶅瓧
+ */
@ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
@Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
private String managername;
- /** 閮ㄩ棬缂栧彿 */
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿")
private String deptmentno;
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@ApiModelProperty("閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptmentname;
- /** 涓績绛惧瓧 */
+ /**
+ * 涓績绛惧瓧
+ */
@ApiModelProperty("涓績绛惧瓧")
@Excel(name = "涓績绛惧瓧")
private String opochecker;
- /** 璐㈠姟鍓櫌闀跨瀛� */
+ /**
+ * 璐㈠姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
- /** 闄㈤暱绛惧瓧 */
+ /**
+ * 闄㈤暱绛惧瓧
+ */
@ApiModelProperty("闄㈤暱绛惧瓧")
@Excel(name = "闄㈤暱绛惧瓧")
private String president;
- /** 涓氬姟鍓櫌闀跨瀛� */
+ /**
+ * 涓氬姟鍓櫌闀跨瀛�
+ */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@Excel(name = "涓氬姟鍓櫌闀跨瀛�")
private String busvicepresident;
- /** 鍔炲叕瀹や富浠荤瀛� */
+ /**
+ * 鍔炲叕瀹や富浠荤瀛�
+ */
@ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
@Excel(name = "鍔炲叕瀹や富浠荤瀛�")
private String officedirector;
- /** 璐㈠姟瀹や富浠荤瀛� */
+ /**
+ * 璐㈠姟瀹や富浠荤瀛�
+ */
@ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
@Excel(name = "璐㈠姟瀹や富浠荤瀛�")
private String financedirector;
- /** 璐㈠姟瀹℃牳 */
+ /**
+ * 璐㈠姟瀹℃牳
+ */
@ApiModelProperty("璐㈠姟瀹℃牳")
@Excel(name = "璐㈠姟瀹℃牳")
private String financechecher;
- /** 鍙戞斁鐘舵�� */
+ /**
+ * 鍙戞斁鐘舵��
+ */
@ApiModelProperty("鍙戞斁鐘舵��")
@Excel(name = "鍙戞斁鐘舵��")
private String isdistribute;
- /** 璁板綍鐘舵�� */
+ /**
+ * 璁板綍鐘舵��
+ */
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private Integer 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;
- /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ /**
+ * 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑
+ */
@ApiModelProperty("褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
@Excel(name = "褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑")
private Long flowlevel;
- /** 瀵规帴绯荤粺琛ㄥ崟id */
+ /**
+ * 瀵规帴绯荤粺琛ㄥ崟id
+ */
@ApiModelProperty("瀵规帴绯荤粺琛ㄥ崟id")
@Excel(name = "瀵规帴绯荤粺琛ㄥ崟id")
private String oaid;
- /** 瀵规帴绯荤粺琛ㄥ崟鐘舵�� */
+ /**
+ * 瀵规帴绯荤粺琛ㄥ崟鐘舵��
+ */
@ApiModelProperty("瀵规帴绯荤粺琛ㄥ崟鐘舵��")
@Excel(name = "瀵规帴绯荤粺琛ㄥ崟鐘舵��")
private String oabdzt;
- /** 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉� */
+ /**
+ * 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�
+ */
@ApiModelProperty("璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
@Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
private String filename;
- /** 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉� */
+ /**
+ * 璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�
+ */
@ApiModelProperty("璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
@Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
private String fileid;
@@ -278,5 +369,17 @@
*/
@ApiModelProperty("瀹℃壒缁撴灉")
private int spjg;
+
+ /**
+ * 鎵撳嵃缂栧彿
+ */
+ @ApiModelProperty("缂栧彿")
+ private String bh;
+
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ private Integer checkstatus;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index 7b40b12..939bf3f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -323,6 +323,13 @@
@Excel(name = "缂栧彿")
private String bh;
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ @Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ private Integer checkstatus;
+
// @ApiModelProperty("寮�濮嬫椂闂�")
// private Date starttime;
//
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
index a4ffa05..e97622d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
@@ -367,5 +367,19 @@
@ApiModelProperty("瀹℃壒缁撴灉")
private Integer spjg;
+
+ /**
+ * 鎵撳嵃缂栧彿
+ */
+ @ApiModelProperty("缂栧彿")
+ private String bh;
+
+ /**
+ * 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
+ */
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ private Integer checkstatus;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java
index 62a54d7..6688623 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyByItemEO.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
@Data
public class TaxMoneyByItemEO extends BaseEntity {
@@ -29,7 +30,7 @@
/**
* 浜哄憳绫诲埆
*/
- private Long applyType;
+ private List<Long> applyTypes;
/**
* 璧勯噾鐢宠涓昏〃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 3edc1f1..dd8a559 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
@@ -682,7 +682,8 @@
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
- if (serviceFundVO.getId() == null) {
+ if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
+ serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
save(serviceFundVO);
id = serviceFundVO.getId();
} else {
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 aae29db..cce249e 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
@@ -254,7 +254,7 @@
taxMoneyVO.setTaxTime(new Date());
taxMoneyVO.setFirstDay(firstDay);
- taxMoneyVO.setApplyType(Long.valueOf(serviceFunddetail.getApplytype()));
+// taxMoneyVO.setApplyType(Long.valueOf(serviceFunddetail.getApplytype()));
taxMoneyVO.setFundID(serviceFunddetail.getFundid());
taxMoneyVO.setBeneficiaryNo(serviceFunddetail.getBeneficiaryno());
//鏌ュ嚭绋庡墠銆佺◣銆佺◣鍚庣殑鎬婚锛堜笉鍖呭惈鏈锛�
@@ -267,7 +267,8 @@
if (CollectionUtils.isNotEmpty(temporarySave)) {
for (ServiceFunddetail serviceFunddetail1 : temporarySave) {
//濡傛灉鏈鐨勨�濅汉鍛樼被鍨嬧�溿�佲�濆彈鐩婁汉缂栧彿鈥滃湪涓存椂闆嗗悎涓瓨鍦紝鍒欏皢闆嗗悎鏁版嵁涓殑璇ュ彈鐩婁汉鐨勶紝绋庡墠銆佺◣閲戙�佺◣鍚庯紝鍜屾�荤殑鐩稿姞锛屽苟灏嗚�佺殑瑕嗙洊
- if (serviceFunddetail1.getApplytype().equals(serviceFunddetail.getApplytype()) && serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
+ // if (serviceFunddetail1.getApplytype().equals(serviceFunddetail.getApplytype()) && serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
+ if (serviceFunddetail1.getBeneficiaryno().equals(serviceFunddetail.getBeneficiaryno())) {
//灏嗛泦鍚堟暟鎹腑鐨勮鍙楃泭浜虹殑锛岀◣鍓嶃�佺◣閲戙�佺◣鍚庯紝鍜屾�荤殑鐩稿姞
BigDecimal amounts = BigDecimal.valueOf(taxSum.getAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getAmount())));
BigDecimal taxAmounts = BigDecimal.valueOf(taxSum.getTaxAmounts()).add(new BigDecimal(String.valueOf(serviceFunddetail1.getTaxamount())));
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index bea6317..af294be 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -55,6 +55,7 @@
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
+ <result property="checkstatus" column="checkstatus"/>
</resultMap>
@@ -109,7 +110,8 @@
FlowLevel,
zffs,
riqi,
- bh
+ bh,
+ checkstatus
from service_fund
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
index aa3d56b..a05bebf 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
@@ -59,6 +59,8 @@
<result property="fileid" column="fileid"/>
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
+ <result property="bh" column="bh"/>
+ <result property="checkstatus" column="checkstatus"/>
</resultMap>
<sql id="selectServiceFundSharedVo">
@@ -115,7 +117,9 @@
fileid,
serfunid,
zffs,
- riqi
+ riqi,
+ bh,
+ checkstatus
from service_fund_shared
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 1447548..57f8c7e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -254,14 +254,16 @@
where fundID = #{fundid}
</update>
- <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO" resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
+ <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
+ resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
SELECT sum(Amount) amounts, sum(TaxAmount) taxAmounts, sum(TaxedAmount) taxedAmounts
FROM service_funddetail
where fundID < #{fundID}
and tax_time < #{taxTime}
and tax_time >= #{firstDay}
- and ApplyType = #{applyType}
+ -- and ApplyType = #{applyType}
and BeneficiaryNo = #{beneficiaryNo}
+ and ApplyType in (1, 2)
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index e0a7502..ecbf8f8 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -60,6 +60,7 @@
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
+ <result property="checkstatus" column="checkstatus"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
@@ -115,7 +116,8 @@
backFlowLevel,
zffs,
riqi,
- bh
+ bh,
+ checkstatus
from service_reimbursement
</sql>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index 523a384..ce192d9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -62,6 +62,8 @@
<result property="donorrelatives" column="donorrelatives"/>
<result property="zffs" column="zffs"/>
<result property="riqi" column="riqi"/>
+ <result property="bh" column="bh"/>
+ <result property="checkstatus" column="checkstatus"/>
</resultMap>
<sql id="selectServiceReimbursementSharedVo">
@@ -121,7 +123,9 @@
donoramount,
donorrelatives,
zffs,
- riqi
+ riqi,
+ bh,
+ checkstatus
from service_reimbursement_shared
</sql>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 7e713e2..8a7c5ce 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
+import com.ruoyi.project.domain.vo.DingTalkReqVo;
import com.ruoyi.project.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
/**
@@ -203,7 +205,7 @@
String bh = myMethod();
//閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
ServiceFund serviceFund = new ServiceFund();
- serviceFund.setBh(bh);
+ serviceFund.setBh(serviceFundShared.getBh());
serviceFund.setId(serviceFundShared.getSerfunid());
serviceFund.setZffs(serviceFundShared.getZffs());
if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
@@ -433,7 +435,7 @@
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
- serviceReimbursement.setBh(bh);
+ serviceReimbursement.setBh(serviceReimbursementShared.getBh());
if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
serviceReimbursement.setPresident(serviceReimbursementShared.getPresident());
}
--
Gitblit v1.9.3