haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审核

This commit is contained in:
cwchen 2024-07-25 20:52:05 +08:00
parent 31387a50f5
commit db0ab9f8c6
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java
View File

@ -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;
/**

2
src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
View File

@ -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})

12
src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
View File

@ -147,8 +147,10 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
mapper.delExperBasis(dto);
mapper.delConfigManDev(dto);
List<ConfigItemsVo> 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<ConfigItemsVo> 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();

8
src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
View File

@ -220,8 +220,12 @@ public class ExperimentalServiceImpl implements ExperimentalService {
List<Long> 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);
// 添加试验依据信息数据

2
src/main/resources/mappers/system/SelectMapper.xml
View File

@ -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
<if test="id!=null">