physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-05-06 00:30:21 +08:00
parent 4ab80a6af1
commit 73c649ac3a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/ScriptChanges/Doing_20250503_release.sql
View File

@@ -17,6 +17,10 @@ CREATE TABLE `component_search` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 添加权限
INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES
('1917954826328580097', '1850214135831830529', '报告审核', '/experiment/report', 'experiment/manage/ReportList', 1, '', NULL, 1, NULL, '0', 1.00, 0, 'ant-design:audit-outlined', 1, 0, 0, 0, NULL, 'caoxiang', '2025-05-01 22:50:39', NULL, NULL, 0, 0, NULL, 0),
('1916494403063308290', '1834565842028310529', '样品类型', '/database/sampleTypeList', 'database/sampleTypeList/SampleTypeList', 1, '', NULL, 1, NULL, '0', 6.00, 0, NULL, 1, 0, 0, 0, NULL, 'caoxiang', '2025-04-27 22:07:27', NULL, NULL, 0, 0, NULL, 0);
-- 试验报告添加文件路径字段 -- 试验报告添加文件路径字段
ALTER TABLE `physical-boot`.`experiment_report` ALTER TABLE `physical-boot`.`experiment_report`

6
physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
View File

@@ -437,6 +437,12 @@ public class DateUtils extends PropertyEditorSupport {
} }
public static String formatDate(String dateStr, String pattern) { public static String formatDate(String dateStr, String pattern) {
if (StringUtils.hasText(dateStr)) {
return "";
}
if (StringUtils.hasText(pattern)) {
return dateStr;
}
try { try {
Date date = parseDate(dateStr, "yyyy-MM-dd HH:mm"); Date date = parseDate(dateStr, "yyyy-MM-dd HH:mm");
return getSdFormat(pattern).format(date); return getSdFormat(pattern).format(date);