diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java index 74fb17a..77ef322 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java @@ -48,7 +48,7 @@ public class ConfigItemsVo { * 金额 */ @NotBlank(message = "金额不能为空", groups = {Query.class}) - @Pattern(regexp = "(?:0|(?:[1-9]\\d{0,8}))(\\.\\d{2})?", message = "金额格式不正确(范围0-100000000并且最多保留两位小数)", groups = {Query.class}) + @Pattern(regexp = "(?:0(?:\\.0{0,2})?|[1-9]\\d{0,7}(?:\\.\\d{1,2})?|100000000(?:\\.0{1,2})?)", message = "金额格式不正确(范围0-100000000并且最多保留两位小数)", groups = {Query.class}) private String amount; /** diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java index 548f9d1..74e8ca0 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java @@ -51,7 +51,7 @@ public class ExperDevVo { private String devData; /**额外超出的金额默认值0*/ @NotBlank(message = "金额不能为空", groups = {Query.class}) - @Pattern(regexp = "(?:0|(?:[1-9]\\d{0,8}))(\\.\\d{2})?", message = "金额格式不正确(范围0-100000000并且最多保留两位小数)", groups = {Query.class}) + @Pattern(regexp = "(?:0(?:\\.0{0,2})?|[1-9]\\d{0,7}(?:\\.\\d{1,2})?|100000000(?:\\.0{1,2})?)", message = "金额格式不正确(范围0-100000000并且最多保留两位小数)", groups = {Query.class}) private String amount; /**备注*/ @NotBlank(message = "备注不能为空", groups = {Query.class}) diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml index 26029e8..3d7a1cd 100644 --- a/src/main/resources/mappers/basis/ExperimentalMapper.xml +++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml @@ -275,7 +275,7 @@ FROM tb_sample ts LEFT JOIN tb_custom tc ON ts.custom_id = tc.id LEFT JOIN sys_user su ON ts.create_user = su.id AND su.del_flag = 0 - LEFT JOIN sys_user su2 ON ts.update_user = su2.id AND su2.del_flag = 0 + LEFT JOIN sys_user su2 ON ts.dispatch_user = su2.id AND su2.del_flag = 0 LEFT JOIN tb_team tt ON ts.team_id = tt.id AND tt.del_flag = 0 LEFT JOIN ( SELECT sample_id,COUNT(sample_id) AS num,ANY_VALUE(GROUP_CONCAT(DISTINCT dev_type_name)) AS sampleDev,ANY_VALUE(GROUP_CONCAT(DISTINCT dev_type_code)) AS sampleDevCode diff --git a/src/main/resources/static/css/table-common2.css b/src/main/resources/static/css/table-common2.css index 92871fb..b21c9fe 100644 --- a/src/main/resources/static/css/table-common2.css +++ b/src/main/resources/static/css/table-common2.css @@ -798,6 +798,10 @@ input:-ms-input-placeholder { .classTable thead tr:nth-of-type(1) { background-color: #f0f0f0; height: 40px; + font-size: 18px; + color: #262626; + letter-spacing: 1px; + font-weight: bold; } .classTable thead tr:nth-of-type(1) td { @@ -825,4 +829,6 @@ input:-ms-input-placeholder { .classTable tbody tr { width: 100%; cursor: pointer; + height: 40px; + letter-spacing: 1px; } diff --git a/src/main/resources/static/js/basis/child/auditData.js b/src/main/resources/static/js/basis/child/auditData.js index 9c81359..7e04d9b 100644 --- a/src/main/resources/static/js/basis/child/auditData.js +++ b/src/main/resources/static/js/basis/child/auditData.js @@ -253,7 +253,7 @@ function getMouseover(data) { html += ''; let devOpenIndex = layer.open({ type: 0, - title: '样品设备详情', + title: ['
样品设备详情
', 'font-size:16px;background-color:#f0f0f0;display: flex;align-items: center;'], area: ['400px', '500px'], content: html, btn: ['关闭'], diff --git a/src/main/resources/static/js/basis/child/viewAuditData.js b/src/main/resources/static/js/basis/child/viewAuditData.js index 0fade22..f76c6ec 100644 --- a/src/main/resources/static/js/basis/child/viewAuditData.js +++ b/src/main/resources/static/js/basis/child/viewAuditData.js @@ -160,7 +160,7 @@ function getMouseover(data) { html += ''; let devOpenIndex = layer.open({ type: 0, - title: '样品设备详情', + title: ['
样品设备详情
', 'font-size:16px;background-color:#f0f0f0;display: flex;align-items: center;'], area: ['400px', '500px'], content: html, btn: ['关闭'],