diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java index 0a00fb52..875e25d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java @@ -33,4 +33,14 @@ public enum ESPProjectType { this.name = name; this.value = value; } + + public static String getValueByName(String name) { + for (ESPProjectType type : ESPProjectType.values()) { + if (type.getName().equals(name)) { + return type.getValue(); + } + } + return ESPProjectType.ENACT.getValue(); // 返回ENACT枚举值对应的value值 + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java index 48bb51d7..06143e34 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java @@ -13,7 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; public class EnterpriseStandardPlanImport { @Excel(name = "*制修订类型", width = 15, orderNum = "0") - private String editType; + private String applicationCategory; @Excel(name = "*原企标编号", width = 15, orderNum = "1") private String originEnStandardNo; @@ -87,7 +87,7 @@ public class EnterpriseStandardPlanImport { * 判断是否是无用行 */ public boolean isBlankRow() { - return StringUtils.isBlank(editType) && + return StringUtils.isBlank(applicationCategory) && StringUtils.isBlank(originEnStandardNo) && StringUtils.isBlank(newEnStandardNo) && StringUtils.isBlank(projectStatus) && @@ -99,7 +99,7 @@ public class EnterpriseStandardPlanImport { * 判断是否是无用行 */ public boolean isUselessRow() { - return !"制定".equals(editType) && !"修订".equals(editType); + return !"制定".equals(applicationCategory) && !"修订".equals(applicationCategory); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java index b8e621b7..39649726 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java @@ -200,6 +200,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl