shiyang / regional-platform

Download as
Browse Code »

Commit ca320c6cf7f1e1b921f8105a364558254072450a

Authored by landong2015
1 parent 32acd20bab
Exists in master and in 1 other branch nobuildprocess

提交代码

Showing 1 changed file with 22 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmergenceController.java View file @ ca320c6
... ... @@ -63,13 +63,13 @@
63 63 @RequestParam(value = "status",required = false) Integer status,
64 64 @RequestParam(value = "message", required = false) String message) {
65 65 //判断emergenceId是否存在
66   - LisCrisisItemQuery query = new LisCrisisItemQuery();
67   - query.setId(emergenceId);
68   - List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
69   - if (lisCrisisItemList.size()==0){
70   - ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
71   - return;
72   - }
  66 +// LisCrisisItemQuery query = new LisCrisisItemQuery();
  67 +// query.setId(emergenceId);
  68 +// List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
  69 +// if (lisCrisisItemList.size()==0){
  70 +// ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
  71 +// return;
  72 +// }
73 73  
74 74 //拿到登录用户的ID
75 75 /* LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
76 76  
77 77  
... ... @@ -127,24 +127,24 @@
127 127 @TokenRequired
128 128 public void getEmergenceTreatments(HttpServletResponse response,
129 129 @Valid EmergenceTreatmentRequest emergenceTreatmentRequest) {
130   - String emergenceId = null;
  130 +// String emergenceId = null;
  131 +//
  132 +// if (StringUtils.isNotEmpty(emergenceTreatmentRequest.getId())){
  133 +// //判断emergenceId是否存在
  134 +// LisCrisisItemQuery query = new LisCrisisItemQuery();
  135 +// query.setId(emergenceId);
  136 +// List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
  137 +// if (lisCrisisItemList.size()!=0){
  138 +// emergenceId = lisCrisisItemList.get(0).getId();
  139 +// }else {
  140 +// ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
  141 +// return;
  142 +// }
  143 +// }
131 144  
132   - if (StringUtils.isNotEmpty(emergenceTreatmentRequest.getId())){
133   - //判断emergenceId是否存在
134   - LisCrisisItemQuery query = new LisCrisisItemQuery();
135   - query.setId(emergenceId);
136   - List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
137   - if (lisCrisisItemList.size()!=0){
138   - emergenceId = lisCrisisItemList.get(0).getId();
139   - }else {
140   - ResultUtils.buildParameterErrorResultAndWrite(response,"危急ID不存在");
141   - return;
142   - }
143   - }
144   -
145 145 //查询满足条件的数据
146 146 EmergenceTreatmentQuery query = new EmergenceTreatmentQuery();
147   - query.setEmergenceId(emergenceId);
  147 + query.setEmergenceId(emergenceTreatmentRequest.getId());
148 148 query.setPage(emergenceTreatmentRequest.getPage());
149 149 query.setLimit(emergenceTreatmentRequest.getLimit());
150 150 query.setYn(YnEnums.YES.getId());