fix: 年度制修订-标准化发起 模板必填调整

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java

@@ -122,7 +122,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 新企标名称
      */
-    @Excel(name = "*新企标名称", width = 15, orderNum = "3")
+    @Excel(name = "新企标名称", width = 15, orderNum = "3")
     @ApiModelProperty(value = "新企标名称")
     private String newEnStandardName;
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -637,6 +637,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String projectType = plan.getProjectType();
         String originEnStandardNo = plan.getOriginEnStandardNo();
         String newEnStandardName = plan.getNewEnStandardName();
+        errMsg.append(excelUtils.validStandardName(newEnStandardName));
         if (StrUtil.isBlank(projectType)) {
             return "'制修订类型'不能为空。";
         }
@@ -645,7 +646,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         }
         // 修订
         if (projectType.equals(ESPProjectType.MODIFY.getName())) {
-            errMsg.append(excelUtils.validStandardName(newEnStandardName));
             // 检查企标编号是否有效
             if (StrUtil.isBlank(originEnStandardNo)) {
                 errMsg.append("'原企标编号'不能为空。");

laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java

@@ -467,7 +467,7 @@ public class ExcelUtils {
 
     public String validStandardName(String value) {
         if (StrUtil.isBlank(value)) {
-            return "'新企标名称不能为空'。";
+            return "";
         }
         if (value.length() > 50) {
             return "'新企标名称'过长（最多50字）。";