From cb2b9c0b5425693967037a57177a121528bcfdc9 Mon Sep 17 00:00:00 2001 From: sikadi <13315935+sikadi_love@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 20:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E5=B9=B6=E6=94=B9=E8=BF=9B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fate/firm/domain/Firm.java | 5 ++++ .../fate/firm/domain/request/FirmRequest.java | 4 ++++ .../firm/controller/FirmTypeController.java | 2 -- .../firm/service/impl/FirmServiceImpl.java | 23 +++++++++++++++---- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java b/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java index 26a1197..fc75ad0 100644 --- a/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java +++ b/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java @@ -80,6 +80,10 @@ public class Firm extends BaseEntity { @TableField("firm_head") private String firmHead; + @Excel(name = "逻辑删除") + @TableField("firm_tombstone") + private Integer firmTombstone; + public static Firm addReqBuild(FirmRequest firmRequest){ return Firm.builder() .firmName(firmRequest.getFirmName()) @@ -94,6 +98,7 @@ public class Firm extends BaseEntity { .remark(firmRequest.getRemark()) .firmType(firmRequest.getFirmType()) .firmHead(firmRequest.getFirmHead()) + .firmTombstone(firmRequest.getFirmTombstone()) .build(); } } diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java b/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java index c9ca5a0..64baaa7 100644 --- a/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java +++ b/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java @@ -70,5 +70,9 @@ public class FirmRequest { @TableField("firm_head") private String firmHead; + @Excel(name = "逻辑删除") + @TableField("firm_tombstone") + private Integer firmTombstone; + } diff --git a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java index eec3f8a..e8f9d2a 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java +++ b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmTypeController.java @@ -39,9 +39,7 @@ public class FirmTypeController extends BaseController { **/ @GetMapping("/faultType") public Result> faultType(){ - log.info("功能:查询类型,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); List firmTypes = firmTypeService.list(); - log.info("功能:查询类型,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(), JSON.toJSONString(firmTypes)); return Result.success(firmTypes); } } diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java index f071b03..cd83ff7 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java +++ b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java @@ -1,6 +1,7 @@ package com.fate.firm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fate.common.core.domain.Result; import com.fate.common.core.utils.StringUtils; @@ -45,10 +46,24 @@ public class FirmServiceImpl extends ServiceImpl implements Fi @Override public Result addFirm(Firm firm) { firm.setCreateBy("1"); + if(StringUtils.isEmpty(firm.getFirmName())){ + throw new RuntimeException("企业的公司名不能为空"); + } + if(StringUtils.isEmpty(firm.getFirmAddress())){ + throw new RuntimeException("企业的地址不能为空"); + } + if(StringUtils.isEmpty(firm.getFirmPhone())){ + throw new RuntimeException("企业的电话不能为空"); + } + if(StringUtils.isEmpty(firm.getFirmHead())){ + throw new RuntimeException("企业的否则人不能为空"); + } + if(0 == firm.getFirmType()){ + throw new RuntimeException("没有添加类型"); + } + // 创建企业的时间需要进行一个 firm.setCreateTime(new Date()); - firm.setUpdateBy(null); - firm.setUpdateTime(null); - firm.setFirmStaus(1); // 1提交 2 审核 3通过 4驳回 + firm.setFirmStaus(1); // 1提交中 2 审核 3通过 4驳回 int insert = firmMapper.insert(firm); return insert > 0 ? Result.success("成功") : Result.error("失败"); } @@ -86,7 +101,7 @@ public class FirmServiceImpl extends ServiceImpl implements Fi queryWrapper.like(Firm::getFirmHead, firm.getFirmHead()); } // 逻辑删除 不显示状态为2的 - queryWrapper.eq(Firm::getFirmStaus,1); + queryWrapper.eq(Firm::getFirmTombstone,1); List list = firmMapper.selectList(queryWrapper); return list; }