elink-star
/
epdc-cloud-custom-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug

master
zhangyuan 3 years ago
parent
ce9d095c6a
commit
7b0b249ba1
4 changed files with 11 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java
  2. 10
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoSyncController.java
  3. 18
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java
  4. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

10
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java
View File

@ -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.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.dto.personroom.EpidemicUnitOwnerDTO; 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.EpidemicRecordDetailDTO;
import com.elink.esua.epdc.vaccine.epidemic.dto.*; 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.EpidemicPageResultDTO;
import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; 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.excel.EpidecmicUserNewExcel;
import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer; 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 org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map; import java.util.Map;
@ -46,8 +46,6 @@ public class EpidemicUserInfoController {
@Autowired @Autowired
private EpidemicUserInfoExportServer exportServer; private EpidemicUserInfoExportServer exportServer;
@Autowired
private EpidemicUserInfoDao epidemicUserInfoDao;
@GetMapping("page") @GetMapping("page")
public Result<PageData<EpidemicRecordListDTO>> page(@RequestParam Map<String, Object> params) { public Result<PageData<EpidemicRecordListDTO>> page(@RequestParam Map<String, Object> params) {

10
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoSyncController.java
View File

@ -50,19 +50,19 @@ public class EpidemicUserInfoSyncController {
private EpidemicUserInfoSyncService epidemicUserInfoSyncService; private EpidemicUserInfoSyncService epidemicUserInfoSyncService;
@GetMapping("page") @GetMapping("page")
public Result<PageData<EpidemicUserInfoSyncDTO>> page(@RequestParam Map<String, Object> params){ public Result<PageData<EpidemicUserInfoSyncDTO>> page(@RequestParam Map<String, Object> params) {
PageData<EpidemicUserInfoSyncDTO> page = epidemicUserInfoSyncService.page(params); PageData<EpidemicUserInfoSyncDTO> page = epidemicUserInfoSyncService.page(params);
return new Result<PageData<EpidemicUserInfoSyncDTO>>().ok(page); return new Result<PageData<EpidemicUserInfoSyncDTO>>().ok(page);
} }
@GetMapping("{id}") @GetMapping("{id}")
public Result<EpidemicUserInfoSyncDTO> get(@PathVariable("id") String id){ public Result<EpidemicUserInfoSyncDTO> get(@PathVariable("id") String id) {
EpidemicUserInfoSyncDTO data = epidemicUserInfoSyncService.get(id); EpidemicUserInfoSyncDTO data = epidemicUserInfoSyncService.get(id);
return new Result<EpidemicUserInfoSyncDTO>().ok(data); return new Result<EpidemicUserInfoSyncDTO>().ok(data);
} }
@PostMapping @PostMapping
public Result save(@RequestBody EpidemicUserInfoSyncDTO dto){ public Result save(@RequestBody EpidemicUserInfoSyncDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
epidemicUserInfoSyncService.save(dto); epidemicUserInfoSyncService.save(dto);
@ -70,7 +70,7 @@ public class EpidemicUserInfoSyncController {
} }
@PutMapping @PutMapping
public Result update(@RequestBody EpidemicUserInfoSyncDTO dto){ public Result update(@RequestBody EpidemicUserInfoSyncDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
epidemicUserInfoSyncService.update(dto); epidemicUserInfoSyncService.update(dto);
@ -78,7 +78,7 @@ public class EpidemicUserInfoSyncController {
} }
@DeleteMapping @DeleteMapping
public Result delete(@RequestBody String[] ids){ public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
epidemicUserInfoSyncService.delete(ids); epidemicUserInfoSyncService.delete(ids);

18
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java
View File

@ -1,34 +1,16 @@
package com.elink.esua.epdc.vaccine.epidemic.controller.v2; 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.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.constant.Constant;
import com.elink.esua.epdc.commons.tools.page.PageData; 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.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.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.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.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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Map; import java.util.Map;

2
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
View File

@ -145,6 +145,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
if (StringUtils.isNotBlank(agencyList)) { if (StringUtils.isNotBlank(agencyList)) {
List<String> agencyIdList = Arrays.asList(agencyList.split(",")); List<String> agencyIdList = Arrays.asList(agencyList.split(","));
params.put("agencyList", agencyIdList); params.put("agencyList", agencyIdList);
} else {
params.put("agencyList", null);
} }
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
if (user == null) { if (user == null) {

Write Preview
Loading…
Cancel
Save