更改逻辑删

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

@@ -48,7 +48,7 @@ public class Firm extends BaseEntity {
     @TableField("firm_right")
     private Integer firmRight;
 
-    @Excel(name = "企业状态")
+    @Excel(name = "逻辑删")
     @TableField("firm_staus")
     private Integer firmStaus;
 

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

@@ -24,17 +24,14 @@ public class FirmRequest {
 
     @Excel(name = "企业名称")
     @TableField("firm_name")
-    @NotEmpty(message = "企业名称不能为空")
     private String firmName;
 
     @Excel(name = "企业地址")
     @TableField("firm_address")
-    @NotEmpty(message = "企业地址不能为空")
     private String firmAddress;
 
     @Excel(name = "企业电话")
     @TableField("firm_phone")
-    @NotEmpty(message = "企业电话不能为空")
     private String firmPhone;
 
     @Excel(name = "企业类型")
@@ -65,7 +62,7 @@ public class FirmRequest {
     @TableField("remark")
     private String remark;
 
-    @Excel(name = "企业状态")
+    @Excel(name = "(逻辑删)")
     @TableField("firm_type")
     private Integer firmType;
 

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

@@ -118,6 +118,20 @@ public class FirmController extends BaseController {
         return  result;
     }
 
+    /**
+     * 管理审核是否通过
+     * @author: ZhuoXin
+     * @date: 2023/11/24 9:27
+     * @param: [firm]
+     * @return: com.fate.common.core.domain.Result
+     **/
+    @PostMapping("/manage")
+    public Result manage(@RequestBody FirmRequest firmRequest){
+
+        Result result = firmService.manage(Firm.addReqBuild(firmRequest));
+
+        return result;
+    }
 
 }
 

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

@@ -67,4 +67,13 @@ public interface FirmService extends IService<Firm> {
     Result deleteFirm(Firm firm);
 
 
+    /**
+     * 管理审核是否通过
+     * @author: ZhuoXin
+     * @date: 2023/11/24 9:32
+     * @param: [firm]
+     * @return: com.fate.common.core.domain.Result
+     **/
+    Result manage(Firm firm);
+
 }

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

@@ -83,6 +83,10 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
         if (StringUtils.isNotEmpty(firm.getFirmName())) {
             queryWrapper.like(Firm::getFirmName, firm.getFirmName());
         }
+        if (StringUtils.isNotEmpty(firm.getFirmHead())) {
+            queryWrapper.like(Firm::getFirmHead, firm.getFirmHead());
+        }
+        queryWrapper.eq(Firm::getFirmStaus,1);
         List<Firm> list = firmMapper.selectList(queryWrapper);
         return list;
     }
@@ -108,7 +112,20 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
         return integer>0?Result.success("成功"):Result.error("失败");
     }
 
+    /**
+     * 管理审核是否通过
+     * @param firm
+     * @author: ZhuoXin
+     * @date: 2023/11/24 9:32
+     * @param: [firm]
+     * @return: com.fate.common.core.domain.Result
+     */
+    @Override
+    public Result manage(Firm firm) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoleId();
 
+        return null;
+    }
 
 
 }