1、增加企业状态字段

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseController.java

@@ -1,33 +1,30 @@
 package com.citu.module.menduner.system.controller.admin.enterprise;
 
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
+import com.citu.framework.apilog.core.annotation.ApiAccessLog;
+import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
-import static com.citu.framework.common.pojo.CommonResult.success;
-
 import com.citu.framework.excel.core.util.ExcelUtils;
-
-import com.citu.framework.apilog.core.annotation.ApiAccessLog;
-import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
-
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.*;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.citu.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 门墩儿-企业信息")
 @RestController
@@ -92,4 +89,12 @@ public class EnterpriseController {
                 BeanUtils.toBean(list, EnterpriseRespVO.class));
     }
 
+    @GetMapping(value = {"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获取企业精简信息列表", description = "只包含被开启的企业，主要用于前端的下拉选项")
+    public CommonResult<List<EnterpriseSimpleRespVO>> getSimpleDeptList() {
+        List<EnterpriseDO> list = enterpriseService.getEnterpriseList(
+                new EnterpriseListReqVO().setStatus(MendunerStatusEnum.NORMAL.getType()));
+        return success(BeanUtils.toBean(list, EnterpriseSimpleRespVO.class));
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseListReqVO.java

@@ -0,0 +1,16 @@
+package com.citu.module.menduner.system.controller.admin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 企业列表 Request VO")
+@Data
+public class EnterpriseListReqVO {
+
+    @Schema(description = "企业名称，模糊匹配", example = "芋道")
+    private String name;
+
+    @Schema(description = "展示状态，参见 MendunerStatusEnum 枚举类", example = "1")
+    private Integer status;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java

@@ -1,11 +1,13 @@
 package com.citu.module.menduner.system.controller.admin.enterprise.vo;
 
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.citu.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -41,6 +43,9 @@ public class EnterprisePageReqVO extends PageParam {
     @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）")
     private Integer scale;
 
+    @Schema(description = "帐号状态（0正常 1停用）")
+    private Integer status;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseRespVO.java

@@ -84,6 +84,10 @@ public class EnterpriseRespVO {
     @ExcelProperty("获得荣誉")
     private String receivedHonors;
 
+    @Schema(description = "帐号状态（0正常 1停用）")
+    @ExcelProperty("帐号状态")
+    private Integer status;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseSaveReqVO.java

@@ -58,4 +58,7 @@ public class EnterpriseSaveReqVO {
     @Schema(description = "获得荣誉")
     private String receivedHonors;
 
+    @Schema(description = "帐号状态（0正常 1停用）")
+    private Integer status;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseSimpleRespVO.java

@@ -0,0 +1,23 @@
+package com.citu.module.menduner.system.controller.admin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "管理后台 - 企业精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EnterpriseSimpleRespVO {
+
+    @Schema(description = "企业编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    private String name;
+
+    @Schema(description = "父企业 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long parentId;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseDO.java

@@ -1,6 +1,5 @@
 package com.citu.module.menduner.system.dal.dataobject.enterprise;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -95,5 +94,9 @@ public class EnterpriseDO extends BaseDO {
      * 获得荣誉
      */
     private String receivedHonors;
+    /**
+     * 帐号状态（0正常 1停用）
+     **/
+    private Integer status;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.dal.mysql.enterprise;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseListReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -31,6 +32,12 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
                 .orderByDesc(EnterpriseDO::getId));
     }
 
+    default List<EnterpriseDO> selectList(EnterpriseListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<EnterpriseDO>()
+                .likeIfPresent(EnterpriseDO::getName, reqVO.getName())
+                .eqIfPresent(EnterpriseDO::getStatus, reqVO.getStatus()));
+    }
+
     default List<EnterpriseDO> selectListByParentId(Collection<Long> parentIds) {
         return selectList(EnterpriseDO::getParentId, parentIds);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.service.enterprise;
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseListReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
@@ -57,7 +58,7 @@ public interface EnterpriseService {
     /**
      * 获得所有子企业，从缓存中
      *
-     * @param id 父部门编号
+     * @param id 父企业编号
      * @return 子企业列表
      */
     Set<Long> getChildEnterpriseIdListFromCache(Long id);
@@ -69,4 +70,14 @@ public interface EnterpriseService {
      * @return 子企业列表
      */
     List<EnterpriseDO> getChildEnterpriseList(Long id);
+
+
+    /**
+     * 筛选企业列表
+     *
+     * @param reqVO 筛选条件请求 VO
+     * @return 企业列表
+     */
+    List<EnterpriseDO> getEnterpriseList(EnterpriseListReqVO reqVO);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.datapermission.core.annotation.DataPermission;
+import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseListReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
@@ -101,4 +102,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         }
         return children;
     }
+
+    @Override
+    public List<EnterpriseDO> getEnterpriseList(EnterpriseListReqVO reqVO) {
+        List<EnterpriseDO> list = enterpriseMapper.selectList(reqVO);
+        list.sort(Comparator.comparing(EnterpriseDO::getName));
+        return list;
+    }
 }