Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/bpmn/provider/BpmInstHisProvider.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.bpmn.provider;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -8,6 +9,8 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.web.util.AppFileUtil;
 import com.lc.ibps.common.msg.persistence.entity.InnerMessagePo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -112,6 +115,21 @@ public class BpmInstHisProvider extends GenericProvider implements IBpmInstHisSe
 		return result;
 	}
 
+	@Override
+	public APIResult<Void> exportMonth(String[] formDataTemplateIds) {
+		String rootRealPath = "F:" + StringPool.SLASH + AppFileUtil.getBasePath(); // 操作的根目录
+		logger.warn("<========rootRealPath====={}.", rootRealPath);
+		File dir = new File(rootRealPath);
+		if (!dir.exists() || (dir.exists() && dir.isFile())) {
+			logger.warn("dir.mkdirs()====================================================");
+			dir.mkdirs();
+		}
+		// select *from IBPS_CAT_TYPE 	where CATEGORY_KEY_='FLOW_TYPE' order by depth_;
+
+
+		return null;
+	}
+
 	/**
 	 * 【流程实例历史】明细页面
 	 * @param id

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmReceivedProvider.java

@@ -199,7 +199,7 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
 			try{
 				String timeObj = part.split(",")[0];
 				String loseDate = timeObj.substring(timeObj.indexOf(":")+1).replace("\"", "");
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 				Date deadline = sdf.parse(loseDate);
 				Date currentTime = new Date();
 				// 如果当前时间在截止日期之后，则已超时

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/ToDoMessagePushJob.java

@@ -77,7 +77,7 @@ public class ToDoMessagePushJob extends BaseJob2 {
                             try{
                                 String timeObj = part.split(",")[0];
                                 String loseDate = timeObj.substring(timeObj.indexOf(":")+1).replace("\"", "");
-                                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                 Date deadline = sdf.parse(loseDate);
                                 Date currentTime = new Date();
                                 if (currentTime.after(deadline)) {