From fa302fa6e40c2f8db48820f877a1bb57a49b68bc Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 1 Nov 2024 20:23:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainProjectCompleteDetailController.java | 9 +++++++++ .../service/IMainProjectCompleteDetailService.java | 2 ++ .../impl/MainProjectCompleteDetailServiceImpl.java | 13 +++++++++++++ .../impl/MainProjectCompleteNameServiceImpl.java | 5 +++++ .../service/impl/WorkerAdmissionServiceImpl.java | 4 ++++ .../service/impl/ExamTrainRecordServiceImpl.java | 4 ++-- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java index a2657d32a..92dd7c578 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java @@ -118,6 +118,15 @@ public class MainProjectCompleteDetailController { return Result.ok(); } + @OperLog(operModul = "主要工程量完成情况详情表管理", operType = "删除", operDesc = "删除主要工程量完成情况详情表信息") + @ApiOperation(value = "删除主要工程量完成情况详情表信息", notes = "删除主要工程量完成情况详情表信息", httpMethod = "POST") + @ApiImplicitParam(name = "nameId", value = "主要工程量完成情况名称id", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteByNameId") + public Result deleteByNameId(@ApiIgnore @RequestBody HashMap map) { + mainProjectCompleteDetailService.deleteByNameId(MapUtils.getString(map, "nameId")); + return Result.ok(); + } + /** * 通过id查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java index 7d38ef7e5..1ed7d16c5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java @@ -64,4 +64,6 @@ public interface IMainProjectCompleteDetailService extends IService map); void projectOverviewExportXls(HttpServletRequest request, HttpServletResponse response, HashMap param); + + void deleteByNameId(String id); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java index a390bf88f..63d6eb15f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java @@ -26,6 +26,7 @@ import org.apache.commons.collections.MapUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -57,6 +58,9 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl queryPageList(HashMap param) { @@ -591,6 +595,15 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl() + .eq(MainProjectCompleteDetail::getMainProjectCompleteNameId, id)); + mainProjectCompleteTotalService.remove(new LambdaQueryWrapper() + .eq(MainProjectCompleteTotal::getMainProjectCompleteNameId, id)); + } + private void styleCustom(Workbook workbook) { CellStyle style = workbook.createCellStyle(); style.setAlignment(HorizontalAlignment.CENTER); diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteNameServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteNameServiceImpl.java index 6d19ca7ae..f74141148 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteNameServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteNameServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.baotou.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -121,6 +122,10 @@ public class MainProjectCompleteNameServiceImpl extends ServiceImpl children = baseMapper.getChildren(Long.valueOf(id)); + if (CollUtil.isNotEmpty(children)) { + throw new OpenAlertException("请先删除下级"); + } baseMapper.deleteById(id); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java index 8186e2185..fc6aa0c76 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java @@ -294,6 +294,10 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl certificateIssuingPersons = workerAdmissionService.list(new LambdaQueryWrapper() .in(WorkerAdmission::getId, admissionIds)).stream().map(WorkerAdmission::getCertificateIssuingPerson).distinct().collect(Collectors.toList()); noticeService.addUsersNotice(certificateIssuingPersons, "入场培训不合格通知", - StrUtil.format("{}(身份证号：{})参加考试科目为{}试题名称为{}的入场培训不合格", + StrUtil.format("{}(身份证号：{})，参加考试科目为{}，试题名称为{}，入场培训不合格", r.getWorkerName(), r.getWorkerCard(), subject.getName(), examPaper.getName()), "10"); } } @@ -333,7 +333,7 @@ public class ExamTrainRecordServiceImpl extends ServiceImpl