From 2c07f3c1cf4092fd42e3022c56d1bcf8fcc9438e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 15 八月 2023 15:32:14 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 20 +-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 35 +++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java | 16 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 1
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java | 225 ++++++++++++++++++++-----------------
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailSharedService.java | 8 +
7 files changed, 174 insertions(+), 133 deletions(-)
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 967153b..a6e79da 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
@@ -88,53 +88,53 @@
/** 绋庡墠閲戦鍚堣 */
@ApiModelProperty("绋庡墠閲戦鍚堣")
@Excel(name = "绋庡墠閲戦鍚堣")
- private BigDecimal pretaxcost;
+ private Double pretaxcost;
/** 绋庡悗閲戦鍚堣 */
@ApiModelProperty("绋庡悗閲戦鍚堣")
@Excel(name = "绋庡悗閲戦鍚堣")
- private BigDecimal taxedcost;
+ private Double taxedcost;
/** 璐圭敤鎬婚噾棰� */
@ApiModelProperty("璐圭敤鎬婚噾棰�")
@Excel(name = "璐圭敤鎬婚噾棰�")
- private BigDecimal totalcost;
+ private Double totalcost;
/** 鑾峰彇涓撳鎬昏垂鐢� */
@ApiModelProperty("鑾峰彇涓撳鎬昏垂鐢�")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
//@TableId(type = IdType.AUTO)
- private BigDecimal procurementcost;
+ private Double procurementcost;
/** 涓撳璐圭敤鎬婚噾棰� */
@ApiModelProperty("涓撳璐圭敤鎬婚噾棰�")
@Excel(name = "涓撳璐圭敤鎬婚噾棰�")
- private BigDecimal expertcost;
+ private Double expertcost;
/** 浼︾悊瀹℃煡璐圭敤鎬婚噾棰� */
@ApiModelProperty("浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
@Excel(name = "浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
- private BigDecimal ethicscost;
+ private Double ethicscost;
/** 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰� */
@ApiModelProperty("鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
@Excel(name = "鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
- private BigDecimal medicalcost;
+ private Double medicalcost;
/** 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰� */
@ApiModelProperty("鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
@Excel(name = "鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
- private BigDecimal familycost;
+ private Double familycost;
/** 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰� */
@ApiModelProperty("鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
@Excel(name = "鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
- private BigDecimal aftercarecost;
+ private Double aftercarecost;
/** 鐢宠閲戦 */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
- private BigDecimal amountrequested;
+ private Double amountrequested;
/** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
@ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
index 29efd49..d9631da 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -162,37 +162,37 @@
/** 鏁伴噺 */
@ApiModelProperty("鏁伴噺")
@Excel(name = "鏁伴噺")
- private BigDecimal quantity;
+ private Double quantity;
/** 浠锋牸 */
@ApiModelProperty("浠锋牸")
@Excel(name = "浠锋牸")
- private BigDecimal price;
+ private Double price;
/** 鐢宠閲戦 */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
- private BigDecimal amount;
+ private Double amount;
/** 鎵ｇ◣閲戦 */
@ApiModelProperty("鎵ｇ◣閲戦")
@Excel(name = "鎵ｇ◣閲戦")
- private BigDecimal taxamount;
+ private Double taxamount;
/** 绋庡悗閲戦 */
@ApiModelProperty("绋庡悗閲戦")
@Excel(name = "绋庡悗閲戦")
- private BigDecimal taxedamount;
+ private Double taxedamount;
/** 棰勬敮閲戦 */
@ApiModelProperty("棰勬敮閲戦")
@Excel(name = "棰勬敮閲戦")
- private BigDecimal prepaidamount;
+ private Double prepaidamount;
/** 浠樻閲戦 */
@ApiModelProperty("浠樻閲戦")
@Excel(name = "浠樻閲戦")
- private BigDecimal paidamount;
+ private Double paidamount;
/** 浠樻鏃堕棿 */
@ApiModelProperty("浠樻鏃堕棿")
@@ -269,7 +269,7 @@
/** $column.columnComment */
@ApiModelProperty("$column.columnComment")
@Excel(name = "涓婁紶鏃堕棿")
- private BigDecimal reimbursementamount;
+ private Double reimbursementamount;
/** 閲戦 */
@ApiModelProperty("閲戦")
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 0eedabb..c99c425 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
@@ -270,7 +270,7 @@
private Long flowlevel;
/**
- * 99:瀹℃壒椹冲洖 100锛氫笂浼犲尰闄� 199锛氬尰闄㈤┏鍥�
+ * 100锛氫笂浼犲尰闄� 199锛氬尰闄㈤┏鍥�
*/
@ApiModelProperty("閫�鍥炴椂鐨勫鏍哥骇鍒�")
private Long backflowlevel;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailSharedService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailSharedService.java
index 6616b2f..83e5a12 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailSharedService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailSharedService.java
@@ -20,4 +20,12 @@
* @return 璐圭敤鐢宠鏄庣粏闆嗗悎
*/
public List<ServiceFunddetailShared> queryList(ServiceFunddetailShared serviceFunddetailShared);
+
+ /**
+ * 鍒犻櫎璐圭敤鐢宠鏄庣粏
+ *
+ * @param serviceFunddetailShared 璐圭敤鐢宠鏄庣粏
+ * @return
+ */
+ public Boolean delFunddetailShare(ServiceFunddetailShared serviceFunddetailShared)
}
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 6736762..3af0d38 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
@@ -774,6 +774,7 @@
String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
List<RbDetailFile> parseArray2 = new ArrayList<>();
List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
+ log.info("parseArray鐨勫�� : {}",parseArray);
for (int i = 0; i < parseArray.size(); i++) {
RbDetailFile rbDetailFile = parseArray.get(i);
log.info("filePath鐨勪慨鏀�:{}", filePath);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
index d529e85..16f11a6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
@@ -1,14 +1,17 @@
package com.ruoyi.project.service.impl;
import java.util.List;
+
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import java.util.ArrayList;
import java.util.Map;
+
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceFunddetailSharedMapper;
import com.ruoyi.project.domain.ServiceFunddetailShared;
@@ -16,172 +19,190 @@
/**
* 璐圭敤鐢宠鏄庣粏Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2023-04-20
*/
@Service
-public class ServiceFunddetailSharedServiceImpl extends ServiceImpl<ServiceFunddetailSharedMapper, ServiceFunddetailShared> implements IServiceFunddetailSharedService
-{
+public class ServiceFunddetailSharedServiceImpl extends ServiceImpl<ServiceFunddetailSharedMapper, ServiceFunddetailShared> implements IServiceFunddetailSharedService {
/**
* 鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃
- *
+ *
* @param serviceFunddetailShared 璐圭敤鐢宠鏄庣粏
* @return 璐圭敤鐢宠鏄庣粏
*/
@Override
public List<ServiceFunddetailShared> queryList(ServiceFunddetailShared serviceFunddetailShared) {
LambdaQueryWrapper<ServiceFunddetailShared> wrappers = Wrappers.lambdaQuery();
- if (serviceFunddetailShared.getFundid() != null){
- wrappers.eq(ServiceFunddetailShared::getFundid ,serviceFunddetailShared.getFundid());
+ if (serviceFunddetailShared.getFundid() != null) {
+ wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid());
}
- if (serviceFunddetailShared.getOrderno() != null){
- wrappers.eq(ServiceFunddetailShared::getOrderno ,serviceFunddetailShared.getOrderno());
+ if (serviceFunddetailShared.getOrderno() != null) {
+ wrappers.eq(ServiceFunddetailShared::getOrderno, serviceFunddetailShared.getOrderno());
}
- if (serviceFunddetailShared.getItemid() != null){
- wrappers.eq(ServiceFunddetailShared::getItemid ,serviceFunddetailShared.getItemid());
+ if (serviceFunddetailShared.getItemid() != null) {
+ wrappers.eq(ServiceFunddetailShared::getItemid, serviceFunddetailShared.getItemid());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getItemcode())){
- wrappers.eq(ServiceFunddetailShared::getItemcode ,serviceFunddetailShared.getItemcode());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getItemcode())) {
+ wrappers.eq(ServiceFunddetailShared::getItemcode, serviceFunddetailShared.getItemcode());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getItemname())){
- wrappers.like(ServiceFunddetailShared::getItemname ,serviceFunddetailShared.getItemname());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getItemname())) {
+ wrappers.like(ServiceFunddetailShared::getItemname, serviceFunddetailShared.getItemname());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getItemtype())){
- wrappers.eq(ServiceFunddetailShared::getItemtype ,serviceFunddetailShared.getItemtype());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getItemtype())) {
+ wrappers.eq(ServiceFunddetailShared::getItemtype, serviceFunddetailShared.getItemtype());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytype())){
- wrappers.eq(ServiceFunddetailShared::getApplytype ,serviceFunddetailShared.getApplytype());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytype())) {
+ wrappers.eq(ServiceFunddetailShared::getApplytype, serviceFunddetailShared.getApplytype());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytypename())){
- wrappers.like(ServiceFunddetailShared::getApplytypename ,serviceFunddetailShared.getApplytypename());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getApplytypename())) {
+ wrappers.like(ServiceFunddetailShared::getApplytypename, serviceFunddetailShared.getApplytypename());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryname())){
- wrappers.like(ServiceFunddetailShared::getBeneficiaryname ,serviceFunddetailShared.getBeneficiaryname());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryname())) {
+ wrappers.like(ServiceFunddetailShared::getBeneficiaryname, serviceFunddetailShared.getBeneficiaryname());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryno())){
- wrappers.eq(ServiceFunddetailShared::getBeneficiaryno ,serviceFunddetailShared.getBeneficiaryno());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getBeneficiaryno())) {
+ wrappers.eq(ServiceFunddetailShared::getBeneficiaryno, serviceFunddetailShared.getBeneficiaryno());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitname())){
- wrappers.like(ServiceFunddetailShared::getUnitname ,serviceFunddetailShared.getUnitname());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitname())) {
+ wrappers.like(ServiceFunddetailShared::getUnitname, serviceFunddetailShared.getUnitname());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitno())){
- wrappers.eq(ServiceFunddetailShared::getUnitno ,serviceFunddetailShared.getUnitno());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getUnitno())) {
+ wrappers.eq(ServiceFunddetailShared::getUnitno, serviceFunddetailShared.getUnitno());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getUnituserno())){
- wrappers.eq(ServiceFunddetailShared::getUnituserno ,serviceFunddetailShared.getUnituserno());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getUnituserno())) {
+ wrappers.eq(ServiceFunddetailShared::getUnituserno, serviceFunddetailShared.getUnituserno());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getTitle())){
- wrappers.eq(ServiceFunddetailShared::getTitle ,serviceFunddetailShared.getTitle());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getTitle())) {
+ wrappers.eq(ServiceFunddetailShared::getTitle, serviceFunddetailShared.getTitle());
}
- if (serviceFunddetailShared.getIdcardtype() != null){
- wrappers.eq(ServiceFunddetailShared::getIdcardtype ,serviceFunddetailShared.getIdcardtype());
+ if (serviceFunddetailShared.getIdcardtype() != null) {
+ wrappers.eq(ServiceFunddetailShared::getIdcardtype, serviceFunddetailShared.getIdcardtype());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getIdcardno())){
- wrappers.eq(ServiceFunddetailShared::getIdcardno ,serviceFunddetailShared.getIdcardno());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getIdcardno())) {
+ wrappers.eq(ServiceFunddetailShared::getIdcardno, serviceFunddetailShared.getIdcardno());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getSex())){
- wrappers.eq(ServiceFunddetailShared::getSex ,serviceFunddetailShared.getSex());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getSex())) {
+ wrappers.eq(ServiceFunddetailShared::getSex, serviceFunddetailShared.getSex());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getFamilyrelations())){
- wrappers.eq(ServiceFunddetailShared::getFamilyrelations ,serviceFunddetailShared.getFamilyrelations());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getFamilyrelations())) {
+ wrappers.eq(ServiceFunddetailShared::getFamilyrelations, serviceFunddetailShared.getFamilyrelations());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getPhone())){
- wrappers.eq(ServiceFunddetailShared::getPhone ,serviceFunddetailShared.getPhone());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getPhone())) {
+ wrappers.eq(ServiceFunddetailShared::getPhone, serviceFunddetailShared.getPhone());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getDepositbank())){
- wrappers.eq(ServiceFunddetailShared::getDepositbank ,serviceFunddetailShared.getDepositbank());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getDepositbank())) {
+ wrappers.eq(ServiceFunddetailShared::getDepositbank, serviceFunddetailShared.getDepositbank());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getBankcardno())){
- wrappers.eq(ServiceFunddetailShared::getBankcardno ,serviceFunddetailShared.getBankcardno());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getBankcardno())) {
+ wrappers.eq(ServiceFunddetailShared::getBankcardno, serviceFunddetailShared.getBankcardno());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getBranchbankname())){
- wrappers.like(ServiceFunddetailShared::getBranchbankname ,serviceFunddetailShared.getBranchbankname());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getBranchbankname())) {
+ wrappers.like(ServiceFunddetailShared::getBranchbankname, serviceFunddetailShared.getBranchbankname());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexbankcard())){
- wrappers.eq(ServiceFunddetailShared::getAnnexbankcard ,serviceFunddetailShared.getAnnexbankcard());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexbankcard())) {
+ wrappers.eq(ServiceFunddetailShared::getAnnexbankcard, serviceFunddetailShared.getAnnexbankcard());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexregistform())){
- wrappers.eq(ServiceFunddetailShared::getAnnexregistform ,serviceFunddetailShared.getAnnexregistform());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getAnnexregistform())) {
+ wrappers.eq(ServiceFunddetailShared::getAnnexregistform, serviceFunddetailShared.getAnnexregistform());
}
- if (serviceFunddetailShared.getQuantity() != null){
- wrappers.eq(ServiceFunddetailShared::getQuantity ,serviceFunddetailShared.getQuantity());
+ if (serviceFunddetailShared.getQuantity() != null) {
+ wrappers.eq(ServiceFunddetailShared::getQuantity, serviceFunddetailShared.getQuantity());
}
- if (serviceFunddetailShared.getPrice() != null){
- wrappers.eq(ServiceFunddetailShared::getPrice ,serviceFunddetailShared.getPrice());
+ if (serviceFunddetailShared.getPrice() != null) {
+ wrappers.eq(ServiceFunddetailShared::getPrice, serviceFunddetailShared.getPrice());
}
- if (serviceFunddetailShared.getAmount() != null){
- wrappers.eq(ServiceFunddetailShared::getAmount ,serviceFunddetailShared.getAmount());
+ if (serviceFunddetailShared.getAmount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getAmount, serviceFunddetailShared.getAmount());
}
- if (serviceFunddetailShared.getTaxamount() != null){
- wrappers.eq(ServiceFunddetailShared::getTaxamount ,serviceFunddetailShared.getTaxamount());
+ if (serviceFunddetailShared.getTaxamount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getTaxamount, serviceFunddetailShared.getTaxamount());
}
- if (serviceFunddetailShared.getTaxedamount() != null){
- wrappers.eq(ServiceFunddetailShared::getTaxedamount ,serviceFunddetailShared.getTaxedamount());
+ if (serviceFunddetailShared.getTaxedamount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getTaxedamount, serviceFunddetailShared.getTaxedamount());
}
- if (serviceFunddetailShared.getPrepaidamount() != null){
- wrappers.eq(ServiceFunddetailShared::getPrepaidamount ,serviceFunddetailShared.getPrepaidamount());
+ if (serviceFunddetailShared.getPrepaidamount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getPrepaidamount, serviceFunddetailShared.getPrepaidamount());
}
- if (serviceFunddetailShared.getPaidamount() != null){
- wrappers.eq(ServiceFunddetailShared::getPaidamount ,serviceFunddetailShared.getPaidamount());
+ if (serviceFunddetailShared.getPaidamount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getPaidamount, serviceFunddetailShared.getPaidamount());
}
- if (serviceFunddetailShared.getPaidtime() != null){
- wrappers.eq(ServiceFunddetailShared::getPaidtime ,serviceFunddetailShared.getPaidtime());
+ if (serviceFunddetailShared.getPaidtime() != null) {
+ wrappers.eq(ServiceFunddetailShared::getPaidtime, serviceFunddetailShared.getPaidtime());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getPayterm())){
- wrappers.eq(ServiceFunddetailShared::getPayterm ,serviceFunddetailShared.getPayterm());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getPayterm())) {
+ wrappers.eq(ServiceFunddetailShared::getPayterm, serviceFunddetailShared.getPayterm());
}
- if (serviceFunddetailShared.getInvoicecount() != null){
- wrappers.eq(ServiceFunddetailShared::getInvoicecount ,serviceFunddetailShared.getInvoicecount());
+ if (serviceFunddetailShared.getInvoicecount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getInvoicecount, serviceFunddetailShared.getInvoicecount());
}
- if (serviceFunddetailShared.getAttachcount() != null){
- wrappers.eq(ServiceFunddetailShared::getAttachcount ,serviceFunddetailShared.getAttachcount());
+ if (serviceFunddetailShared.getAttachcount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getAttachcount, serviceFunddetailShared.getAttachcount());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getRemark())){
- wrappers.eq(ServiceFunddetailShared::getRemark ,serviceFunddetailShared.getRemark());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getRemark())) {
+ wrappers.eq(ServiceFunddetailShared::getRemark, serviceFunddetailShared.getRemark());
}
- if (serviceFunddetailShared.getInfoid() != null){
- wrappers.eq(ServiceFunddetailShared::getInfoid ,serviceFunddetailShared.getInfoid());
+ if (serviceFunddetailShared.getInfoid() != null) {
+ wrappers.eq(ServiceFunddetailShared::getInfoid, serviceFunddetailShared.getInfoid());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorno())){
- wrappers.eq(ServiceFunddetailShared::getDonorno ,serviceFunddetailShared.getDonorno());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorno())) {
+ wrappers.eq(ServiceFunddetailShared::getDonorno, serviceFunddetailShared.getDonorno());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorname())){
- wrappers.like(ServiceFunddetailShared::getDonorname ,serviceFunddetailShared.getDonorname());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getDonorname())) {
+ wrappers.like(ServiceFunddetailShared::getDonorname, serviceFunddetailShared.getDonorname());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getRecordstatus())){
- wrappers.eq(ServiceFunddetailShared::getRecordstatus ,serviceFunddetailShared.getRecordstatus());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getRecordstatus())) {
+ wrappers.eq(ServiceFunddetailShared::getRecordstatus, serviceFunddetailShared.getRecordstatus());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getUploadflag())){
- wrappers.eq(ServiceFunddetailShared::getUploadflag ,serviceFunddetailShared.getUploadflag());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getUploadflag())) {
+ wrappers.eq(ServiceFunddetailShared::getUploadflag, serviceFunddetailShared.getUploadflag());
}
- if (serviceFunddetailShared.getUploadtime() != null){
- wrappers.eq(ServiceFunddetailShared::getUploadtime ,serviceFunddetailShared.getUploadtime());
+ if (serviceFunddetailShared.getUploadtime() != null) {
+ wrappers.eq(ServiceFunddetailShared::getUploadtime, serviceFunddetailShared.getUploadtime());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscope())){
- wrappers.eq(ServiceFunddetailShared::getServicesscope ,serviceFunddetailShared.getServicesscope());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscope())) {
+ wrappers.eq(ServiceFunddetailShared::getServicesscope, serviceFunddetailShared.getServicesscope());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscopename())){
- wrappers.like(ServiceFunddetailShared::getServicesscopename ,serviceFunddetailShared.getServicesscopename());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getServicesscopename())) {
+ wrappers.like(ServiceFunddetailShared::getServicesscopename, serviceFunddetailShared.getServicesscopename());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetype())){
- wrappers.eq(ServiceFunddetailShared::getServicetype ,serviceFunddetailShared.getServicetype());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetype())) {
+ wrappers.eq(ServiceFunddetailShared::getServicetype, serviceFunddetailShared.getServicetype());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetypename())){
- wrappers.like(ServiceFunddetailShared::getServicetypename ,serviceFunddetailShared.getServicetypename());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getServicetypename())) {
+ wrappers.like(ServiceFunddetailShared::getServicetypename, serviceFunddetailShared.getServicetypename());
}
- if (serviceFunddetailShared.getReimbursementamount() != null){
- wrappers.eq(ServiceFunddetailShared::getReimbursementamount ,serviceFunddetailShared.getReimbursementamount());
+ if (serviceFunddetailShared.getReimbursementamount() != null) {
+ wrappers.eq(ServiceFunddetailShared::getReimbursementamount, serviceFunddetailShared.getReimbursementamount());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getJine())){
- wrappers.eq(ServiceFunddetailShared::getJine ,serviceFunddetailShared.getJine());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getJine())) {
+ wrappers.eq(ServiceFunddetailShared::getJine, serviceFunddetailShared.getJine());
}
- if (StringUtils.isNotBlank(serviceFunddetailShared.getLiyou())){
- wrappers.eq(ServiceFunddetailShared::getLiyou ,serviceFunddetailShared.getLiyou());
+ if (StringUtils.isNotBlank(serviceFunddetailShared.getLiyou())) {
+ wrappers.eq(ServiceFunddetailShared::getLiyou, serviceFunddetailShared.getLiyou());
}
return this.list(wrappers);
}
+
+ /**
+ * 鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃
+ *
+ * @param serviceFunddetailShared 璐圭敤鐢宠鏄庣粏
+ * @return 璐圭敤鐢宠鏄庣粏
+ */
+ @Override
+ public Boolean delFunddetailShare(ServiceFunddetailShared serviceFunddetailShared) {
+ boolean update = false;
+ LambdaQueryWrapper<ServiceFunddetailShared> wrappers = Wrappers.lambdaQuery();
+ if (serviceFunddetailShared.getFundid() != null) {
+ wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid());
+ update = update(wrappers);
+ }
+
+ return update;
+ }
+
}
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 7225a41..2da5d94 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
@@ -34,6 +34,9 @@
@Autowired
private IServiceFundSharedService serviceFundSharedService;
+ @Autowired
+ private IServiceFunddetailSharedService serviceFunddetailSharedService;
+
@Autowired
private IServiceFundService serviceFundService;
@@ -66,6 +69,10 @@
String phone = serviceFundShared.getPhone();
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
+ ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
+ log.info("fundShared鐨処D:{}", serviceFundShared.getId());
+ serviceFunddetailShared.setFundid(serviceFundShared.getId());
+ serviceFunddetailSharedService.delFunddetailShare(serviceFunddetailShared);
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
@@ -281,7 +288,11 @@
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
String phone = serviceReimbursementShared.getPhone();
- String[] split = serviceReimbursementShared.getCxrjyj().split("&");
+ String[] split = null;
+ log.info("serviceReimbursementShared.getCxrjyj(): {}", serviceReimbursementShared.getCxrjyj());
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
+ split = serviceReimbursementShared.getCxrjyj().split("&");
+ }
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
@@ -517,17 +528,17 @@
serviceFundflow.setFundid(fundId);
fundflowService.save(serviceFundflow);
- ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>();
- ConcurrentHashMap map = new ConcurrentHashMap();
- map.put("瀹℃壒浜�", split[0]);
- map.put("瀹℃壒鏃堕棿", split[1]);
- map.put("鎰忚", split[2]);
- contentList.add(map);
- DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
- dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
- dingTalkReqVo.setNumber(phone);
- dingTalkReqVo.setContents(contentList);
- dingTalkService.sendNotification(dingTalkReqVo);
+// ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>();
+// ConcurrentHashMap map = new ConcurrentHashMap();
+// map.put("瀹℃壒浜�", split[0]);
+// map.put("瀹℃壒鏃堕棿", split[1]);
+// map.put("鎰忚", split[2]);
+// contentList.add(map);
+// DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+// dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
+// dingTalkReqVo.setNumber(phone);
+// dingTalkReqVo.setContents(contentList);
+// dingTalkService.sendNotification(dingTalkReqVo);
}
}
--
Gitblit v1.9.3