From fd2aba8c811704312d3082e0b485a27b0f6bd701 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Sat, 29 Apr 2023 01:23:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=B0=81=E6=9D=BF?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PowerApplyController.java | 5 +-- .../da/report/dao/mysql/PowerApplyActDao.java | 2 ++ .../report/service/IPowerApplyActService.java | 5 ++- .../impl/IpowerApplyActServiceImpl.java | 34 ++++++------------- .../adc/da/report/vo/PowerApplyActPageVO.java | 4 +++ .../mapper/mysql/PowerApplyActMapper.xml | 7 ++++ .../task/TodoTaskController.java | 15 +++++--- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java index e26f332..6e71427 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java @@ -5,6 +5,7 @@ import com.adc.da.report.eo.PowerApply; import com.adc.da.report.service.IPowerApplyActService; import com.adc.da.report.service.IPowerApplyService; import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.PowerApplyActPageVO; import com.adc.da.report.vo.PowerApplyPageVO; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; @@ -129,10 +130,10 @@ public class PowerApplyController { */ @PostMapping("/deleteAct") @ApiOperation(value = "单条/批量删除数据") - public ResponseMessage deleteAct(@RequestBody DeleteParamRequestVO deleteParamRequestVO){ + public ResponseMessage deleteAct(@RequestBody PowerApplyActPageVO powerApplyActPageVO){ //单条/批量删除数据 - iPowerApplyActService.deleteById(deleteParamRequestVO); + iPowerApplyActService.deleteByListPower(powerApplyActPageVO); return Result.success(); } } 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 050cbbb..eda274f 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 @@ -47,5 +47,7 @@ public interface PowerApplyActDao extends BaseMapper { List selectListBydataId(@Param("dataId")String dataId); + List selectListBydataIdNodel(@Param("dataId")String dataId); + int batchDel(@Param("ids") List ids); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java index 5636464..855e458 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java @@ -1,7 +1,6 @@ package com.adc.da.report.service; import com.adc.da.report.eo.PowerApplyAct; -import com.adc.da.report.vo.DeleteParamRequestVO; import com.adc.da.report.vo.PowerApplyActPageVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -48,11 +47,11 @@ public interface IPowerApplyActService { /** - * @param deleteParamVO + * @param powerApplyActPageVO * @return void * @author bu * @date 2023-04-23 * @description 根据id或id数组进行删除 */ - public void deleteById(DeleteParamRequestVO deleteParamVO); + public void deleteByListPower(PowerApplyActPageVO powerApplyActPageVO); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java index 99c5250..56ff25a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java @@ -4,7 +4,6 @@ package com.adc.da.report.service.impl; import com.adc.da.report.dao.mysql.PowerApplyActDao; import com.adc.da.report.eo.PowerApplyAct; import com.adc.da.report.service.IPowerApplyActService; -import com.adc.da.report.vo.DeleteParamRequestVO; import com.adc.da.report.vo.PowerApplyActPageVO; import com.adc.da.util.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,9 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; -import java.util.ArrayList; import java.util.List; /** @@ -81,32 +78,21 @@ public class IpowerApplyActServiceImpl extends ServiceImpl ids = new ArrayList<>(); - - if (!ObjectUtils.isEmpty(deleteParamVO.getId())) { - ids.add(deleteParamVO.getId()); - } - if (!ObjectUtils.isEmpty(deleteParamVO.getIds())) { - ids.addAll(deleteParamVO.getIds()); - } - if (ObjectUtils.isEmpty(deleteParamVO)) { - return; - } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(PowerApplyAct::getId,ids); - PowerApplyAct powerApplyAct = new PowerApplyAct(); - powerApplyAct.setDelFlag(1); - baseMapper.update(powerApplyAct,wrapper); + public void deleteByListPower(PowerApplyActPageVO powerApplyActPageVO) { + List powerApplyList = powerApplyActPageVO.getPowerApplyList(); + for (PowerApplyAct powerApplyAct : powerApplyList) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PowerApplyAct::getPrcId,powerApplyAct.getPrcId()); + wrapper.eq(PowerApplyAct::getReportId,powerApplyAct.getReportId()); + powerApplyAct.setDelFlag(1); + baseMapper.update(powerApplyAct,wrapper); + } } diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java index e460e29..3e625e6 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java @@ -1,5 +1,6 @@ package com.adc.da.report.vo; +import com.adc.da.report.eo.PowerApplyAct; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,6 +17,7 @@ import java.util.List; public class PowerApplyActPageVO extends BasePageVO { + private String id; /** * 流程id */ @@ -137,4 +139,6 @@ public class PowerApplyActPageVO extends BasePageVO { private String fileSize; private String name; + + private List powerApplyList; } 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 7042359..7a9a0ff 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 @@ -104,6 +104,13 @@ rep.name,rep.keycontent,rep.maincontent,rep.DEPARTMENT,rep.year,rep.fileid,rep.confidentialLevel,rep.privacyLevel from a left join TT_REPORT_MANAGE rep on a.report_id = rep.id + where a.data_id = #{dataId} and a.del_flag = 0 + + 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 5566192..5883020 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 @@ -391,14 +391,15 @@ public class TodoTaskController { */ @ApiOperation(value = "详情") @GetMapping("/queryDetail") - public ResponseMessage queryDetail(@RequestParam("prcId") String prcId,@RequestParam("prcType")String prcType) { + public ResponseMessage queryDetail(@RequestParam("prcId") String prcId, @RequestParam("prcType")String prcType, + @RequestParam("tag") Integer tag) { List busProcessNews = iBusProcessNewService.selectEOByTaskId(prcId); if (busProcessNews.size() == 0) { return null; } BusProcessNew busProcessNew = busProcessNews.get(0); // 查找详细业务数据 - BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType); + BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType,tag); //审批数据 List busProcessApproves = busProcessApproveMapper.selectEoByPrcIdAndTask(busProcessNewVO.getPId()); @@ -442,12 +443,18 @@ public class TodoTaskController { return busProcessNewVO; } - private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType) { + private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType, Integer tag) { BusProcessNewVO busProcessNewVO = new BusProcessNewVO(); BeanUtils.copyProperties(busProcessNew,busProcessNewVO); String dataId = busProcessNew.getDataId(); if ("1".equals(prcType)){ - List powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + List powerApplyActs = new ArrayList<>(); + if (tag == 1){ + //代办查看详情 + powerApplyActs = powerApplyActDao.selectListBydataIdNodel(dataId); + }else { + powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + } String string = JSONArray.toJSONString(powerApplyActs); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string);