GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
zhuangdashia 2025-09-04 23:36:52 +08:00
parent 7c49301ce1
commit 9a3041ed12
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cds-fontend-2025.V1/src/views/mps/detail-entry/modules/detail-entry-search.vue
View File

@ -35,7 +35,7 @@ async function getSubcategoryOptions() {
if (!error) { if (!error) {
subcategoryIdOptions.value = data.map(item => ({ subcategoryIdOptions.value = data.map(item => ({
label: item.name, label: item.name,
value: item.id value: item.typeId
})); }));
} }
} }

5
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalWaterImportVo.java
View File

@ -4,6 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.annotation.ExcelRequired; import org.dromara.common.excel.annotation.ExcelRequired;
@ -168,7 +169,8 @@ public class OriginalWaterImportVo implements Serializable {
* 缴费日期 * 缴费日期
*/ */
@ExcelProperty(value = "缴费日期") @ExcelProperty(value = "缴费日期")
@Pattern(message = "缴费日期错误", regexp = "^\\d{4}(-?)(0[1-9]|1[0-2])\\1(0[1-9]|[12][0-9]|3[01])$") // @Pattern(message = "缴费日期错误", regexp = "^\\d{4}(-?)(0[1-9]|1[0-2])\\1(0[1-9]|[12][0-9]|3[01])$")
@NotNull(message = "缴费日期不能为空")
private String paymentDate; private String paymentDate;
/** /**
@ -189,6 +191,7 @@ public class OriginalWaterImportVo implements Serializable {
* 计价月份 * 计价月份
*/ */
@ExcelProperty(value = "计价月份") @ExcelProperty(value = "计价月份")
@NotBlank(message = "计价月份不能为空")
private String importTime; private String importTime;