Przeglądaj źródła

Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

wangliang 1 rok temu
rodzic
commit
24dedda7ea

+ 5 - 2
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesAllocationServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.bean.params.AllocationParam;
 import com.qmth.sop.business.bean.params.AutoAllocationParam;
 import com.qmth.sop.business.bean.params.SopPublishParam;
@@ -48,6 +49,8 @@ public class TBUserArchivesAllocationServiceImpl extends ServiceImpl<TBUserArchi
     private TBSopInfoService tbSopInfoService;
     @Resource
     private TFCustomFlowService tfCustomFlowService;
+    @Resource
+    private ActivitiService activitiService;
 
     @Override
     public IPage<UserArchivesAllocationResult> findCrmAllocationPage(Long serviceUnitId, String province, String city, String area, String customName, Integer gap, Integer pageNumber, Integer pageSize) {
@@ -459,8 +462,8 @@ public class TBUserArchivesAllocationServiceImpl extends ServiceImpl<TBUserArchi
             throw ExceptionResultEnum.ERROR.exception("只有'已发布'状态的派单才能撤回,该派单当前状态为[" + tbCrm.getStatus() + "]");
         }
         tbCrmService.updateCrmStatus(crmNo, CrmStatusEnum.UN_PUBLISH);
-        // TODO: 2023/9/8 流程作废
-
+        // 流程作废
+        activitiService.flowEnd(crmNo);
     }
 
     /**