diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java index d057a20..3d03bd4 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java @@ -12,11 +12,12 @@ 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.UpdateGroup; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; -import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao; -import com.elink.esua.epdc.vaccine.epidemic.dto.*; +import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer; @@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.List; import java.util.Map; @@ -46,8 +46,6 @@ public class EpidemicUserInfoController { @Autowired private EpidemicUserInfoExportServer exportServer; - @Autowired - private EpidemicUserInfoDao epidemicUserInfoDao; @GetMapping("page") public Result> page(@RequestParam Map params) { diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoSyncController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoSyncController.java index 3085c87..6391d4f 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoSyncController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoSyncController.java @@ -50,19 +50,19 @@ public class EpidemicUserInfoSyncController { private EpidemicUserInfoSyncService epidemicUserInfoSyncService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = epidemicUserInfoSyncService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { EpidemicUserInfoSyncDTO data = epidemicUserInfoSyncService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody EpidemicUserInfoSyncDTO dto){ + public Result save(@RequestBody EpidemicUserInfoSyncDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); epidemicUserInfoSyncService.save(dto); @@ -70,7 +70,7 @@ public class EpidemicUserInfoSyncController { } @PutMapping - public Result update(@RequestBody EpidemicUserInfoSyncDTO dto){ + public Result update(@RequestBody EpidemicUserInfoSyncDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); epidemicUserInfoSyncService.update(dto); @@ -78,7 +78,7 @@ public class EpidemicUserInfoSyncController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); epidemicUserInfoSyncService.delete(ids); diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java index 58a44aa..dc11f4b 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java @@ -1,34 +1,16 @@ package com.elink.esua.epdc.vaccine.epidemic.controller.v2; -import cn.afterturn.easypoi.excel.entity.ExportParams; import com.elink.esua.epdc.commons.api.version.ApiVersion; -import com.elink.esua.epdc.commons.tools.annotation.LogOperation; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -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.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; -import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; -import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.Map; diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index 2ef6ad6..041c833 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -145,6 +145,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl agencyIdList = Arrays.asList(agencyList.split(",")); params.put("agencyList", agencyIdList); + } else { + params.put("agencyList", null); } UserDetail user = SecurityUser.getUser(); if (user == null) {