From b7cd70a1dc48f2cd2f5ed36d09f92c8ebcc62c8b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 03 十一月 2023 15:20:45 +0800
Subject: [PATCH] 修改审批流程
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 141 insertions(+), 18 deletions(-)
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 be4cbbc..3661bc7 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
@@ -1,16 +1,20 @@
package com.ruoyi.quartz.task;
+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;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
/**
@@ -25,6 +29,9 @@
private DingTalkService dingTalkService;
@Autowired
+ private IServiceReimbursementService serviceReimbursementService;
+
+ @Autowired
private IServiceTasknumService ServiceTasknumService;
@Autowired
@@ -36,12 +43,22 @@
@Autowired
private IServiceFunddetailSharedService serviceFunddetailSharedService;
+ @Autowired
+ private IServiceFunddetailService serviceFunddetailService;
+
+
+ @Autowired
+ private IServiceReimbursementdetailService serviceReimbursementdetailService;
+
+ @Autowired
+ private IServiceReimbursementdetailSharedService reimbursementdetailSharedService;
@Autowired
private IServiceFundService serviceFundService;
- @Autowired
- private IServiceReimbursementService serviceReimbursementService;
+// @Autowired
+// private IServiceReimbursementService serviceReimbursementService;
+
@Autowired
private IServiceFundflowService fundflowService;
@@ -58,13 +75,119 @@
System.out.println("鎵ц鏃犲弬鏂规硶");
}
+// public void checkDBInfo() {
+// ServiceFund serviceFund = new ServiceFund();
+// serviceFund.setFlowlevel(3L);
+// List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
+// for (ServiceFund serviceFund1 : serviceFunds) {
+// ServiceFundShared serviceFundShared = new ServiceFundShared();
+// serviceFundShared.setSerfunid(serviceFund1.getId());
+// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared);
+// if (CollectionUtils.isEmpty(serviceFundShareds)) {
+// ServiceFundShared serviceFundShared1 = DtoConversionUtils.sourceToTarget(serviceFund1, ServiceFundShared.class);
+// serviceFundShared1.setSerfunid(serviceFund1.getId());
+// serviceFundShared1.setId(null);
+// serviceFundSharedService.save(serviceFundShared1);
+// }
+// }
+// //FUND
+// List<ServiceFunddetail> serviceFunddetailnew = new ArrayList<>();
+// List<ServiceFunddetail> serviceFunddetails = serviceFunddetailService.queryList(new ServiceFunddetail());
+// for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
+//// if (!ObjectUtils.isEmpty(serviceFunddetail.getAnnexfiles())) {
+//// serviceFunddetailnew.add(serviceFunddetail);
+//// } else {
+// Long fundid = serviceFunddetail.getFundid();
+// ServiceFund byId = serviceFundService.getById(fundid);
+// if (!ObjectUtils.isEmpty(byId)) {
+// if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) {
+// serviceFunddetailnew.add(serviceFunddetail);
+// }
+//// }
+// }
+// }
+// for (ServiceFunddetail serviceFunddetail1 : serviceFunddetailnew) {
+// //闇�瑕佸厛鏌ヤ竴涓嬭繖涓搴旂殑fdid锛坰hared琛級鍦ㄨ鎯呭浠借〃鏄惁瀛樺湪
+// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
+// serviceFunddetailShared.setFdid(serviceFunddetail1.getId());
+// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared);
+// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) {
+// serviceFundService.addFundSharedInfo(serviceFunddetail1.getFundid());
+// }
+//// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared();
+//// serviceFunddetailShared.setFdid(serviceFunddetail1.getId());
+//// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared);
+//// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) {
+//// ServiceFunddetailShared serviceFunddetailShared1 = DtoConversionUtils.sourceToTarget(serviceFunddetail1, ServiceFunddetailShared.class);
+//// serviceFunddetailShared1.setId(null);
+//// ServiceFundShared serviceFundShared = new ServiceFundShared();
+//// serviceFundShared.setSerfunid(serviceFunddetail1.getFundid());
+//// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared);
+//// serviceFunddetailShared1.setFundid(serviceFundShareds.get(0).getId());
+//// serviceFunddetailShared1.setFdid(serviceFunddetail1.getId());
+//// serviceFunddetailSharedService.save(serviceFunddetailShared1);
+//// }
+// }
+//
+//
+// //reimbursement
+// List<ServiceReimbursementdetail> serviceReimbursementdetailsNew = new ArrayList<>();
+// List<ServiceReimbursementdetail> serviceReimbursementdetails = serviceReimbursementdetailService.queryList(new ServiceReimbursementdetail());
+// for (ServiceReimbursementdetail reimbursementdetail : serviceReimbursementdetails) {
+//// if (!ObjectUtils.isEmpty(reimbursementdetail.getAnnexfiles())) {
+//// serviceReimbursementdetailsNew.add(reimbursementdetail);
+//// } else {
+// Long rbid = reimbursementdetail.getRbid();
+// ServiceReimbursement byId = serviceReimbursementService.getById(rbid);
+// if (!ObjectUtils.isEmpty(byId)) {
+// if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) {
+// serviceReimbursementdetailsNew.add(reimbursementdetail);
+// }
+//// }
+// }
+// }
+// for (ServiceReimbursementdetail serviceReimbursementdetail : serviceReimbursementdetailsNew) {
+// //闇�瑕佸厛鏌ヤ竴涓嬭繖涓搴旂殑rbid锛坰hared琛級鍦ㄨ鎯呭浠借〃鏄惁瀛樺湪
+// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
+// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
+// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
+// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) {
+// serviceReimbursementService.addSharedData(serviceReimbursementdetail.getRbid());
+// }
+// }
+//// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared();
+//// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
+//// if (serviceReimbursementdetail.getRbid() == 872) {
+//// System.out.println("-------------------");
+//// }
+//// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
+////
+//// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) {
+//// ServiceReimbursementdetailShared reimbursementdetailShared = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailShared.class);
+//// reimbursementdetailShared.setId(null);
+//// ServiceReimbursementShared serviceReimbursementShared = new ServiceReimbursementShared();
+//// serviceReimbursementShared.setReimid(serviceReimbursementdetail.getRbid());
+//// List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryList(serviceReimbursementShared);
+//// if (!CollectionUtils.isEmpty(serviceReimbursementShareds) && !ObjectUtils.isEmpty(serviceReimbursementShareds.get(0))) {
+//// reimbursementdetailShared.setRbid(serviceReimbursementShareds.get(0).getId());
+//// reimbursementdetailShared.setRdid(serviceReimbursementdetail.getId());
+//// reimbursementdetailSharedService.save(reimbursementdetailShared);
+//// }
+//// }
+//// }
+//
+// }
+
public void checkReportInfo() {
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
//濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
- String[] split = serviceFundShared.getCxrjyj().split("&");
+ String[] split = null;
+ if (StringUtils.isNotEmpty(serviceFundShared.getCxrjyj())) {
+ split = serviceFundShared.getCxrjyj().split("&");
+ }
String phone = serviceFundShared.getPhone();
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
@@ -73,7 +196,7 @@
serviceFund.setId(serviceFundShared.getSerfunid());
List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
ServiceFund serviceFund1 = serviceFunds.get(0);
- serviceFund1.setFlowlevel(100);
+ serviceFund1.setFlowlevel(100L);
serviceFund1.setDel_flag(0);
serviceFund1.setRecordstatus(-1);
serviceFund1.setBackflowlevel(199);
@@ -85,7 +208,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())) {
@@ -157,10 +280,10 @@
}
serviceFundflow.setFlowcontent(spname + "瀹℃壒閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
// 999 閫氳繃
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundShared.setSpjg(1);
fundflowService.save(serviceFundflow);
@@ -204,9 +327,9 @@
serviceFundflow.setCheckusername(serviceFundShared.getPresident().substring(0, serviceFundShared.getPresident().indexOf(" ")));
serviceFundflow.setFlowcontent(serviceFundShared.getPresident().substring(0, serviceFundShared.getPresident().indexOf(" ")) + "瀹℃壒閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -235,9 +358,9 @@
serviceFundflow.setCheckusername(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")));
serviceFundflow.setFlowcontent(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -265,9 +388,9 @@
serviceFundflow.setCheckusername(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")));
serviceFundflow.setFlowcontent(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")) + "閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -315,7 +438,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());
}
@@ -388,7 +511,7 @@
serviceFundflow.setFundtype(1);
// 999 閫氳繃
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
serviceReimbursementShared.setSpjg(1);
@@ -433,7 +556,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -464,7 +587,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setCheckTime(parse);
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
fundflowService.save(serviceFundflow);
@@ -494,7 +617,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setCheckTime(parse);
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
--
Gitblit v1.9.3