跨服务业务判断调整

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -31,6 +31,7 @@ import com.jeeplus.mail.service.MailComposeService;
 import com.jeeplus.mail.service.MailService;
 import com.jeeplus.sys.constant.CommonConstants;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.Global;
 import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -95,16 +96,20 @@ public class FlowableTaskController {
 
     @GetMapping("todo")
     public ResponseEntity todoListData(Page <ProcessVo> page, Flow flow) throws Exception {
+        //各服务引用状态 =》 （若包含，则进行获取该服务的流程信息）
+        String inquireStatus = Global.getConfig("INQUIRE_STATUS");
         Page <ProcessVo> pageList = flowTaskService.todoList(new Page<>(1, -1), flow);
         List<ProcessVo> list = new ArrayList<>();
-        // 访问ccpm
-        Object response = flowRequest.getNotifyList(flow);
-        List<Map<String, Object>> res = JSONObject.parseArray(JSON.toJSONString(response));
-        // ccpm待办查询返回结果
-        List<ProcessVo> processVos = ConvertServiceUtil.convertProcessVoList(res);
-        // 整合全部查询结果
         list.addAll(pageList.getRecords()); // 当前系统查询数据
-        list.addAll(processVos); // ccpm返回数据
+        if(inquireStatus.contains("ccpm")){
+            // 访问ccpm
+            Object response = flowRequest.getNotifyList(flow);
+            List<Map<String, Object>> res = JSONObject.parseArray(JSON.toJSONString(response));
+            // ccpm待办查询返回结果
+            List<ProcessVo> processVos = ConvertServiceUtil.convertProcessVoList(res);
+            // 整合全部查询结果
+            list.addAll(processVos); // ccpm返回数据
+        }
         // 将整合后的结果排序后分页
         Page sortAndPaging = ConvertServiceUtil.getSortAndPaging(page, list);
         return ResponseEntity.ok (sortAndPaging);

jeeplus-web/src/main/resources/application-development.yml

@@ -48,7 +48,7 @@ spring:
         master:
           username: root
           password: root
-          url: jdbc:mysql://192.168.2.4:3306/assess_process_master?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/assess_process_master?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
           driver-class-name: com.mysql.cj.jdbc.Driver
 
           #oracle database settings
@@ -148,7 +148,7 @@ swagger:
 
 #cas服务端的地址
 cas:
-  server-url-prefix: https://www.cainiao.com:8443/cas
+  server-url-prefix: http://www.casserver.com:8443
 #oss配置
 config:
   accessory:
@@ -221,8 +221,8 @@ apptoken: uIJQmTwyGJ
 appsecret: 2NMBqFigKoInmd43Wohxv5aEDKiiHo
 signature: 232a44ee9ebd251d119f0a65628f678e
 
-#signature_http_top: http://192.168.2.130:9182
-signature_http_top: https://3m0m810894.goho.co
+signature_http_top: http://192.168.2.130:9182
+#signature_http_top: https://3m0m810894.goho.co
 
 #竖版模板templateId
 vertical_templateId: 2894156236229259396
@@ -235,7 +235,7 @@ company_round_seal_id_vertical: 2898043523878957918
 #公司方章
 company_parties_seal_id: 2894163220106129636
 #审定单用印流程id
-approval_category_id: 3032955004099797473
+approval_category_id: 3032265972836684447
 #报告用印流程id
 report_category_id: 2895618951099527314
 ##审定内用印流程id
@@ -253,8 +253,10 @@ template_id: 435329
 code_type: 1
 
 #其他系统的地址
-CCPM_PATH:  http://localhost:8888
+CCPM_PATH:  http://localhost:8090
 #待办中展示其他系统的流程
-#ccpm =》 13 报销申请、19 项目登记
+#ccpm =》 13 报销申请、39 项目登记
 CCPM_TASK:  13,39
 
+#各服务引用状态 =》 （若包含，则进行获取该服务的流程信息）
+INQUIRE_STATUS: ccpm