强制终止流程优化

huigou-xt/src/main/webapp/system/bpm/job.js

@@ -1364,10 +1364,10 @@ function forceAbortTask(){
     }
     var url = "";
 
-    if (processDefinitionKey == "sapPurchaseProc"){//采购申请审批
-        url = '/sapPurchaseApproval/forceAbortTask.ajax';
+    if (processDefinitionKey == "sapPurchaseApprovalProc"){//采购申请审批
+        url = '/sapPurchaseApproval/forceAbortPurchaseApproval.ajax';
     }else if (processDefinitionKey == "sapPurchaseOrderProc"){//采购订单审批
-        url = "/sapPurchaseOrder/forceAbortTask.ajax"
+        url = "/sapPurchaseOrder/forceAbortPurchaseOrder.ajax"
     }
     Public.ajax(web_app.name + url,{ jobPageId: taskId,id: bizId },function () {
         closeJobPageAndReloadTaskCenter();

topsun/src/main/java/com/huigou/topsun/sap/common/application/SapMutualEpLogApplication.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.common.application;
 import com.huigou.topsun.sap.common.domain.SapMutualEpLog;
 import com.huigou.topsun.sap.common.domain.query.MutualEpLogQueryRequest;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,4 +25,6 @@ public interface SapMutualEpLogApplication {
      SapMutualEpLog saveSapMutualEpLog(Map<String, Object> map);
 
      Map<String, Object> slicedMutualEpLogQuery(MutualEpLogQueryRequest query);
+
+     List<SapMutualEpLog> findByBusinessId(String businessId);
 }

topsun/src/main/java/com/huigou/topsun/sap/common/application/impl/SapMutualEpLogApplicationImpl.java

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
@@ -82,4 +83,9 @@ public class SapMutualEpLogApplicationImpl extends FlowBroker implements SapMutu
         return this.sqlExecutorDao.executeSlicedQuery(model);
     }
 
+    @Override
+    public List<SapMutualEpLog> findByBusinessId(String businessId) {
+        return sapMutualEpLogRepository.findByBusinessId(businessId);
+    }
+
 }

topsun/src/main/java/com/huigou/topsun/sap/common/repository/SapMutualEpLogRepository.java

@@ -13,4 +13,6 @@ import java.util.List;
 public interface SapMutualEpLogRepository extends JpaRepository<SapMutualEpLog,String> {
 
    // List<SapMutualEpLog> findAllBybusinessType(String businessType);
+
+    List<SapMutualEpLog> findByBusinessId(String businessId);
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -16,6 +16,7 @@ import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
+import com.huigou.topsun.sap.common.domain.SapMutualEpLog;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
 import com.huigou.topsun.sap.purchase.domain.SapPurchase;
 import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
@@ -509,11 +510,21 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     public void abortPurchaseApproval(String id,String jobPageId) {
         //先标记终止状态
         SapPurchaseApproval purchaseApproval = sapPurchaseApprovalRepository.findOne(id);
-        if ("E".equals(purchaseApproval.getType())){
+        List<SapMutualEpLog> logList = sapMutualEpLogApplication.findByBusinessId(purchaseApproval.getId());
+        if (!CollectionUtils.isEmpty(logList)){
+            List<String> types = logList
+                    .stream()
+                    .map(SapMutualEpLog::getType)
+                    .collect(Collectors.toList());
+            if (types.contains("E")){
                 purchaseApproval.setStatusId(BizBillStatus.ABORTED.getId());
                 //删除待办
                 actApplication.deleteRuntimeTaskExtension(jobPageId);
                 sapPurchaseApprovalRepository.save(purchaseApproval);
+            }
+            else {
+                throw new RuntimeException("正常流程不能强制终止");
+            }
         }else {
             throw new RuntimeException("正常流程不能强制终止");
         }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.purchaseOrder.application.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huigou.cache.DictUtil;
@@ -16,6 +17,8 @@ import com.huigou.topsun.common.CommonUtils;
 import com.huigou.topsun.ep.epApplication.EpApplication;
 import com.huigou.topsun.ep.epApplication.EpVo.EpProductInfoVo;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
+import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
+import com.huigou.topsun.sap.common.domain.SapMutualEpLog;
 import com.huigou.topsun.sap.permit.application.SapPermitApplication;
 import com.huigou.topsun.sap.permit.vo.SapPermitItemVo;
 import com.huigou.topsun.sap.permit.vo.SapPermitVo;
@@ -100,6 +103,8 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     private ProcessOutsourceMaterialRepository processOutsourceMaterialRepository;
     @Autowired
     private ProcessQuotedPriceItemApplication processQuotedPriceItemApplication;
+    @Autowired
+    SapMutualEpLogApplication sapMutualEpLogApplication;
 
     @Override
     protected String saveBizAndApprovalData() {
@@ -391,6 +396,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         String url = "pass_approval/approval";
         String type = "";
         String message = "";
+        Map<String, Object> logMap = new HashMap<>();
+        logMap.put("businessType", "采购订单审批");
+        logMap.put("businessId", sapPurchaseOrder.getId());
+        logMap.put("parameter", JSON.toJSONString(param));
         try {
             String result = defaultHttpClient.execute(param, url);
             List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
@@ -398,6 +407,8 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             Map<String, Object> resultMap = resultList.get(0);
             type = (String) resultMap.get("TYPE");
             message = (String) resultMap.get("MESSAGE");
+            logMap.put("TYPE", type);
+            logMap.put("MESSAGE", message);
             if (!"S".equals(type)) {
                 throw new RuntimeException("数据传输失败，请稍后手动重试！" + resultMap.get("MESSAGE"));
             }
@@ -407,6 +418,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             sapPurchaseOrder.setMsgType(type);
             sapPurchaseOrder.setMessage(message);
             this.sapPurchaseOrderRepository.save(sapPurchaseOrder);
+            sapMutualEpLogApplication.saveSapMutualEpLog(logMap);
         }
     }
 
@@ -477,11 +489,21 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     public void abortPurchaseOrder(String id, String jobPageId) {
         //先标记终止状态
         SapPurchaseOrder purchaseOrder = sapPurchaseOrderRepository.findOne(id);
-        if ("E".equals(purchaseOrder.getMsgType())){
+        List<SapMutualEpLog> logList = sapMutualEpLogApplication.findByBusinessId(purchaseOrder.getId());
+        if (!CollectionUtils.isEmpty(logList)){
+            List<String> types = logList
+                    .stream()
+                    .map(SapMutualEpLog::getType)
+                    .collect(Collectors.toList());
+            if (types.contains("E")){
                 purchaseOrder.setStatusId(BizBillStatus.ABORTED.getId());
                 //删除待办
                 actApplication.deleteRuntimeTaskExtension(jobPageId);
                 sapPurchaseOrderRepository.save(purchaseOrder);
+            }
+            else {
+                throw new RuntimeException("正常流程不能强制终止");
+            }
         }else {
             throw new RuntimeException("正常流程不能强制终止");
         }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java

@@ -124,7 +124,7 @@ public class SapPurchaseOrderController extends CommonController {
      * 强制删除待办
      * @return
      */
-    public String forceAbortTask(){
+    public String forceAbortPurchaseOrder(){
         SDO sdo = this.getSDO();
         String id = sdo.getId();
         //任务ID