jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 4972e92f2bbaaaf1255645d66c17d10a897fcc15

Authored by Administrator
1 parent 9f73fc2a9a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 15 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java View file @ 4972e92
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.common.base.BaseController;
5 5 import com.lyms.platform.common.result.BaseListResponse;
6 6 import com.lyms.platform.common.result.BaseResponse;
  7 +import com.lyms.platform.common.utils.DateUtil;
7 8 import com.lyms.platform.operate.web.service.FolviteService;
8 9 import com.lyms.platform.permission.model.FolviteQuery;
9 10 import com.lyms.platform.permission.model.FolviteRecordQuery;
... ... @@ -16,6 +17,7 @@
16 17  
17 18 import javax.servlet.http.HttpServletRequest;
18 19 import javax.validation.Valid;
  20 +import java.util.Date;
19 21 import java.util.List;
20 22 import java.util.Map;
21 23  
22 24  
23 25  
... ... @@ -99,12 +101,23 @@
99 101 @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
100 102 @ResponseBody
101 103 @TokenRequired
102   - public BaseResponse queryFolviteList(@Param("queryNo") String queryNo) {
  104 + public BaseResponse queryFolviteList(@Param("queryNo") String queryNo,
  105 + @Param("isconceive") Integer isconceive,
  106 + @Param("startReceiveDate") String startReceiveDate,
  107 + @Param("endReceiveDate") String endReceiveDate,
  108 + @Param("startDrawTime") String startDrawTime,
  109 + @Param("endDrawTime") String endDrawTime) {
103 110  
104 111 FolviteRecordQuery query = new FolviteRecordQuery();
  112 + query.setIsconceive(isconceive);
  113 + query.setStartReceiveDate(DateUtil.getYmdhmDate(startReceiveDate));
  114 + query.setEndReceiveDate(DateUtil.getYmdhmDate(endReceiveDate));
  115 + query.setStartReceiveDate(DateUtil.getYmdhmDate(startDrawTime));
  116 + query.setEndDrawTime(DateUtil.getYmdhmDate(endDrawTime));
105 117 query.setSort("created asc");
106 118 query.setQueyNo(queryNo);
107 119 query.setNeed("true");
  120 +
108 121 List<Map<String, Object>> list = folviteService.list(query);
109 122 BaseListResponse baseResponse = new BaseListResponse();
110 123 baseResponse.setData(list);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java View file @ 4972e92
... ... @@ -194,6 +194,7 @@
194 194 }
195 195 provide.put("hospitalName", hospital);
196 196 provide.put("id", receiveRecordModel.getId());
  197 + provide.put("issuerId", receiveRecordModel.getIssuer());
197 198 provide.put("issuer", usersService.getUsers(Integer.valueOf(receiveRecordModel.getIssuer())).getName());
198 199 provide.put("receiveWeek", receiveRecordModel.getReceiveWeek());
199 200 }