rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加重点单位走访和排查导出功能，增加重点单位detail接口，

dev
luyan 2 years ago
parent
0ffe9e86c8
commit
f91ef20e32
5 changed files with 84 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/EnterpriseInterviewController.java
  2. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/EnterpriseInvestigateController.java
  3. 40
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/KeyEnterpriseController.java
  4. 30
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseInterviewExcel.java
  5. 33
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseInvestigateExcel.java

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/EnterpriseInterviewController.java
View File

@ -1,7 +1,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -11,11 +13,13 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.EnterpriseInterviewDTO;
import com.epmet.dto.KeyEnterpriseDTO;
import com.epmet.dto.form.EnterpriseInterviewFormDTO;
import com.epmet.excel.EnterpriseInterviewExcel;
import com.epmet.service.EnterpriseInterviewService;
import com.epmet.service.KeyEnterpriseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.Map;
@ -85,4 +89,16 @@ public class EnterpriseInterviewController {
return new Result().ok(enterpriseInterviewService.search(formDto));
}
@RequestMapping(value = "/exportExcel")
public void exportExcelByEasyExcel(@RequestBody EnterpriseInterviewFormDTO formDTO, HttpServletResponse response) throws
Exception {
formDTO.setPageNo(NumConstant.ONE);
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
PageData<EnterpriseInterviewDTO> data = enterpriseInterviewService.search(formDTO);
formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
if (null != data && data.getList().size() > 0) {
ExcelUtils.exportExcelToTarget(response, "重点单位走访记录.xls", data.getList(), EnterpriseInterviewExcel.class);
}
}
}

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/EnterpriseInvestigateController.java
View File

@ -1,7 +1,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -11,11 +13,13 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.EnterpriseInvestigateDTO;
import com.epmet.dto.KeyEnterpriseDTO;
import com.epmet.dto.form.EnterpriseInvestigateFormDTO;
import com.epmet.excel.EnterpriseInvestigateExcel;
import com.epmet.service.EnterpriseInvestigateService;
import com.epmet.service.KeyEnterpriseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.Map;
@ -80,6 +84,18 @@ public class EnterpriseInvestigateController {
return new Result();
}
@RequestMapping(value = "/exportExcel")
public void exportExcelByEasyExcel(@RequestBody EnterpriseInvestigateFormDTO formDTO, HttpServletResponse response) throws
Exception {
formDTO.setPageNo(NumConstant.ONE);
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
PageData<EnterpriseInvestigateDTO> data = enterpriseInvestigateService.search(formDTO);
formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
if (null != data && data.getList().size() > 0) {
ExcelUtils.exportExcelToTarget(response, "重点单位排查记录.xls", data.getList(), EnterpriseInvestigateExcel.class);
}
}
@PostMapping("search")
public Result<PageData<EnterpriseInvestigateDTO>> search(@RequestBody EnterpriseInvestigateFormDTO formDto) {

40
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/KeyEnterpriseController.java
View File

@ -1,8 +1,11 @@
package com.epmet.controller;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.enums.DictTypeEnum;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -11,11 +14,17 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.KeyEnterpriseDTO;
import com.epmet.dto.form.KeyEnterpriseFormDTO;
import com.epmet.excel.KeyEnterpriseExcel;
import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.service.KeyEnterpriseService;
import com.epmet.util.ExcelPoiUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -24,6 +33,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-06-19
*/
@Slf4j
@RestController
@RequestMapping("keyEnterprise")
public class KeyEnterpriseController {
@ -49,6 +59,15 @@ public class KeyEnterpriseController {
return new Result<KeyEnterpriseDTO>().ok(data);
}
@PostMapping("detail")
public Result<KeyEnterpriseDTO> detail(@RequestBody KeyEnterpriseFormDTO dto) {
KeyEnterpriseDTO data = keyEnterpriseService.get(dto.getId());
if (null != data) {
buildData(Arrays.asList(data));
}
return new Result<KeyEnterpriseDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody KeyEnterpriseFormDTO dto) {
@ -75,6 +94,27 @@ public class KeyEnterpriseController {
return new Result();
}
@PostMapping("exportTemplate")
public void exportTemplate(HttpServletResponse response) throws Exception {
TemplateExportParams templatePath = new TemplateExportParams("excel/keyEnterprise_template.xlsx");
ExcelPoiUtils.exportExcel(templatePath, new HashMap<>(), "重点企业信息录入表", response);
}
@RequestMapping(value = "/exportExcel")
public void exportExcelByEasyExcel(@RequestBody KeyEnterpriseFormDTO formDTO, HttpServletResponse response) throws
Exception {
formDTO.setPageNo(NumConstant.ONE);
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
PageData<KeyEnterpriseDTO> data = keyEnterpriseService.search(formDTO);
if (null != data && data.getList().size() > 0) {
buildData(data.getList());
}
formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
if (null != data && data.getList().size() > 0) {
ExcelUtils.exportExcelToTarget(response, "重点单位名单.xls", data.getList(), KeyEnterpriseExcel.class);
}
}
@PostMapping("search")
public Result<PageData<KeyEnterpriseDTO>> search(@RequestBody KeyEnterpriseFormDTO formDto) {
PageData<KeyEnterpriseDTO> page = keyEnterpriseService.search(formDto);

30
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseInterviewExcel.java
View File

@ -14,13 +14,10 @@ import java.util.Date;
@Data
public class EnterpriseInterviewExcel {
@Excel(name = "主键ID")
private String id;
@Excel(name = "企业名称")
private String unitName;
@Excel(name = "走访企业ID")
private String enterpriseId;
@Excel(name = "走访时间")
@Excel(name = "走访时间",exportFormat = "yyyy-MM-dd")
private Date invTime;
@Excel(name = "走访人员(多个以“,”相隔)")
@ -29,7 +26,7 @@ public class EnterpriseInterviewExcel {
@Excel(name = "走访人员职务")
private String jobType;
@Excel(name = "走访方式 ")
@Excel(name = "走访方式 ", replace = {"电话走访_0", "实际走访_1"})
private String interviewType;
@Excel(name = "企业问题")
@ -38,23 +35,4 @@ public class EnterpriseInterviewExcel {
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标识：0.未删除 1.已删除")
private Integer delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

33
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseInvestigateExcel.java
View File

@ -3,8 +3,6 @@ package com.epmet.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 日照：企业排查管理
*
@ -14,41 +12,22 @@ import java.util.Date;
@Data
public class EnterpriseInvestigateExcel {
@Excel(name = "主键ID")
private String id;
@Excel(name = "排查企业ID")
private String enterpriseId;
@Excel(name = "排查企业名称")
private String unitName;
@Excel(name = "排查主题")
private String title;
@Excel(name = "排查时间",exportFormat = "yyyy-MM-dd")
private String invTime;
@Excel(name = "排查人员(多个以“,”相隔)")
private String staffs;
@Excel(name = "排查结果")
@Excel(name = "排查结果", replace = {"合格_0", "不合格_1"})
private String consequence;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标识：0.未删除 1.已删除")
private Integer delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}
Write Preview
Loading…
Cancel
Save