From d5c2c0762ccbb2bb33635f99480d404f1fb10d5a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 22 二月 2024 18:26:29 +0800
Subject: [PATCH] 修改流程代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 246 ++++++++++++++++++++++--------------------------
1 files changed, 114 insertions(+), 132 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 7e713e2..2f6df59 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;
/**
@@ -39,23 +41,10 @@
private IServiceFundSharedService serviceFundSharedService;
@Autowired
- private IServiceFunddetailSharedService serviceFunddetailSharedService;
-
+ private IServiceFundflowruleService iServiceFundflowruleService;
@Autowired
- private IServiceFunddetailService serviceFunddetailService;
-
- @Autowired
- private IServiceReimbursementdetailService serviceReimbursementdetailService;
-
- @Autowired
- private IServiceReimbursementdetailSharedService reimbursementdetailSharedService;
-
- @Autowired
private IServiceFundService serviceFundService;
-
-// @Autowired
-// private IServiceReimbursementService serviceReimbursementService;
@Autowired
@@ -73,116 +62,16 @@
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());
@@ -203,7 +92,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())) {
@@ -275,10 +164,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);
@@ -322,9 +211,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);
@@ -353,9 +242,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);
@@ -383,9 +272,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);
@@ -419,6 +308,7 @@
ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
serviceReimbursement1.setFlowlevel(100L);
serviceReimbursement1.setDelFlag(0);
+ serviceReimbursement1.setUploadStates(0);
serviceReimbursement1.setBackflowlevel(199L);
serviceReimbursement1.setRecordstatus(-1);
serviceReimbursementService.updateById(serviceReimbursement1);
@@ -433,7 +323,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());
}
@@ -506,7 +396,7 @@
serviceFundflow.setFundtype(1);
// 999 閫氳繃
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
serviceReimbursementShared.setSpjg(1);
@@ -551,7 +441,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);
@@ -582,7 +472,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);
@@ -612,7 +502,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setCheckTime(parse);
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
@@ -701,4 +591,96 @@
}
+ /**
+ * 灏嗘暟鎹瓨鍒板垎浜〃涓�
+ */
+ public void addDataShared() {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ //澶勭悊宸梾鎶ラ攢
+ serviceFundflowrule.setApplytype("0");
+ List<ServiceFundflowrule> serviceFundflowrules = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("宸梾鐨勬渶楂樼瓑绾�:{}", serviceFundflowrules.get(0).getTotallevel());
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
+ serviceReimbursement.setUploadStates(0);
+ serviceReimbursement.setDelFlag(0);
+ List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
+ for (ServiceReimbursement serviceReimbursement1 : serviceReimbursementList) {
+ try {
+ log.info("鎻掑叆鍒嗕韩琛ㄧ殑ID涓猴細{}", serviceReimbursement1.getId());
+ Boolean aBoolean = serviceReimbursementService.addSharedData(serviceReimbursement1.getId());
+ if (aBoolean) {
+ ServiceReimbursement serviceReimbursement3 = new ServiceReimbursement();
+ serviceReimbursement3.setId(serviceReimbursement1.getId());
+ serviceReimbursement3.setUploadStates(1);
+ boolean b = serviceReimbursementService.updateById(serviceReimbursement3);
+ log.info("serviceReimbursement鏄惁鎻掑叆鎴愬姛{},{}", aBoolean, b);
+ }
+ } catch (Exception e) {
+ ServiceReimbursement serviceReimbursement2 = new ServiceReimbursement();
+ serviceReimbursement2.setId(serviceReimbursement1.getId());
+ serviceReimbursement2.setNotes("鎻掑叆鍒嗕韩琛ㄥけ璐�");
+ serviceReimbursementService.updateById(serviceReimbursement2);
+ }
+ }
+
+ //涓撳鍔冲姟璐圭敵璇�
+ serviceFundflowrule.setApplytype("1");
+ List<ServiceFundflowrule> serviceFundflowrules2 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("涓撳鍔冲姟鐨勬渶楂樼瓑绾�:{}", serviceFundflowrules2.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules2.get(0).getTotallevel().longValue(), "1");
+
+ //浼︾悊涓撳鍔冲姟璐圭敵璇�
+ serviceFundflowrule.setApplytype("2");
+ List<ServiceFundflowrule> serviceFundflowrules3 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("浼︾悊涓撳鍔冲姟璐圭敵璇�:{}", serviceFundflowrules3.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules3.get(0).getTotallevel().longValue(), "2");
+
+ //鍖诲鎴愭湰鎶ラ攢
+ serviceFundflowrule.setApplytype("3");
+ List<ServiceFundflowrule> serviceFundflowrules4 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("鍖诲鎴愭湰鎶ラ攢:{}", serviceFundflowrules4.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules4.get(0).getTotallevel().longValue(), "3");
+
+ //鍔炲叕璐圭敤鎶ラ攢
+ serviceFundflowrule.setApplytype("4");
+ List<ServiceFundflowrule> serviceFundflowrules5 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules5.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules5.get(0).getTotallevel().longValue(), "4");
+
+ //缁╂晥瀹℃壒鎶ラ攢
+ serviceFundflowrule.setApplytype("5");
+ List<ServiceFundflowrule> serviceFundflowrules6 = iServiceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules6.get(0).getTotallevel());
+ addFunfShared(serviceFundflowrules6.get(0).getTotallevel().longValue(), "5");
+
+ }
+
+ private void addFunfShared(Long totallevel, String applyType) {
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setFlowlevel(totallevel);
+ serviceFund.setUploadStates(0);
+ serviceFund.setDel_flag(0);
+ serviceFund.setApplytype(applyType);
+ List<ServiceFund> serviceFundList = serviceFundService.queryList(serviceFund);
+ for (ServiceFund serviceFund1 : serviceFundList) {
+ try {
+ log.info("鎻掑叆鍒嗕韩琛ㄧ殑FundID涓猴細{}", serviceFund1.getId());
+ Boolean aBoolean = serviceFundService.addFundSharedInfo(serviceFund1.getId());
+ if (aBoolean) {
+ ServiceFund serviceFund2 = new ServiceFund();
+ serviceFund2.setId(serviceFund1.getId());
+ serviceFund2.setUploadStates(1);
+ boolean b = serviceFundService.updateById(serviceFund2);
+ log.info("serviceReimbursement鏄惁鎻掑叆鎴愬姛{},{}", aBoolean, b);
+ }
+ } catch (Exception e) {
+ ServiceFund serviceFund2 = new ServiceFund();
+ serviceFund2.setId(serviceFund1.getId());
+ serviceFund2.setNotes("鎻掑叆fund鍒嗕韩琛ㄥけ璐�");
+ serviceFundService.updateById(serviceFund2);
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3