From d8812156aae602f6218526fd01d9d23f75badd3f Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 9 Jun 2023 16:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/BusSalesOrderService.java   | 26 ++++++++
 .../FinCompanyInvoicingMapper.xml             |  2 +-
 .../flowable/api/flowtask/FlowableQuery.java  |  2 +
 .../anrui/flowable/biz/flow/FlowableRest.java |  6 +-
 .../biz/flowtask/FlowTaskService.java         | 61 +++++++++++++------
 5 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index d81a6ce795..96b5e68375 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -4620,6 +4620,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //如果创建人与部门主管一样，则自动到下一环节。
+            if(busSalesOrder.get().getCreateBySid().equals(nextNodeUserSids_)){
+                busSalesOrderOne = fetchBySid(businessSid);
+                bv = new BusinessVariables();
+                bv.setModelId(busSalesOrderOne.getProcDefId());
+                bv.setInstanceId(busSalesOrderOne.getProcInstId());
+                bv.setTaskId(busSalesOrderOne.getTaskId());
+                bv.setUserSid(busSalesOrderOne.getCreateBySid());
+                bv.setBusinessSid(busSalesOrderOne.getSid());
+                bv.setTaskDefKey(busSalesOrderOne.getNodeId());
+                Map<String, Object> variabless = getOrderMap(busSalesOrderOne);
+                bv.setFormVariables(variabless);
+                bv.setOrgSidPath(busSalesOrderOne.getOrgSidPath());
+                bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！");
+                return complete(bv);
+
+            }
             //极光推送
             busSalesOrder.set(fetchBySid(businessSid));
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -5326,6 +5343,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         String orderNames = orgName + "<" + customerName + ">" + xilie + "-" + typeValue;
         variables.put("orderNames", orderNames);
+        //增加抄送内部引荐人
+        BusSalesOrderSubmit salesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(busSalesOrder.getSid());
+        if(salesOrderSubmit != null){
+            if(StringUtils.isNotBlank(salesOrderSubmit.getUserSid())){
+                //抄送中增加抄送内部引荐人
+                variables.put("sendRecommendSid",salesOrderSubmit.getUserSid());
+            }
+        }
         return variables;
     }
 
@@ -6570,6 +6595,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         FlowableQuery flowableQuery = new FlowableQuery();
         flowableQuery.setModelId(modelId);
         flowableQuery.setMap(variables);
+        flowableQuery.setTaskDefKey(busSalesOrder.getNodeId());
         ResultBean<List<Map<String,Object>>> yuyanTest = flowTaskFeign.yuyanTest(flowableQuery);
         List<Map<String,Object>> S = yuyanTest.getData();
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
index 2aa9cd7a63..12a098a4cb 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
@@ -37,7 +37,7 @@
     <select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
         select name dictValue, sid, sid as dictKey
         from fin_company_invoicing
-        where useOrgSid = #{useOrgSid}
+        where useOrgSid = #{useOrgSid} and length(purchaseSystemSid)>0
     </select>
 
     <select id="qyFetchListByName" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java
index e8984a0899..d6650e972b 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java
@@ -16,4 +16,6 @@ public class FlowableQuery {
     private String modelId;
 
     private Map<String,Object> map = new HashMap<>();
+
+    private String taskDefKey;
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
index 9d90263fb3..374f910f5f 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@@ -150,7 +150,7 @@ public class FlowableRest implements FlowableFeign {
             userName.append(f.getName()).append(",");
             userSids.append(f.getSid()).append(",");
         });
-        userSids.deleteCharAt(userSids.length() - 1);
+
         //抄送的业务逻辑
         MessageFlowableQuery mfq = new MessageFlowableQuery();
         MessageFlowVo messageFlowVo = new MessageFlowVo();
@@ -191,6 +191,10 @@ public class FlowableRest implements FlowableFeign {
         }else{
             mfq.setMsgTitle(process.get("NAME_"));
         }
+        if(processVariables.containsKey("sendRecommendSid")){//增加的其他的抄送人
+            userSids.append(processVariables.get("sendRecommendSid").toString()).append(",");
+        }
+        userSids.deleteCharAt(userSids.length() - 1);
         mfq.setUserSids(userSids.toString());
         ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
         log.info("抄送成功:{}", userName.toString());
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index b8e3504f9a..49a50d9211 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -2080,29 +2080,56 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         List<Map<String,Object>> list = new ArrayList<>();
         String modelId = flowableQuery.getModelId();
         Map<String,Object> map = flowableQuery.getMap();
+        boolean taskKeyTrue = false;
         List<FlowElement> flowElements = processService.calApprovePath("", modelId,map);
         List<FlowElement> collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList());
         for (int i = 0; i < collect.size(); i++) {
             Map<String,Object> itemMap = new HashMap<>();
                 FlowElement item = collect.get(i);
-                log.info("flowElement:{}", item);
-                log.info("nodeName:{}", item.getName());
-            itemMap.put("nodeName",item.getName());
-                log.info("nodeId:{}", item.getId());
-            itemMap.put("nodeId",item.getId());
-                String s = JSON.toJSONString(item);
-                JSONObject jsonObject = JSONObject.parseObject(s);
-                log.info("item:{}", jsonObject);
-                Object candidateGroups = jsonObject.get("candidateGroups");
-                JSONArray candidateGroups_arr = new JSONArray();
-                if (candidateGroups != null) {
-                    candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
-                }
-                if (candidateGroups_arr.size() > 0) {
-                    log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
+                if(StringUtils.isBlank(flowableQuery.getTaskDefKey())){
+                    log.info("flowElement:{}", item);
+                    log.info("nodeName:{}", item.getName());
+                    itemMap.put("nodeName",item.getName());
+                    log.info("nodeId:{}", item.getId());
+                    itemMap.put("nodeId",item.getId());
+                    String s = JSON.toJSONString(item);
+                    JSONObject jsonObject = JSONObject.parseObject(s);
+                    log.info("item:{}", jsonObject);
+                    Object candidateGroups = jsonObject.get("candidateGroups");
+                    JSONArray candidateGroups_arr = new JSONArray();
+                    if (candidateGroups != null) {
+                        candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
+                    }
+                    if (candidateGroups_arr.size() > 0) {
+                        log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
+                    }
+                    log.info("candidateGroups:{}", candidateGroups_arr);
+                    list.add(itemMap);
+                }else{
+                    if(flowableQuery.getTaskDefKey().equals(item.getId())){
+                        taskKeyTrue = true;
+                    }
+                    if(taskKeyTrue){
+                        log.info("flowElement:{}", item);
+                        log.info("nodeName:{}", item.getName());
+                        itemMap.put("nodeName",item.getName());
+                        log.info("nodeId:{}", item.getId());
+                        itemMap.put("nodeId",item.getId());
+                        String s = JSON.toJSONString(item);
+                        JSONObject jsonObject = JSONObject.parseObject(s);
+                        log.info("item:{}", jsonObject);
+                        Object candidateGroups = jsonObject.get("candidateGroups");
+                        JSONArray candidateGroups_arr = new JSONArray();
+                        if (candidateGroups != null) {
+                            candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
+                        }
+                        if (candidateGroups_arr.size() > 0) {
+                            log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
+                        }
+                        log.info("candidateGroups:{}", candidateGroups_arr);
+                        list.add(itemMap);
+                    }
                 }
-                log.info("candidateGroups:{}", candidateGroups_arr);
-                list.add(itemMap);
         }
         return rb.success().setData(list);
     }