From 248bc604b1dcb6e168cbd17b74a30ba1a40aab90 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 16 八月 2023 14:38:42 +0800
Subject: [PATCH] 字段修改
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 75 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 34 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 7225a41..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
@@ -34,6 +34,9 @@
@Autowired
private IServiceFundSharedService serviceFundSharedService;
+ @Autowired
+ private IServiceFunddetailSharedService serviceFunddetailSharedService;
+
@Autowired
private IServiceFundService serviceFundService;
@@ -112,18 +115,18 @@
serviceFundflow.setUpdateTime(new Date());
//鐢ㄤ笁涓鎵逛汉锛屽鏋滈兘涓虹┖锛屽氨涓虹┖
String spname = "";
- if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
- serviceFundflow.setCheckusername(serviceFundShared.getOpochecker().substring(0, serviceFundShared.getOpochecker().indexOf(" ")));
+ 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.getOpochecker().substring(serviceFundShared.getOpochecker().indexOf(" ") + 1, serviceFundShared.getOpochecker().length()));
+ parse = simpleDateFormat.parse(serviceFundShared.getPresident().substring(serviceFundShared.getPresident().indexOf(" ") + 1, serviceFundShared.getPresident().length()));
} catch (ParseException e) {
e.printStackTrace();
}
serviceFundflow.setCheckTime(parse);
- spname = spname + serviceFundShared.getOpochecker() + " ";
+ spname = spname + serviceFundShared.getPresident() + " ";
}
if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
serviceFundflow.setCheckusername(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")));
@@ -180,15 +183,15 @@
Date parse = new Date();
- if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
- //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
- if (StringUtils.isEmpty(serviceFunds.get(0).getOpochecker())) {
+ if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊President锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceFunds.get(0).getPresident())) {
try {
- parse = simpleDateFormat.parse(serviceFundShared.getOpochecker().substring(serviceFundShared.getOpochecker().indexOf(" ") + 1, serviceFundShared.getOpochecker().length()));
+ parse = simpleDateFormat.parse(serviceFundShared.getPresident().substring(serviceFundShared.getPresident().indexOf(" ") + 1, serviceFundShared.getPresident().length()));
} catch (ParseException e) {
e.printStackTrace();
}
- serviceFund.setOpochecker(serviceFundShared.getOpochecker());
+ serviceFund.setPresident(serviceFundShared.getPresident());
serviceFundService.updateById(serviceFund);
//灏嗘搷浣滀繚瀛樺埌fundflow琛ㄤ腑
@@ -197,8 +200,8 @@
serviceFundflow.setCreateTime(new Date());
serviceFundflow.setUpdateBy("admin");
serviceFundflow.setUpdateTime(new Date());
- serviceFundflow.setCheckusername(serviceFundShared.getOpochecker().substring(0, serviceFundShared.getOpochecker().indexOf(" ")));
- serviceFundflow.setFlowcontent(serviceFundShared.getOpochecker().substring(0, serviceFundShared.getOpochecker().indexOf(" ")) + "瀹℃壒閫氳繃");
+ 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);
@@ -281,7 +284,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());
@@ -335,18 +342,18 @@
//鐢ㄤ笁涓鎵逛汉锛屽鏋滈兘涓虹┖锛屽氨涓虹┖
String spName = "";
- if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
- serviceFundflow.setCheckusername(serviceReimbursementShared.getOpochecker().substring(0, serviceReimbursementShared.getOpochecker().indexOf(" ")));
+ 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.getOpochecker().substring(serviceReimbursementShared.getOpochecker().indexOf(" ") + 1, serviceReimbursementShared.getOpochecker().length()));
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getPresident().substring(serviceReimbursementShared.getPresident().indexOf(" ") + 1, serviceReimbursementShared.getPresident().length()));
} catch (ParseException e) {
e.printStackTrace();
}
serviceFundflow.setCheckTime(parse);
- spName = spName + serviceReimbursementShared.getOpochecker() + " ";
+ spName = spName + serviceReimbursementShared.getPresident() + " ";
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
serviceFundflow.setCheckusername(serviceReimbursementShared.getFinvicepresident().substring(0, serviceReimbursementShared.getFinvicepresident().indexOf(" ")));
@@ -401,15 +408,15 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date parse = new Date();
- if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
try {
- parse = simpleDateFormat.parse(serviceReimbursementShared.getOpochecker().substring(serviceReimbursementShared.getOpochecker().indexOf(" ") + 1, serviceReimbursementShared.getOpochecker().length()));
+ parse = simpleDateFormat.parse(serviceReimbursementShared.getPresident().substring(serviceReimbursementShared.getPresident().indexOf(" ") + 1, serviceReimbursementShared.getPresident().length()));
} catch (ParseException e) {
e.printStackTrace();
}
- //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊Opochecker锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
- if (StringUtils.isEmpty(serviceReimbursementList.get(0).getOpochecker())) {
- reimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
+ //鍏堟煡璇竴涓媐und鏄惁宸茬粡鏇存柊President锛屽鏋滄病鏈夋洿鏂帮紝鍒欒繘琛屾洿鏂帮紝骞跺線fundflow琛ㄩ噷鎻掍竴鏉℃暟鎹�
+ if (StringUtils.isEmpty(serviceReimbursementList.get(0).getPresident())) {
+ reimbursement.setPresident(serviceReimbursementShared.getPresident());
serviceReimbursementService.updateById(reimbursement);
@@ -419,8 +426,8 @@
serviceFundflow.setCreateTime(new Date());
serviceFundflow.setUpdateBy("admin");
serviceFundflow.setUpdateTime(new Date());
- serviceFundflow.setCheckusername(serviceReimbursementShared.getOpochecker().substring(0, serviceReimbursementShared.getOpochecker().indexOf(" ")));
- serviceFundflow.setFlowcontent(serviceReimbursementShared.getOpochecker().substring(0, serviceReimbursementShared.getOpochecker().indexOf(" ")) + "瀹℃壒閫氳繃");
+ 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);
@@ -517,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(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