diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java index 291479ea96..b3f97f7437 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java @@ -67,8 +67,9 @@ public class IcPointNucleicMonitoringController { private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto){ // PageData page = icPointNucleicMonitoringService.page(params); + params.put("customerId",tokenDto.getCustomerId()); PageData page = icPointNucleicMonitoringService.getPhrasePage(params); return new Result>().ok(page); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java index 2891705f97..6bde7117b4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointVaccinesInoculationController.java @@ -60,8 +60,9 @@ public class IcPointVaccinesInoculationController { private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto){ // PageData page = icPointVaccinesInoculationService.page(params); + params.put("customerId",tokenDto.getCustomerId()); PageData page = icPointVaccinesInoculationService.getPhrasePage(params); return new Result>().ok(page); } @@ -74,18 +75,20 @@ public class IcPointVaccinesInoculationController { @NoRepeatSubmit @PostMapping() - public Result save(@RequestBody IcPointVaccinesInoculationDTO dto){ + public Result save(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icPointVaccinesInoculationService.save(dto); return new Result(); } @NoRepeatSubmit @PutMapping() - public Result update(@RequestBody IcPointVaccinesInoculationDTO dto){ + public Result update(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); icPointVaccinesInoculationService.update(dto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index 5dcc3fad6f..eae4085362 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -25,8 +25,8 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getAllAddressName(); - List getAllAddressNameNoCurrent(@Param("id") String id); + List getAllAddressName(@Param("customerId") String customerId); + List getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id); /** * 条件查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java index 09e1ece8f7..d495fd6da1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.PointHSYMFormDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.entity.IcPointVaccinesInoculationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -24,7 +25,8 @@ public interface IcPointVaccinesInoculationDao extends BaseDao getAllAddressName(); + List getAllAddressName(@Param("customerId") String customerId); + List getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id); /** * 条件查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index 98cc32d68f..cb2b516b13 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -127,7 +127,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(dto.getCustomerId()); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ throw new RenException("该监测点名称已存在,请重新输入"); @@ -148,7 +148,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressNameNoCurrent(dto.getId()); + List addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId()); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ throw new RenException("该监测点名称已存在,请重新输入"); @@ -200,7 +200,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(tokenDto.getUserId()); for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java index 011cc946e7..b1ccaede98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointVaccinesInoculationServiceImpl.java @@ -123,7 +123,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(dto.getCustomerId()); // 校验数据库是否存在该地点名称 if (addressList.contains(dto.getName())){ throw new RenException("该接种点名称已存在,请重新输入"); @@ -135,6 +135,12 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId()); + // 校验数据库是否存在该地点名称 + if (addressList.contains(dto.getName())){ + throw new RenException("该接种点名称已存在,请重新输入"); + } IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class); updateById(entity); } @@ -174,7 +180,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl addressList = baseDao.getAllAddressName(); + List addressList = baseDao.getAllAddressName(tokenDto.getCustomerId()); for (int i = 0; i < list.size(); i++) { list.get(i).setNum(i+1); // if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index d55f4fddce..859b70029b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -29,6 +29,7 @@ NAME from ic_point_nucleic_monitoring where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} + +