FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!51
This commit is contained in:
高嵩
2023-06-14 12:00:01 +08:00
parent 34b616dede 4e4ed04d1c
commit e708e6338d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
//获取当前文件路径 返回文件路径的数字组 //获取当前文件路径 返回文件路径的数字组
try { try {
String editFilePath = busProcessModelHis.getEditFilePath(); String editFilePath = busProcessModelHis.getEditFilePath();
File file = new File("/data/slrs/file/"+editFilePath); File file = new File(filePath+editFilePath);
FileInputStream fileInputStream = new FileInputStream(file); FileInputStream fileInputStream = new FileInputStream(file);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(1024); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(1024);
byte [] aByte = new byte[1024]; byte [] aByte = new byte[1024];
src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java
+4 -2
View File
@@ -220,8 +220,10 @@ public class ScheduledSarBussionessStandReview {
if (jsonObject != null) { if (jsonObject != null) {
Object reviewTime = jsonObject.get("reviewTime"); Object reviewTime = jsonObject.get("reviewTime");
if (reviewTime != null) { if (reviewTime != null) {
// String reviewTimeDate = reviewTime.toString(); String reviewTimeDate = reviewTime.toString();
String reviewTimeDate = "2023-06-12"; logger.info("====================================复审时间"+reviewTimeDate+"！！！！=========================================");
// String reviewTimeDate = "2023-06-12";
// String reviewTimeDate = "2023-06-15"; // String reviewTimeDate = "2023-06-15";
//今天的时间 //今天的时间
if (StringUtils.isNotBlank(reviewTimeDate)) { if (StringUtils.isNotBlank(reviewTimeDate)) {