diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index c839d7cd..311aba1a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -20,6 +20,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * @Description: 企标计划 @@ -88,4 +90,11 @@ public class EnterpriseStandardPlanController extends JeroController idList; + @ApiModelProperty(value = "原企标编号") private String originEnStandardNo; @@ -77,4 +87,15 @@ public class ESPlanQueryDTO { @ApiModelProperty(value = "创建日期") private Date createEndDate; + public void transIdsToList() { + if (StrUtil.isBlank(this.selections)) { + return; + } + this.idList = StrUtil.split(this.selections, StrUtil.COMMA); + } + + public void setSelections(String selections) { + this.selections = selections; + this.transIdsToList(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index 6d0e4bc0..cc52ce18 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -23,96 +24,120 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "主键ID") private String id; + @Excel(name = "申请类别", width = 15, orderNum = "1", dicCode = "esp_application_category") @Dict(dicCode = "esp_application_category") @ApiModelProperty(value = "申请类别(制订/修订,立项/变更)") private String applicationCategory; + @Excel(name = "原企标编号", width = 15, orderNum = "1") @ApiModelProperty(value = "原企标编号") private String originEnStandardNo; + @Excel(name = "新企标编号", width = 15, orderNum = "2") @ApiModelProperty(value = "新企标编号") private String newEnStandardNo; + @Excel(name = "原企标名称", width = 15, orderNum = "1") @ApiModelProperty(value = "原企标名称") private String originEnStandardName; + @Excel(name = "新企标名称", width = 15, orderNum = "1") @ApiModelProperty(value = "新企标名称") private String newEnStandardName; + @Excel(name = "授权部门", width = 15, orderNum = "1") @ApiModelProperty(value = "授权部门") private String authDeparts; + @Excel(name = "企业标准代号", width = 15, orderNum = "1") @ApiModelProperty(value = "企业标准代号") private String enStandardCode; + @Excel(name = "配合单位", width = 15, orderNum = "1") @ApiModelProperty(value = "配合单位") private String cooperateDeparts; + @Excel(name = "主起草人", width = 15, orderNum = "1") @ApiModelProperty(value = "主起草人") private String mainDraftingUser; + @Excel(name = "主起草单位", width = 15, orderNum = "1") @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; + @Excel(name = "主起草单位责任人", width = 15, orderNum = "1") @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; + @Excel(name = "标准推进人", width = 15, orderNum = "1") @ApiModelProperty(value = "标准推进人") private String standardPromoter; + @Excel(name = "草稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "草稿计划完成日期") private Date draftPlannedCompleteDate; + @Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "征求意见稿计划完成日期") private Date solicitationDraftPlanCompleteDate; + @Excel(name = "计划报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "计划报批日期") private Date planApprovalDate; + @Excel(name = "草稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "草稿完成日期") private Date draftCompletionDate; + @Excel(name = "提交草稿日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "提交草稿日期") private Date draftSubmissionDate; + @Excel(name = "是否征求意见", width = 15, orderNum = "1", dicCode = "yn") @Dict(dicCode = "yn") @ApiModelProperty(value = "是否征求意见") private String solicitationOpinionEnabled; + @Excel(name = "征求意见稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "征求意见稿完成日期") private Date solicitationDraftCompletionDate; + @Excel(name = "评审日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "评审日期") private Date reviewDate; + @Excel(name = "报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "报批日期") private Date approvalDate; + @Excel(name = "发布日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") private Date releaseDate; + @Excel(name = "项目状态", width = 15, orderNum = "1", dicCode = "esp_project_status") @Dict(dicCode = "esp_project_status") @ApiModelProperty(value = "项目状态") private String projectStatus; + @Excel(name = "变更状态", width = 15, orderNum = "1", dicCode = "esp_change_status") @Dict(dicCode = "esp_change_status") @ApiModelProperty(value = "变更状态") private String changeStatus; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 95cdb2ac..5e3e7cb5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -182,6 +182,12 @@ AND p.create_time BETWEEN #{param.createStartDate} AND #{param.createEndDate} + + AND p.id IN + + #{item} + +