改变实体类，增加删除

fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java

@@ -73,6 +73,10 @@ public class Firm extends BaseEntity {
     @TableField("remark")
     private String remark;
 
+    @Excel(name = "企业类型")
+    @TableField("frim_type")
+    private Integer frimType;
+
     public static Firm addReqBuild(FirmRequest firmRequest){
         return Firm.builder()
                 .firmName(firmRequest.getFirmName())
@@ -85,6 +89,7 @@ public class Firm extends BaseEntity {
                 .updateBy(firmRequest.getUpdateBy())
                 .updateTime(firmRequest.getUpdateTime())
                 .remark(firmRequest.getRemark())
+                .frimType(firmRequest.getFirmType())
                 .build();
     }
 }

fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java

@@ -64,4 +64,8 @@ public class FirmRequest {
     @Excel(name = "备注")
     @TableField("remark")
     private String remark;
+
+    @Excel(name = "企业状态")
+    @TableField("firm_type")
+    private Integer firmType;
 }

fate-firm-common/src/main/java/com/fate/firm/domain/request/PageQuery.java

@@ -0,0 +1,41 @@
+package com.fate.firm.domain.request;
+
+
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fate.common.core.utils.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @description: TODO
+ * @author: SIKADI
+ * @date: 2023/11/21 0:55
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+public class PageQuery {
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+
+    private String orderBy;
+
+
+    public <T> Page<T> builPage(){
+        Page<T> page =new Page<>(this.getPageNum(),this.getPageSize());
+        if(StringUtils.isNotEmpty(this.getOrderBy())){
+            page.addOrder(OrderItem.asc(this.getOrderBy()));
+        }
+        return page;
+    }
+
+
+
+}

fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java

@@ -109,5 +109,23 @@ public class FirmController extends BaseController {
     }
 
 
+    /**
+     * 删除数据
+     * @author: ZhuoXin
+     * @date: 2023/11/20 22:22
+     * @param: [firmRequest]
+     * @return: com.fate.common.core.domain.Result
+     **/
+    @PostMapping("/deleteFirm")
+    public Result deleteFirm(@RequestBody @Validated Firm firm){
+        log.info("功能:删除数据,URI:{},方法:{},参数:{}", request.getRequestURI(), request.getMethod(),JSON.toJSONString(firm));
+        Result result = firmService.deleteFirm(firm);
+        log.info("功能:删除数据,URI:{},方法:{},响应:{}", request.getRequestURI(), request.getMethod(),JSON.toJSONString(firm));
+        return  result;
+    }
+
+
+
+
 }
 

fate-firm-server/src/main/java/com/fate/firm/mapper/FirmMapper.java

@@ -14,4 +14,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FirmMapper extends BaseMapper<Firm> {
+    /**
+     * 修改状态
+     * @author: ZhuoXin
+     * @date: 2023/11/20 22:26
+     * @param: [firm]
+     * @return: java.lang.Integer
+     **/
+    Integer deleteFirm(Firm firm);
 }

fate-firm-server/src/main/java/com/fate/firm/service/FirmService.java

@@ -49,4 +49,12 @@ public interface FirmService extends IService<Firm> {
      **/
     Result updateStatus(Firm firm);
 
+    /**
+     * 修改数据
+     * @author: ZhuoXin
+     * @date: 2023/11/20 22:22
+     * @param: [firm]
+     * @return: com.fate.common.core.domain.Result
+     **/
+    Result deleteFirm(Firm firm);
 }

fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java

@@ -80,4 +80,16 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
         return insert > 0 ? Result.success("成功") : Result.error("失败");
     }
 
+    /**
+     * 删除数据
+     * @author: ZhuoXin
+     * @date: 2023/11/20 22:22
+     * @param: [firm]
+     * @return: com.fate.common.core.domain.Result
+     **/
+    @Override
+    public Result deleteFirm(Firm firm) {
+        Integer integer =  firmMapper.deleteFirm(firm);
+        return integer>0?Result.success("成功"):Result.error("失败");
+    }
 }

fate-firm-server/src/main/resources/mapper/frim/FirmXml.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fate.firm.mapper.FirmMapper">
 
+    <delete id="deleteFirm">
+        delete
+        from t_firm
+        where firm_id = #{firmId};
+    </delete>
 </mapper>