From b0e116f51e9d90a7d2d3bad9c9a9a3ae21d51af2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 14 Sep 2023 15:17:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardPlanController.java | 30 +++++++++++++++---- .../xml/EnterpriseStandardPlanMapper.xml | 2 +- .../EnterpriseStandardPlanService.java | 2 ++ .../EnterpriseStandardPlanServiceImpl.java | 10 +++++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index 61bcd3ac..11684402 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -11,14 +11,12 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; - /** * @Description: 企标计划 * @Author: jero-boot @@ -48,4 +46,26 @@ public class EnterpriseStandardPlanController extends JeroController pageList= esPlanService.queryPageList(esPlanQueryDTO, pageNo, pageSize); return Result.OK(pageList); } + + /** + * 通过id删除 + * + * @param + * @return + */ + @AutoLog(value = "企标计划-通过id删除") + @ApiOperation(value = "企标计划-通过id删除", notes = "企标计划-通过id删除") + @PostMapping(value = "/delete") + public Result deleteEN(String id) { + if (StringUtils.isBlank(id)) { + return Result.error("参数不识别！"); + } + EnterpriseStandardPlan esPlan = esPlanService.getById(id); + if (esPlan == null) { + return Result.error("未找到对应实体"); + } else { + esPlanService.deleteById(id); + } + return Result.OK(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 628e313b..32e0192b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -125,7 +125,7 @@ FROM laws_enterprise_standard_plan_cooperate_unit AS cu LEFT JOIN sys_depart AS d ON d.id = cu.dept_id) AS cu ON cu.id = p.id - WHERE 1 = 1 + WHERE p.del_flag = 0 AND p.origin_en_standard_no LIKE CONCAT('%',#{param.originEnStandardNo},'%') diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java index 092c1f0a..75ea3954 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java @@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface EnterpriseStandardPlanService extends IService { IPage queryPageList(ESPlanQueryDTO esPlan, Integer pageNo, Integer pageSize); + + void deleteById(String id); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java index 27cb642b..5abfad43 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,6 +12,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardPlanMapper; +import com.jero.modules.projectLibrary.entity.LawsProjectLibrary; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,6 +48,14 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(EnterpriseStandardPlan::getId, id); + wrapper.set(EnterpriseStandardPlan::getDelFlag, 1); + update(wrapper); + } + // 转换列表中的状态值为中文 private void transESPlanVo(List list) { if (list.isEmpty()) {