1、增加所有职位统计导出

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/analysis/AnalysisController.java

@@ -19,6 +19,7 @@ import com.citu.module.menduner.system.controller.base.analysis.excel.RecruitJob
 import com.citu.module.menduner.system.convert.InterviewInviteConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.convert.JobCvRelConvert;
+import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.service.interview.InterviewInviteService;
 import com.citu.module.menduner.system.service.job.JobAdvertisedService;
 import com.citu.module.menduner.system.service.job.JobCvRelService;
@@ -150,14 +151,14 @@ public class AnalysisController {
     @Operation(summary = "前N最多人发布的职位类型")
     @PreAuthenticated
     public CommonResult<Map<String, Object[]>> getPositionTypeNumTop(@Valid RecruitAnalysisPageReqVO reqVO) {
-        return success(jobAdvertisedService.getPositionTypeNumTop(reqVO,10));
+        return success(jobAdvertisedService.getPositionTypeNumTop(reqVO, 10));
     }
 
     @GetMapping("/get/job/top")
     @Operation(summary = "最新发布的前N个职位")
     @PreAuthenticated
     public CommonResult<List<RecruitJobAnalysisRespVO>> getEnterpriseUserCount(@Valid RecruitAnalysisPageReqVO reqVO) {
-        return success(jobAdvertisedService.getNewJob(reqVO,10));
+        return success(jobAdvertisedService.getNewJob(reqVO, 10));
     }
 
 
@@ -169,10 +170,17 @@ public class AnalysisController {
         reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<ExcelWriteDTO> writeDTOList = new ArrayList<>();
 
+        reqVO.setJobStatus(null);
         packExcelData(writeDTOList,
                 RecruitJobAnalysisExcelRespVO.class,
                 JobAdvertisedConvert.INSTANCE.convertList6(jobAdvertisedService.getJobNum(reqVO).getList()),
-                "已发布职位明细");
+                "所有职位明细");
+
+        reqVO.setJobStatus(JobStatusEnum.ENABLE.getStatus());
+        packExcelData(writeDTOList,
+                RecruitJobAnalysisExcelRespVO.class,
+                JobAdvertisedConvert.INSTANCE.convertList6(jobAdvertisedService.getJobNum(reqVO).getList()),
+                "发布中职位明细");
 
         packExcelData(writeDTOList,
                 RecruitJobAnalysisExcelRespVO.class,
@@ -201,7 +209,7 @@ public class AnalysisController {
 
 
         // 导出 Excel
-        ExcelUtils.write(response, "统计分析明细.xls",writeDTOList);
+        ExcelUtils.write(response, "统计分析明细.xls", writeDTOList);
     }
 
     public void packExcelData

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

@@ -26,7 +26,7 @@ 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 = "管理后台 - 企业登录用户")
+@Tag(name = "管理后台 - 企业用户")
 @RestController
 @RequestMapping("/menduner/system/enterprise-user-bind")
 @Validated

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/web/AppWebContentController.java

@@ -0,0 +1,39 @@
+package com.citu.module.menduner.system.controller.app.common.web;
+
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.controller.base.web.WebContentRespVO;
+import com.citu.module.menduner.system.dal.dataobject.web.WebContentDO;
+import com.citu.module.menduner.system.service.web.WebContentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+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 javax.annotation.Resource;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "公共 - 页面内容")
+@RestController
+@RequestMapping("/menduner/system/web-content")
+@Validated
+public class AppWebContentController {
+
+    @Resource
+    private WebContentService webContentService;
+
+
+    @GetMapping("/get")
+    @Operation(summary = "获得页面内容")
+    public CommonResult<WebContentRespVO> getWebContent(@RequestParam("id") Long id) {
+        WebContentDO webContent = webContentService.getWebContent(id);
+        return success(BeanUtils.toBean(webContent, WebContentRespVO.class));
+    }
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/analysis/RecruitAnalysisPageReqVO.java

@@ -2,12 +2,14 @@ package com.citu.module.menduner.system.controller.base.analysis;
 
 import com.citu.module.menduner.common.dto.TimeRangeBasePageReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.util.List;
 
 @Schema(description = "menduner - 统计分析公共 Request VO")
 @Data
+@AllArgsConstructor
 public class RecruitAnalysisPageReqVO extends TimeRangeBasePageReqVO {
 
     @Schema(description = "企业id")