From 11e8b2c59487f2e0f2ab17e120e50dfbc1e4e4f0 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 23 Oct 2023 15:49:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=AF=BC=E5=85=A5=E7=BF=BB=E8=AF=91Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessEsAnnualInit.java | 3 --- .../entity/ProcessEsAnnualReport.java | 25 ++++++++++--------- .../ProcessEsAnnualReportServiceImpl.java | 8 +++--- 3 files changed, 16 insertions(+), 20 deletions(-) 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 0d386f79..7314f254 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 @@ -15,7 +15,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelVerify; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; @@ -228,7 +227,6 @@ public class ProcessEsAnnualInit implements Serializable { */ @Excel(name = "主起草人", width = 15, orderNum = "9") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") - @NotNull @ApiModelProperty(value = "主起草人") private String mainDraftingUser; @@ -237,7 +235,6 @@ public class ProcessEsAnnualInit implements Serializable { */ @Excel(name = "主起草单位", width = 15, orderNum = "10") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") - @NotNull @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; 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 05a693ca..a02cdb5c 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 @@ -114,14 +114,14 @@ public class ProcessEsAnnualReport implements Serializable { /** * 原企标名称 */ - @Excel(name = "原企标名称", width = 15, orderNum = "4") + @Excel(name = "原企标名称", width = 15, orderNum = "3") @ApiModelProperty(value = "原企标名称") private String originEnStandardName; /** * 新企标名称 */ - @Excel(name = "新企标名称", width = 15, orderNum = "5") + @Excel(name = "新企标名称", width = 15, orderNum = "4") @ApiModelProperty(value = "新企标名称") private String newEnStandardName; @@ -140,7 +140,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 企业标准代号 */ - @Excel(name = "企业标准代号", width = 15, orderNum = "7") + @Excel(name = "企业标准代号", width = 15, orderNum = "6") @Dict(dicCode = "enterprise_standard_code") @ApiModelProperty(value = "企业标准代号") private String enStandardCode; @@ -178,7 +178,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 草稿计划完成日期 */ - @Excel(name = "草稿计划完成日期", width = 20, orderNum = "13") + @Excel(name = "草稿计划完成日期", width = 20, orderNum = "12") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "草稿计划完成日期") @@ -187,7 +187,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 征求意见稿计划完成日期 */ - @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "14") + @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "13") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "征求意见稿计划完成日期") @@ -196,7 +196,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 计划报批日期 */ - @Excel(name = "计划报批日期", width = 15, orderNum = "15") + @Excel(name = "计划报批日期", width = 15, orderNum = "14") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "计划报批日期") @@ -229,14 +229,15 @@ public class ProcessEsAnnualReport implements Serializable { /** * 主起草单位 */ - @Excel(name = "主起草单位", width = 15, orderNum = "9") + @Excel(name = "主起草单位", width = 15, orderNum = "8") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; /** * 主起草单位责任人 */ - @Excel(name = "主起草单位责任人", width = 20, orderNum = "10") + @Excel(name = "主起草单位责任人", width = 20, orderNum = "9") @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username") @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; @@ -244,7 +245,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 标准推进人 */ - @Excel(name = "标准推进人", width = 15, orderNum = "12") + @Excel(name = "标准推进人", width = 15, orderNum = "11") @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username") @ApiModelProperty(value = "标准推进人") private String standardPromoter; @@ -301,7 +302,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 授权部门 */ - @Excel(name = "授权部门", width = 15, orderNum = "6") + @Excel(name = "授权部门", width = 15, orderNum = "5") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "授权部门") private String authDept; @@ -309,7 +310,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 配合单位 */ - @Excel(name = "配合单位", width = 15, orderNum = "8") + @Excel(name = "配合单位", width = 15, orderNum = "7") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "配合单位") private String cooperationUnit; @@ -317,7 +318,7 @@ public class ProcessEsAnnualReport implements Serializable { /** * 隶属工作组 */ - @Excel(name = "隶属工作组", width = 15, orderNum = "11") + @Excel(name = "隶属工作组", width = 15, orderNum = "10") @Dict(dictTable = "laws_working_group", dicCode = "id", dicText = "name") @ApiModelProperty(value = "隶属工作组") private String workGroup; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index d97dedf8..b7273efb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -117,12 +117,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl