From 69a66c6330ed60b436ade2f2331eac210dfa7033 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Fri, 12 May 2023 12:00:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportManageConroller.java | 22 ++++++++++++++++++ .../adc/da/report/dao/mysql/ReportDao.java | 5 ++++ .../service/impl/IReportServiceImpl.java | 15 ------------ .../mapper/mysql/ReportManageMapper.xml | 22 ++++++++++++++++++ .../dao/mysql/TtReportManageActDao.class | Bin 1390 -> 1518 bytes .../business_main/entity/BusProcessName.class | Bin 13390 -> 13977 bytes 6 files changed, 49 insertions(+), 15 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index dd007e0..c1f9719 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -116,6 +116,28 @@ public class ReportManageConroller { return Result.success(map); } + /** + * 判断报告名称是否被占用 + * @param vo + * @return + */ + @ApiOperation("判断报告名称是否被占用") + @PostMapping("/isReportNameOccupy") + @ReportLog(description = "新增或编辑") + public ResponseMessage isReportNameOccupy(@RequestBody ReportVo vo) throws IOException { + + long count = reportDao.isReportNameOccupyByEO(vo); + if (count > 0){ + return Result.error("报告名称已存在"); + } + long count1 = reportDao.isReportNameOccupyByAct(vo); + if (count1 > 0){ + return Result.error("报告名称已流程中存在"); + } + + return Result.success(); + } + /** * 报告详情接口 * @param reportId diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java index 9c79032..23c7228 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java @@ -62,6 +62,10 @@ public interface ReportDao extends BaseMapper { long selectByidAndName(@Param("Vo")ReportEntity entity); + long isReportNameOccupyByEO(@Param("Vo")ReportVo Vo); + + long isReportNameOccupyByAct(ReportVo vo); + void saveReportAct(@Param("Vo") TtReportManageAct ttReportManageAct); ReportDetailVo reportDetail(@Param("reportId") String reportId); @@ -72,4 +76,5 @@ public interface ReportDao extends BaseMapper { */ List selectDDL(); + } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index e8df43b..4f894fc 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -623,21 +623,6 @@ public class IReportServiceImpl extends ServiceImpl @Override public List isAct(ReportQueryVo vo) { - boolean flag = false; - //判断是不是管理员 - boolean admin = false; - List roleEOList = roleEODao.selectByuserId(UserUtils.getUserId()); - for (RoleEO roleEO : roleEOList) { - if ("管理员".equals(roleEO.getName())){ - admin= !admin; - } - } - if (admin) { - vo.setUsid(null); - } else { - vo.setUsid(UserUtils.getUserId()); - } - List act = baseMapper.isAct(vo); return act; } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 996259e..efc3d5e 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -250,7 +250,29 @@ + +