优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -512,9 +512,11 @@
         select distinct bo.sid
         from bus_sales_order bo
         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+        left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-            and bo.financePlan = '2'
+            <!--and bo.financePlan = '2'-->
+            and ls.typeKey = ''
             and length(bv.linkSid)>0
         </where>
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1505,29 +1505,40 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                     }
                 }
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        //极光推送
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        messageFlowVo.setProcInsId(procId1);
+                        messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId());
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
+                        messageFlowableQuery.setBusinessSid(query.getBusinessSid());
+                        messageFlowableQuery.setModuleName("销售订单申请");
+                        ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId1);
+                        String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
+                        List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
+                        String nextName2 = listResultBean2.getData().get(0).getName_();
+                        if ("销售订单申请".equals(nextName2)) {
+                            messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                        } else {
+                            messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        }
 
-                //极光推送
-                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo, messageFlowVo);
-                messageFlowVo.setProcInsId(procId1);
-                messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId());
-                messageFlowableQuery.setUfVo(messageFlowVo);
-                messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
-                messageFlowableQuery.setBusinessSid(query.getBusinessSid());
-                messageFlowableQuery.setModuleName("销售订单申请");
-                ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId1);
-                String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
-                List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
-                String nextName2 = listResultBean2.getData().get(0).getName_();
-                if ("销售订单申请".equals(nextName2)) {
-                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
-                } else {
-                    messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                }
+                        messageFlowableQuery.setMsgTitle("销售订单");
+                        ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 
-                messageFlowableQuery.setMsgTitle("销售订单");
-                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
 
 
                 return rb.success();