From 49594433e797d03da3453240bb89186dcf136619 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 八月 2023 19:41:42 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 23 ++++++++++++-----------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java | 12 +++++++-----
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 2 +-
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
index 51d48ef..90b5856 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
@@ -84,11 +84,13 @@
body = response2.getBody();
// 瑙ｆ瀽涓篔SONObject
JSONObject jsonObject = JSONObject.parseObject(body);
- // 鎻愬彇鍑篔SONArray
- JSONArray jsonArray = new JSONArray(jsonObject.getJSONObject("result").getJSONArray("userid_list"));
- // 灏咼SONArray杞负List鍒楄〃
- String str = JSONObject.toJSONString(jsonArray);
- userIdlist = JSONObject.parseObject(str, List.class);
+ if (jsonObject != null) {
+ // 鎻愬彇鍑篔SONArray
+ JSONArray jsonArray = new JSONArray(jsonObject.getJSONObject("result").getJSONArray("userid_list"));
+ // 灏咼SONArray杞负List鍒楄〃
+ String str = JSONObject.toJSONString(jsonArray);
+ userIdlist = JSONObject.parseObject(str, List.class);
+ }
}
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 7ce7a15..02fefa1 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
@@ -151,7 +151,7 @@
serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
serviceFunddetailShareds.get(i).setId(null);
//鏁版嵁鍙戦�佺粰璐㈠姟
- uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
+ // uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
}
boolean result = detailSharedService.saveBatch(serviceFunddetailShareds);
return result;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index 98428b7..c39f939 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -148,7 +148,7 @@
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("rbid", id);
//鑾峰彇璇︽儏鏁版嵁
- List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
+ List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
log.info("serviceReimbursementdetailMapper.selectByMap鏂规硶鐨勮繑鍙傚弬 :{}", CollectionUtils.isEmpty(details) ? null : details.size());
//鑾峰彇鏀粯鏁版嵁
List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap);
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 1d6ab7c..5e8313c 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
@@ -60,7 +60,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- if (serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
+ if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
//濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
String[] split = serviceFundShared.getCxrjyj().split("&");
String phone = serviceFundShared.getPhone();
@@ -71,8 +71,9 @@
serviceFund.setId(serviceFundShared.getSerfunid());
List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund);
ServiceFund serviceFund1 = serviceFunds.get(0);
- serviceFund1.setFlowlevel(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());
@@ -90,13 +91,13 @@
serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
}
if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
- serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector());
+ serviceFund.setOfficedirector(serviceFundShared.getOfficedirector());
}
if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
- serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector());
+ serviceFund.setFinancedirector(serviceFundShared.getFinancedirector());
}
if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
- serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher());
+ serviceFund.setFinancechecher(serviceFundShared.getFinancechecher());
}
serviceFund.setRiqi(serviceFundShared.getRiqi());
boolean b = serviceFundService.updateById(serviceFund);
@@ -275,7 +276,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Reimbursement鏁版嵁
List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
- if (serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
String phone = serviceReimbursementShared.getPhone();
String[] split = serviceReimbursementShared.getCxrjyj().split("&");
@@ -287,7 +288,7 @@
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
List<ServiceReimbursement> serviceReimbursementList = serviceReimbursementService.queryList(serviceReimbursement);
ServiceReimbursement serviceReimbursement1 = serviceReimbursementList.get(0);
- serviceReimbursement1.setFlowlevel(0L);
+ serviceReimbursement1.setFlowlevel(100L);
serviceReimbursement1.setDelFlag(0);
serviceReimbursement1.setBackflowlevel(199L);
serviceReimbursement1.setRecordstatus(-1);
@@ -302,7 +303,7 @@
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
-
+
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
}
@@ -310,13 +311,13 @@
serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
- serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector());
+ serviceReimbursement.setOfficedirector(serviceReimbursementShared.getOfficedirector());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
- serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector());
+ serviceReimbursement.setFinancedirector(serviceReimbursementShared.getFinancedirector());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
- serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher());
+ serviceReimbursement.setFinancechecher(serviceReimbursementShared.getFinancechecher());
}
boolean b = serviceReimbursementService.updateById(serviceReimbursement);
log.info("鏇存柊serviceReimbursement閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
--
Gitblit v1.9.3