Browse Source

update

feature/yujt_vim
yujt 4 years ago
parent
commit
7b24329e73
  1. 3
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java
  2. 3
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java

3
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java

@ -10,7 +10,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO;
import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO; import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO;
import com.elink.esua.epdc.vaccine.vim.excel.VaccinationInfoExcel; import com.elink.esua.epdc.vaccine.vim.excel.VaccinationInfoExcel;
@ -35,8 +34,6 @@ import java.util.Map;
public class VaccinationInfoController { public class VaccinationInfoController {
@Autowired @Autowired
private VaccinationInfoService vaccinationInfoService; private VaccinationInfoService vaccinationInfoService;
@Autowired
private EpidemicUserInfoService epidemicUserInfoService;
@GetMapping("page") @GetMapping("page")
public Result<PageData<VaccinationInfoDTO>> page(@RequestParam Map<String, Object> params) { public Result<PageData<VaccinationInfoDTO>> page(@RequestParam Map<String, Object> params) {

3
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java

@ -121,7 +121,8 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
@Override @Override
public Result updateNew(VaccinationInfoDTO dto) { public Result updateNew(VaccinationInfoDTO dto) {
// 剂次重复校验 // 剂次重复校验
if (checkVaccination(dto).isEmpty() || checkVaccination(dto).get(0).getDose().equals(dto.getDose())) { List<VaccinationInfoEntity> entities = checkVaccination(dto);
if (entities.isEmpty() || entities.get(0).getDose().equals(dto.getDose())) {
update(dto); update(dto);
} else { } else {
return new Result().error("接种剂次重复"); return new Result().error("接种剂次重复");

Loading…
Cancel
Save