diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 2e917a3..9c09a6e 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -901,39 +901,12 @@ public class TodoTaskController { busProcessName.setId(id); busProcessName.setSubmitStatus(SubmitStatusEnum.DELETE.getValue()); this.iBusProcessNameService.updateById(busProcessName); - deleteData(prcType,dataId); + //删除业务数据 + iBusProcessNewService.deleteData(prcType,dataId); return WrapMapper.ok("删除成功"); } - /** - * 删除业务数据 - * @param prcType - * @param dataId - */ - private void deleteData(String prcType, String dataId) { - if ("".equals(prcType)){ - //预览 - powerApplyActDao.deleteByDataId(dataId); - }else if ("1".equals(prcType)){ - //预览 - powerApplyActDao.deleteByDataId(dataId); - } else if ("2".equals(prcType)){ - //预览 + 下载 - powerApplyActDao.deleteByDataId(dataId); - }else if ("3".equals(prcType)){ - //下载 - powerApplyActDao.deleteByDataId(dataId); - } else if("4".equals(prcType)){ - //上传 - ttReportManageActDao.deleteByDataId(dataId); - }else if("5".equals(prcType)){ - //编辑 - ttReportManageActDao.deleteByDataId(dataId); - }else { - throw new AdcDaBaseException("没有流程类型"+prcType); - } - } @ApiOperation(value = "已发流程", notes = "已发流程") @PostMapping("/issuedProcess") diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java index f621790..a58c672 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java @@ -31,4 +31,10 @@ public interface IBusProcessNewService extends IService { List selectEOByTaskId(String prcId); BusProcessNew selectEOByDataId(String prcId); + /** + * 删除业务数据 + * @param prcType + * @param dataId + */ + void deleteData(String prcType, String dataId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java index 58b2745..1c89be6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java @@ -1,13 +1,18 @@ package com.adc.da.wkflow.business_main.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.wkflow.business_main.entity.BusProcessNew; import com.adc.da.wkflow.business_main.mapper.BusProcessNewMapper; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Comparator; @@ -26,8 +31,14 @@ import java.util.stream.Collectors; @Service public class BusProcessNewServiceImpl extends ServiceImpl implements IBusProcessNewService { + @Autowired private TaskService taskService; + @Autowired + private PowerApplyActDao powerApplyActDao; + + @Autowired + private TtReportManageActDao ttReportManageActDao; /* * @Author yuzhong * @Description @@ -78,4 +89,36 @@ public class BusProcessNewServiceImpl extends ServiceImpl