diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java new file mode 100644 index 00000000..08421234 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java @@ -0,0 +1,55 @@ +package com.jero.modules.activiti.process.esAnnualInit.controller; + +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import java.util.ArrayList; + +import static com.jero.common.system.base.controller.JeroController.*; + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标年度制修订标准化发起流程") +@RequestMapping("/process/es/annualInit") +public class ESAnnualInitController { + + /** + * 导入模板下载 + */ + @GetMapping("/templateDownload") + @ApiOperation(value = "企标年度制修订标准化发起流程-导入模板下载", notes = "企标年度制修订标准化发起流程-导入模板下载", + produces = "application/octet-stream") + @AutoLog(value = "企标年度制修订标准化发起流程-导入模板下载") + public ModelAndView templateDownload() { + // AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + String title = "标准化发起导入模板"; + mv.addObject(FILE_NAME, title); + mv.addObject(CLASS, ProcessEsAnnualInit.class); + ExportParams exportParams=new ExportParams(title, title); + // 导出xlsx + exportParams.setType(ExcelType.XSSF); + mv.addObject(PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList()); + return mv; + } + + + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java index 2d23876b..e8f81585 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java @@ -9,11 +9,13 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** @@ -82,26 +84,32 @@ public class ProcessEsAnnualInit implements Serializable { /** * 项目类型 */ + @Excel(name = "制修订类型", width = 15, orderNum = "1") + @Dict(dicCode = "esp_revision_type") private String projectType; /** * 原企标编号 */ + @Excel(name = "原企标编号", width = 15, orderNum = "2") private String originEnStandardNo; /** * 新企标编号 */ + @Excel(name = "新企标编号", width = 15, orderNum = "3") private String newEnStandardNo; /** * 原企标名称 */ + @Excel(name = "原企标名称", width = 15, orderNum = "4") private String originEnStandardName; /** * 新企标名称 */ + @Excel(name = "新企标名称", width = 15, orderNum = "5") private String newEnStandardName; /** @@ -117,6 +125,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 企业标准代号 */ + @Excel(name = "企业标准代号", width = 15, orderNum = "7") private String enStandardCode; /** @@ -147,6 +156,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 草稿计划完成日期 */ + @Excel(name = "新企标名称", width = 15, orderNum = "13") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date draftPlannedCompleteDate; @@ -154,6 +164,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 征求意见稿计划完成日期 */ + @Excel(name = "新企标名称", width = 15, orderNum = "14") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date solicitationDraftPlanCompleteDate; @@ -161,6 +172,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 计划报批日期 */ + @Excel(name = "新企标名称", width = 15, orderNum = "15") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date planApprovalDate; @@ -188,6 +200,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 主起草人 */ + @Excel(name = "主起草人", width = 15, orderNum = "9") @TableField(exist = false) @JsonProperty("mainDraftingUser_dictText") private String mainDraftingUserDictText; @@ -200,6 +213,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 主起草单位 */ + @Excel(name = "主起草单位", width = 15, orderNum = "10") @TableField(exist = false) @JsonProperty("mainDraftingUnit_dictText") private String mainDraftingUnitDictText; @@ -212,6 +226,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 主起草单位责任人 */ + @Excel(name = "主起草单位责任人", width = 20, orderNum = "11") @TableField(exist = false) @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") private String mainDraftingUnitResponsiblePersonDictText; @@ -224,6 +239,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 标准推进人 */ + @Excel(name = "标准推进人", width = 15, orderNum = "12") @TableField(exist = false) @JsonProperty("standardPromoter_dictText") private String standardPromoterDictText; @@ -238,13 +254,10 @@ public class ProcessEsAnnualInit implements Serializable { /** * 变更状态 */ + @Excel(name = "变更状态", width = 15, orderNum = "16") + @Dict(dicCode = "esp_change_status") private String changeStatus; - /** - * 备注 - */ - private String remarks; - /** * 上传附件 */ @@ -258,16 +271,19 @@ public class ProcessEsAnnualInit implements Serializable { /** * 授权部门 */ + @Excel(name = "授权部门", width = 15, orderNum = "6") private String authDept; /** * 配合单位 */ + @Excel(name = "配合单位", width = 15, orderNum = "8") private String cooperationUnit; /** * 联络人 */ + @Excel(name = "联络人", width = 15, orderNum = "17") private String contactUser; /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java new file mode 100644 index 00000000..4bd669f2 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java @@ -0,0 +1,52 @@ +package com.jero.modules.activiti.process.esAnnualReport.controller; + +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import java.util.ArrayList; + +import static com.jero.common.system.base.controller.JeroController.*; + +/** + * @author: Mzaxd + * @Date: 2023/10/18 10:44 + */ +@Slf4j +@RestController +@Api(tags = "企标年度制修订主动上报流程") +@RequestMapping("/process/es/annualReport") +public class ESAnnualReportController { + + /** + * 导入模板下载 + */ + @GetMapping("/templateDownload") + @ApiOperation(value = "企标年度制修订主动上报流程-导入模板下载", notes = "企标年度制修订主动上报流程-导入模板下载") + @AutoLog(value = "企标年度制修订主动上报流程-导入模板下载") + public ModelAndView templateDownload() { + // AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + String title = "各部门主动上报导入模板"; + mv.addObject(FILE_NAME, title); + mv.addObject(CLASS, ProcessEsAnnualReport.class); + ExportParams exportParams=new ExportParams(title, title); + // 导出xlsx + exportParams.setType(ExcelType.XSSF); + mv.addObject(PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList()); + return mv; + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java index 625072ad..46944522 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java @@ -9,11 +9,13 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** @@ -82,26 +84,32 @@ public class ProcessEsAnnualReport implements Serializable { /** * 项目类型 */ + @Excel(name = "制修订类型", width = 15, orderNum = "1") + @Dict(dicCode = "esp_revision_type") private String projectType; /** * 原企标编号 */ + @Excel(name = "原企标编号", width = 15, orderNum = "2") private String originEnStandardNo; /** * 新企标编号 */ + @Excel(name = "新企标编号", width = 15, orderNum = "3") private String newEnStandardNo; /** * 原企标名称 */ + @Excel(name = "原企标名称", width = 15, orderNum = "4") private String originEnStandardName; /** * 新企标名称 */ + @Excel(name = "新企标名称", width = 15, orderNum = "5") private String newEnStandardName; /** @@ -117,6 +125,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 企业标准代号 */ + @Excel(name = "企业标准代号", width = 15, orderNum = "7") private String enStandardCode; /** @@ -147,6 +156,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 草稿计划完成日期 */ + @Excel(name = "新企标名称", width = 15, orderNum = "13") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date draftPlannedCompleteDate; @@ -154,6 +164,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 征求意见稿计划完成日期 */ + @Excel(name = "新企标名称", width = 15, orderNum = "14") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date solicitationDraftPlanCompleteDate; @@ -161,6 +172,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 计划报批日期 */ + @Excel(name = "新企标名称", width = 15, orderNum = "15") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date planApprovalDate; @@ -200,6 +212,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 主起草单位 */ + @Excel(name = "主起草单位", width = 15, orderNum = "9") @TableField(exist = false) @JsonProperty("mainDraftingUnit_dictText") private String mainDraftingUnitDictText; @@ -212,6 +225,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 主起草单位责任人 */ + @Excel(name = "主起草单位责任人", width = 20, orderNum = "10") @TableField(exist = false) @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") private String mainDraftingUnitResponsiblePersonDictText; @@ -224,6 +238,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 标准推进人 */ + @Excel(name = "标准推进人", width = 15, orderNum = "12") @TableField(exist = false) @JsonProperty("standardPromoter_dictText") private String standardPromoterDictText; @@ -257,6 +272,8 @@ public class ProcessEsAnnualReport implements Serializable { /** * 变更状态 */ + @Excel(name = "变更状态", width = 15, orderNum = "16") + @Dict(dicCode = "esp_change_status") private String changeStatus; /** @@ -272,16 +289,19 @@ public class ProcessEsAnnualReport implements Serializable { /** * 授权部门 */ + @Excel(name = "授权部门", width = 15, orderNum = "6") private String authDept; /** * 配合单位 */ + @Excel(name = "配合单位", width = 15, orderNum = "8") private String cooperationUnit; /** * 隶属工作组 */ + @Excel(name = "隶属工作组", width = 15, orderNum = "11") private String workGroup; @TableField(exist = false)