From 7cdc66043ad8c484b8eb4597e281a5d8d33e4794 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 八月 2023 16:41:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 490 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 451 insertions(+), 39 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 04e949f..b7f39b1 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
@@ -4,12 +4,16 @@
import com.ruoyi.project.domain.vo.DingTalkReqVo;
import com.ruoyi.project.service.*;
import com.ruoyi.project.service.impl.DingTalkServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
+import org.springframework.util.CollectionUtils;
import java.lang.reflect.Array;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -19,6 +23,7 @@
* @author ruoyi
*/
@Component("ryTask")
+@Slf4j
public class RyTask {
@Autowired
private DingTalkService dingTalkService;
@@ -28,6 +33,9 @@
@Autowired
private IServiceFundSharedService serviceFundSharedService;
+
+ @Autowired
+ private IServiceFunddetailSharedService serviceFunddetailSharedService;
@Autowired
@@ -55,46 +63,450 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- String[] split = serviceFundShared.getCxrjyj().split("&");
- String phone = serviceFundShared.getPhone();
- //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
+ if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
+ //濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
+ String[] split = serviceFundShared.getCxrjyj().split("&");
+ String phone = serviceFundShared.getPhone();
+ //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
+ serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId());
- ServiceFund serviceFund = new ServiceFund();
- serviceFund.setId(serviceFundShared.getSerfunid());
- List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
- ServiceFund serviceFund1 = serviceFunds.get(0);
- serviceFund1.setFlowlevel(0);
- serviceFund1.setDel_flag(0);
- serviceFund1.setBackflowlevel(199);
- serviceFundService.updateById(serviceFund1);
- sendMeg(split, phone,serviceFundShared.getApplytype(),2,serviceFundShared.getSerfunid());
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceFundShared.getSerfunid());
+ List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
+ ServiceFund serviceFund1 = serviceFunds.get(0);
+ serviceFund1.setFlowlevel(100);
+ serviceFund1.setDel_flag(0);
+ serviceFund1.setRecordstatus(-1);
+ serviceFund1.setBackflowlevel(199);
+ serviceFundService.updateById(serviceFund1);
+ sendMeg(split, phone, serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
+ } else {
+ //涓嶆槸閫�鍥炵殑鎿嶄綔
+ if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 0) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceFundShared.getSerfunid());
+ serviceFund.setZffs(serviceFundShared.getZffs());
+ if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
+ serviceFund.setPresident(serviceFundShared.getPresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
+ serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
+ serviceFund.setOfficedirector(serviceFundShared.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
+ serviceFund.setFinancedirector(serviceFundShared.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
+ serviceFund.setFinancechecher(serviceFundShared.getFinancechecher());
+ }
+ serviceFund.setRiqi(serviceFundShared.getRiqi());
+ boolean b = serviceFundService.updateById(serviceFund);
+ log.info("鏇存柊serviceFund閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ //鐢ㄤ笁涓鎵逛汉锛屽鏋滈兘涓虹┖锛屽氨涓虹┖
+ String spname = "";
+ if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
+ serviceFundflow.setCheckusername(serviceFundShared.getPresident().substring(0, serviceFundShared.getPresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getPresident().substring(serviceFundShared.getPresident().indexOf(" ") + 1, serviceFundShared.getPresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spname = spname + serviceFundShared.getPresident() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
+ serviceFundflow.setCheckusername(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getFinvicepresident().substring(serviceFundShared.getFinvicepresident().indexOf(" ") + 1, serviceFundShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spname = spname + serviceFundShared.getFinvicepresident() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
+ serviceFundflow.setCheckusername(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getBusvicepresident().substring(serviceFundShared.getBusvicepresident().indexOf(" ") + 1, serviceFundShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spname = spname + serviceFundShared.getBusvicepresident() + " ";
+ }
+ serviceFundflow.setFlowcontent(spname + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ // 999 閫氳繃
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundShared.setSpjg(1);
+ fundflowService.save(serviceFundflow);
+
+ serviceFundflow.setFlowcontent("宸蹭粯娆� : " + serviceFundShared.getZffs());
+ serviceFundflow.setId(null);
+ fundflowService.save(serviceFundflow);
+ //灏嗗鎵圭姸鎬佹敼鎴�1
+ serviceFundSharedService.updateById(serviceFundShared);
+
+ } else if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 1) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�1锛屽鎵圭粨鏉�,灏变笉绠￠偅浜涢瀵兼槸鍚︾瀛椾簡
+ continue;
+ }
+
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setId(serviceFundShared.getSerfunid());
+ List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
+ if (!CollectionUtils.isEmpty(serviceFunds)) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+
+
+ if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊President锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getPresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getPresident().substring(serviceFundShared.getPresident().indexOf(" ") + 1, serviceFundShared.getPresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFund.setPresident(serviceFundShared.getPresident());
+ serviceFundService.updateById(serviceFund);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ 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.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getFinvicepresident().substring(serviceFundShared.getFinvicepresident().indexOf(" ") + 1, serviceFundShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Finvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getFinvicepresident())) {
+ serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
+ serviceFundService.updateById(serviceFund);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ 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.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceFundShared.getBusvicepresident().substring(serviceFundShared.getBusvicepresident().indexOf(" ") + 1, serviceFundShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Busvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getBusvicepresident())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
+ serviceFundService.updateById(serviceFund);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ 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.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceFundShared.getSerfunid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ }
+ }
}
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Reimbursement鏁版嵁
List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
- String phone = serviceReimbursementShared.getPhone();
- String[] split = serviceReimbursementShared.getCxrjyj().split("&");
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
+ String phone = serviceReimbursementShared.getPhone();
+ String[] split = null;
+ log.info("serviceReimbursementShared.getCxrjyj(): {}", serviceReimbursementShared.getCxrjyj());
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
+ split = serviceReimbursementShared.getCxrjyj().split("&");
+ }
- //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
+ //灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
+ serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
- //灏咶lowlevel 璁剧疆涓�0;
- ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
- serviceReimbursement.setId(serviceReimbursementShared.getReimid());
- List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
- ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
- serviceReimbursement1.setFlowlevel(0L);
- serviceReimbursement1.setDelFlag(0);
- serviceReimbursement1.setBackflowlevel(199L);
- serviceReimbursementService.updateById(serviceReimbursement1);
- sendMeg(split, phone, "0", 1, serviceReimbursementShared.getReimid());
+ //灏咶lowlevel 璁剧疆涓�0;
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setId(serviceReimbursementShared.getReimid());
+ List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
+ ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
+ serviceReimbursement1.setFlowlevel(100L);
+ serviceReimbursement1.setDelFlag(0);
+ serviceReimbursement1.setBackflowlevel(199L);
+ serviceReimbursement1.setRecordstatus(-1);
+ serviceReimbursementService.updateById(serviceReimbursement1);
+ sendMeg(split, phone, "0", 1, serviceReimbursementShared.getReimid());
+ } else {
+ //涓嶆槸閫�鍥炵殑鎿嶄綔
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg() == 0) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�0锛岃鏄庡鎵圭粨鏉燂紝浣嗘暟鎹繕娌℃湁鍚屾鍒癴und琛ㄥ拰fundflow琛�;瀵筬und琛ㄥ拰fundflow琛ㄨ繘琛屾洿鏂帮紝骞跺皢0鏀规垚1
+ ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
+ serviceReimbursement.setId(serviceReimbursementShared.getReimid());
+ serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
+ serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
+
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
+ serviceReimbursement.setPresident(serviceReimbursementShared.getPresident());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
+ serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
+ serviceReimbursement.setOfficedirector(serviceReimbursementShared.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
+ serviceReimbursement.setFinancedirector(serviceReimbursementShared.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
+ serviceReimbursement.setFinancechecher(serviceReimbursementShared.getFinancechecher());
+ }
+ boolean b = serviceReimbursementService.updateById(serviceReimbursement);
+ log.info("鏇存柊serviceReimbursement閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ //鐢ㄤ笁涓鎵逛汉锛屽鏋滈兘涓虹┖锛屽氨涓虹┖
+ String spName = "";
+
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getPresident().substring(0, serviceReimbursementShared.getPresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getPresident().substring(serviceReimbursementShared.getPresident().indexOf(" ") + 1, serviceReimbursementShared.getPresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spName = spName + serviceReimbursementShared.getPresident() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getFinvicepresident().substring(serviceReimbursementShared.getFinvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spName = spName + serviceReimbursementShared.getFinvicepresident() + " ";
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getBusvicepresident().substring(0, serviceReimbursementShared.getBusvicepresident().indexOf(" ")));
+ //鏇存柊鏍￠獙鏃堕棿
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getBusvicepresident().substring(serviceReimbursementShared.getBusvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ serviceFundflow.setCheckTime(parse);
+ spName = spName + serviceReimbursementShared.getBusvicepresident() + " ";
+ }
+ serviceFundflow.setFlowcontent(spName + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ // 999 閫氳繃
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+
+ serviceReimbursementShared.setSpjg(1);
+ fundflowService.save(serviceFundflow);
+ serviceFundflow.setFlowcontent("宸蹭粯娆� : " + serviceReimbursementShared.getZffs());
+ serviceFundflow.setId(null);
+ fundflowService.save(serviceFundflow);
+ serviceReimbursementSharedService.updateById(serviceReimbursementShared);
+
+ } else if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg().equals("1")) {
+ //閽卞凡缁忓埌甯�,骞朵笖瀹℃壒缁撴灉涓�1锛屽鎵圭粨鏉�,灏变笉绠￠偅浜涢瀵兼槸鍚︾瀛椾簡
+ continue;
+ }
+
+ ServiceReimbursement reimbursement = new ServiceReimbursement();
+ reimbursement.setId(serviceReimbursementShared.getReimid());
+ List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(reimbursement);
+ if (!CollectionUtils.isEmpty(serviceReimbursementList)) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date parse = new Date();
+
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getPresident().substring(serviceReimbursementShared.getPresident().indexOf(" ") + 1, serviceReimbursementShared.getPresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊President锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getPresident())) {
+ reimbursement.setPresident(serviceReimbursementShared.getPresident());
+
+ serviceReimbursementService.updateById(reimbursement);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getPresident().substring(0, serviceReimbursementShared.getPresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getPresident().substring(0, serviceReimbursementShared.getPresident().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getFinvicepresident().substring(serviceReimbursementShared.getFinvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getFinvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Finvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getFinvicepresident())) {
+ reimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
+ serviceReimbursementService.updateById(reimbursement);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setCheckTime(parse);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
+ try {
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getBusvicepresident().substring(serviceReimbursementShared.getBusvicepresident().indexOf(" ") + 1, serviceReimbursementShared.getBusvicepresident().length()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Busvicepresident锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getBusvicepresident())) {
+ reimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
+ serviceReimbursementService.updateById(reimbursement);
+
+ //灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ serviceFundflow.setCreateBy("admin");
+ serviceFundflow.setCreateTime(new Date());
+ serviceFundflow.setUpdateBy("admin");
+ serviceFundflow.setUpdateTime(new Date());
+ serviceFundflow.setCheckusername(serviceReimbursementShared.getBusvicepresident().substring(0, serviceReimbursementShared.getBusvicepresident().indexOf(" ")));
+ serviceFundflow.setFlowcontent(serviceReimbursementShared.getBusvicepresident().substring(0, serviceReimbursementShared.getBusvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
+ serviceFundflow.setFlowconclusion(1);
+ serviceFundflow.setFundtype(1);
+ serviceFundflow.setFlowlevel(999);
+ serviceFundflow.setApplytype(null);
+ serviceFundflow.setCheckTime(parse);
+ serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+
+ serviceFundflow.setCheckTime(parse);
+ fundflowService.save(serviceFundflow);
+
+ }
+ //濡傛灉宸茬粡鏇存柊鍒欎笉鍦ㄥ鐞�
+ }
+ }
+ }
}
-
}
+
public void sendMeg(String[] split, String phone, String applyType, Integer fundType, Long fundId) {
//璁板綍鎿嶄綔璁板綍
@@ -112,17 +524,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("13634195431");
- 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