ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: UAT变更 标准状态为起草、征求意见、报批等状态时发布日期、实施日期不应是必填项（国标外表导入）

Browse Source
This commit is contained in:
mzaxd
2023-12-07 10:46:15 +08:00
parent 60a7c9b018
commit 520b28eeab
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+4
View File
@@ -178,7 +178,11 @@ public class FieldCommon {
public static final String DEL_FLAG = "del_flag";
public static final String TRY_FLAG = "try_flag";
public static final String RELEASE_DATE = "release_date";
public static final String IMPLEMENTATION_DATE = "implementation_date";
public static final String TRIAL_PERIOD = "trial_period";
// 关联文件
public static final String ASSOCIATED_FILE = "associated_file";
public static final String STANDARD_STATE = "standard_state";
}
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+23 -4
View File
@@ -97,6 +97,8 @@ public class ImportUtil {
Date implementationDate = null;
String implementationDateRow = "";
StringBuilder errMsg = new StringBuilder("第" + line + "行");
boolean isGbFbNeedValidDate = false;
List<String> doNotValidDateStandardStateList = Arrays.asList("起草", "征求意见", "报批");
Map<String, Object> parameterMap = new HashMap<>();
boolean standardValidFlag = false;
// 跳过空行
@@ -236,10 +238,17 @@ public class ImportUtil {
// 必填验证
if (YesOrNoEnum.YES.getValue().equals(tag.getFieldMustInput())) {
if (!this.mustInputValid(cell)) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 ");
continue;
// 国内标准 标准状态为起草 征求意见 报批 状态的发布日期实施日期不是必填项
if (!((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) ||
TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) &&
!isGbFbNeedValidDate &&
(FieldCommon.RELEASE_DATE.equals(tag.getDbFieldName()) ||
FieldCommon.IMPLEMENTATION_DATE.equals(tag.getDbFieldName())))) {
if (!this.mustInputValid(cell)) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 ");
continue;
}
}
}
// 获取当前单元格内容
@@ -309,6 +318,7 @@ public class ImportUtil {
errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("超过50字 ");
}
}
if (FieldShowTypeEnum.MULTI_TEXT.getValue().equals(tag.getFieldShowType())) {
if (cellValue.length() > 500) {
log.error("第" + row + "列字段" + tag.getDbFieldTxt() + "超过500字 ");
@@ -322,6 +332,15 @@ public class ImportUtil {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
} else {
// 如果是国标
if (TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) ||
TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) {
// 标准状态
if (FieldCommon.STANDARD_STATE.equals(tag.getDbFieldName())) {
// 设置是否需要校验发布日期 实施日期
isGbFbNeedValidDate = !doNotValidDateStandardStateList.contains(cellValue);
}
}
// 转为value
cellValue = this.convertDictValue(tag.getDictField(), cellValue);
}