From db0ab9f8c6848ca6ee397dc60ce05674641ff63a Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 25 Jul 2024 20:52:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java | 2 +- .../com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java | 2 +- .../service/impl/ExperimentStandardServiceImpl.java | 12 ++++++++---- .../basis/service/impl/ExperimentalServiceImpl.java | 8 ++++++-- src/main/resources/mappers/system/SelectMapper.xml | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) 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 2d2368a..74fb17a 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(?:\\.\\d{1,2})?$)(?:[1-9]\\d{0,7}(?:\\.\\d{1,2})?|100000000(?:\\.0{1,2})?)", message = "金额格式不正确（0-100000000）", groups = {Query.class}) + @Pattern(regexp = "(?:0|(?:[1-9]\\d{0,8}))(\\.\\d{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 f6a986f..548f9d1 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|\\d{1,8}(?:\\.\\d{1,2})?|\\d{9}(?:\\.\\d{0,2})?)", message = "金额格式不正确（范围0-100000000并且最多保留两位小数）", groups = {Query.class}) + @Pattern(regexp = "(?:0|(?:[1-9]\\d{0,8}))(\\.\\d{2})?", message = "金额格式不正确（范围0-100000000并且最多保留两位小数）", groups = {Query.class}) private String amount; /**备注*/ @NotBlank(message = "备注不能为空", groups = {Query.class}) diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java index fbdd987..886c741 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java @@ -147,8 +147,10 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService mapper.delExperBasis(dto); mapper.delConfigManDev(dto); List configItemsVos = mapper.getConfigItems(dto.getId()); - mapper.delItems(configItemsVos); - mapper.delItem(configItemsVos); + if(CollectionUtils.isNotEmpty(configItemsVos)){ + mapper.delItems(configItemsVos); + mapper.delItem(configItemsVos); + } // 修改试验标准配置 mapper.editExperConfig(experConfigVo); for (ExperBasisVo basisVo : experConfigVo.getBasisVos()) { @@ -217,8 +219,10 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService mapper.delExperBasis(dto); mapper.delConfigManDev(dto); List configItemsVos = mapper.getConfigItems(dto.getId()); - mapper.delItems(configItemsVos); - mapper.delItem(configItemsVos); + if(CollectionUtils.isNotEmpty(configItemsVos)){ + mapper.delItems(configItemsVos); + mapper.delItem(configItemsVos); + } } catch (Exception e) { log.error(e.toString(), e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java index a073a7f..d749b26 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java @@ -220,8 +220,12 @@ public class ExperimentalServiceImpl implements ExperimentalService { List experDevItemsIds = mapper.getExperDevItems(experDevIds); mapper.delConfigBasis(vo.getId()); mapper.delExperDev(vo.getId()); - mapper.delExperDevItems(experDevIds); - mapper.delExperDevItem(experDevItemsIds); + if(CollectionUtils.isNotEmpty(experDevIds)){ + mapper.delExperDevItems(experDevIds); + } + if(CollectionUtils.isNotEmpty(experDevItemsIds)){ + mapper.delExperDevItem(experDevItemsIds); + } // 修改试验信息数据 mapper.updateExper(vo); // 添加试验依据信息数据 diff --git a/src/main/resources/mappers/system/SelectMapper.xml b/src/main/resources/mappers/system/SelectMapper.xml index e3d9bde..8c71b3d 100644 --- a/src/main/resources/mappers/system/SelectMapper.xml +++ b/src/main/resources/mappers/system/SelectMapper.xml @@ -71,7 +71,7 @@ dev_name AS devName, dev_code AS devCode, dev_module AS devModule, - contract_date AS contractDate + DATE_FORMAT(contract_date, '%Y-%m-%d') AS contractDate FROM tb_exper_device WHERE del_flag = 0