diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java index ebdcda5..d514fba 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java @@ -54,4 +54,6 @@ public interface PowerApplyActDao extends BaseMapper { List selectActListBydataId(@Param("dataId")String dataId); int batchDel(@Param("ids") List ids); + + boolean deleteByDataId(String dataId); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java index 931ccdb..d663cfb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java @@ -47,4 +47,7 @@ public interface TtReportManageActDao extends BaseMapper { List selectByDataId(String dataId); TtReportManageAct selectByPrcId(String prcId); + + boolean deleteByDataId(String dataId); + } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml index 9c4a516..4ca2bcd 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -67,6 +67,10 @@ #{id} + + UPDATE power_apply_act set del_flag = 1 + where data_id = #{dataId} + diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml index 00a1a60..0799f1a 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -90,6 +90,10 @@ + + UPDATE set del_flag = 1 + where data_id = #{dataId} + 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 f892965..2e917a3 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 @@ -894,16 +894,47 @@ public class TodoTaskController { @ApiOperation(value = "删除草稿", notes = "删除草稿") @GetMapping("/deleteDraft") - public Wrapper deleteDraft(String id) { + public Wrapper deleteDraft(String id,String prcType,String dataId) { //iBusProcessNameService.removeById(id); //2022-10-11修改为逻辑删除 如果物理删除,会影响发号器计算的编号数量。导致编号重复。 BusProcessName busProcessName = new BusProcessName(); busProcessName.setId(id); busProcessName.setSubmitStatus(SubmitStatusEnum.DELETE.getValue()); this.iBusProcessNameService.updateById(busProcessName); + 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") public Page IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery) { diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index 7debd00..f84279c 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index a075105..fd59f91 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ