From 4a79b317fa1cf81b7a8bf006cff8e49f845a6ca2 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 13 Feb 2023 15:09:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E9=83=A8=E5=88=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBusTypeChangeController.java | 8 +++++++ .../basic/BasicBusTypePreController.java | 8 ++++++- .../controller/basic/BasicCorpController.java | 11 +++++++++ .../com/glxp/api/dao/basic/BasicCorpDao.java | 9 ++++++++ .../api/service/basic/BasicCorpService.java | 10 ++++++-- .../basic/IBasicBusTypeChangeService.java | 8 +++++++ .../basic/IBasicBusTypePreService.java | 2 +- .../impl/BasicBusTypeChangeServiceImpl.java | 23 +++++++++++++++++++ .../impl/BasicBusTypePreServiceImpl.java | 6 +++-- .../basic/impl/BasicCorpServiceImpl.java | 18 +++++++++++++++ .../mybatis/mapper/basic/BasicCorpDao.xml | 12 ++++++++++ .../mapper/monitor/SysLogininforMapper.xml | 15 ++++++------ .../mapper/monitor/SysOperLogMapper.xml | 3 ++- 13 files changed, 118 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java index 2d0481d38..bbca6a452 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -62,6 +62,10 @@ public class BasicBusTypeChangeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } basicBusTypeChangeEntity.setUpdateTime(new Date()); basicBusTypeChangeService.insert(basicBusTypeChangeEntity); return ResultVOUtils.success("更新成功"); @@ -79,6 +83,10 @@ public class BasicBusTypeChangeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } basicBusTypeChangeEntity.setUpdateTime(new Date()); basicBusTypeChangeService.updateBasicBusTypeChange(basicBusTypeChangeEntity); return ResultVOUtils.success("更新成功"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index 4de2c324d..0773bc52d 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -162,6 +162,12 @@ public class BasicBusTypePreController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (basicBusTypePreEntity != null) { + //判断是否重复添加 + boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！"); + } + basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity); } else { ResultVOUtils.error(999, "参数错误"); @@ -183,7 +189,7 @@ public class BasicBusTypePreController { } if (basicBusTypePreEntity != null) { //判断是否重复添加 - boolean result = basicBusTypePreService.checkExists(basicBusTypePreEntity); + boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity); if (result) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！"); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 4670435bc..09d440623 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -108,6 +108,11 @@ public class BasicCorpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + boolean result = basicUnitMaintainService.verifyExists(basicUnitMaintainSaveRequest); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } + BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); @@ -127,6 +132,12 @@ public class BasicCorpController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + boolean result = basicUnitMaintainService.verifyExists(basicUnitMaintainSaveRequest); + if (result) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); + } + basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); return ResultVOUtils.success("修改成功"); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index b0a874e52..5cde0e627 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -36,4 +36,13 @@ public interface BasicCorpDao { boolean importBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); List batchSelectByErpIdsAndName(@Param("erpIds") List erpIds, @Param("name") String name); + + /** + * 根据往来单位名称和社会信用号查询列表 + * + * @param name + * @param creditNo + * @return + */ + List selectByNameAndCreditNo(@Param("name") String name, @Param("creditNo") String creditNo); } diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index 35d0657bd..99f893c0a 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -1,8 +1,6 @@ package com.glxp.api.service.basic; - - import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; @@ -40,4 +38,12 @@ public interface BasicCorpService { List batchSelectByErpIds(List erpIds); List batchSelectByErpIdsAndName(List erpIds, String name); + + /** + * 验证数据是否重复 + * + * @param basicCorpEntity + * @return + */ + boolean verifyExists(BasicCorpEntity basicCorpEntity); } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java index 79e27e562..2e44a3f3d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java @@ -40,4 +40,12 @@ public interface IBasicBusTypeChangeService { * @param id */ boolean deleteById(String id); + + /** + * 校验数据是否存在 + * + * @param basicBusTypeChangeEntity + * @return + */ + boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity); } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 9c523051d..226bbf9ba 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -79,5 +79,5 @@ public interface IBasicBusTypePreService { * @param basicBusTypePreEntity * @return */ - boolean checkExists(BasicBusTypePreEntity basicBusTypePreEntity); + boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index 6bf5a5fc9..106c26f0e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -1,5 +1,7 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; @@ -54,6 +56,27 @@ public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService return basicBusTypeChangeDao.deleteById(id) != 0; } + @Override + public boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction()) + .eq("targetAction", basicBusTypeChangeEntity.getTargetAction()) + .eq("originName", basicBusTypeChangeEntity.getOriginName()); + List list = basicBusTypeChangeDao.selectList(wrapper); + if (CollUtil.isNotEmpty(list)) { + if (null != basicBusTypeChangeEntity.getId()) { + for (BasicBusTypeChangeEntity busTypeChangeEntity : list) { + if (busTypeChangeEntity.getId() != basicBusTypeChangeEntity.getId()) { + return true; + } + } + } else { + return true; + } + } + return false; + } + private void setUpdateInfo(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { Date now = new Date(); String userId = String.valueOf(customerService.getUserBean().getId()); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 29a9ae201..2b898f0d9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -81,7 +81,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { } @Override - public boolean checkExists(BasicBusTypePreEntity basicBusTypePreEntity) { + public boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("action", basicBusTypePreEntity.getAction()) .eq("originAction", basicBusTypePreEntity.getOriginAction()) @@ -94,7 +94,9 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { if (CollUtil.isNotEmpty(list)) { if (null != basicBusTypePreEntity.getId()) { for (BasicBusTypePreEntity busTypePreEntity : list) { - return busTypePreEntity.getId() == basicBusTypePreEntity.getId() ? false : true; + if (busTypePreEntity.getId() != basicBusTypePreEntity.getId()) { + return true; + } } } else { return true; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index d72df1893..0c0aa56a6 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; @@ -92,6 +93,23 @@ public class BasicCorpServiceImpl implements BasicCorpService { return basicCorpDao.batchSelectByErpIdsAndName(erpIds, name); } + @Override + public boolean verifyExists(BasicCorpEntity basicCorpEntity) { + List list = basicCorpDao.selectByNameAndCreditNo(basicCorpEntity.getName(), basicCorpEntity.getCreditNo()); + if (CollUtil.isNotEmpty(list)) { + if (null != basicCorpEntity.getId()) { + for (BasicCorpEntity corpEntity : list) { + if (corpEntity.getId() != basicCorpEntity.getId()) { + return true; + } + } + } else { + return true; + } + } + return false; + } + @Override public BasicCorpEntity selectById(String id) { return basicCorpDao.selectById(id); diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 38aa741d6..2b71f50d7 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -292,4 +292,16 @@ + + diff --git a/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml b/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml index 2b1046553..349cb37f6 100644 --- a/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml +++ b/src/main/resources/mybatis/mapper/monitor/SysLogininforMapper.xml @@ -18,27 +18,26 @@ diff --git a/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml b/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml index 43e7f0e04..115b42ed1 100644 --- a/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml +++ b/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml @@ -37,7 +37,7 @@ and oper_id = #{operId} - AND `title` = #{title} + AND `title` like concat('%', #{title}, '%') AND `business_type` = #{businessType} @@ -68,6 +68,7 @@ AND `status` = #{status} + order by monitor_oper_log.oper_time desc