From 4972e92f2bbaaaf1255645d66c17d10a897fcc15 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Thu, 31 Oct 2019 17:17:28 +0800 Subject: [PATCH] update --- .../operate/web/controller/FolviteController.java | 15 ++++++++++++++- .../operate/web/service/impl/FolviteServiceImpl.java | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java index 5489615..9636a00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.service.FolviteService; import com.lyms.platform.permission.model.FolviteQuery; import com.lyms.platform.permission.model.FolviteRecordQuery; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.util.Date; import java.util.List; import java.util.Map; @@ -99,12 +101,23 @@ public class FolviteController extends BaseController { @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryFolviteList(@Param("queryNo") String queryNo) { + public BaseResponse queryFolviteList(@Param("queryNo") String queryNo, + @Param("isconceive") Integer isconceive, + @Param("startReceiveDate") String startReceiveDate, + @Param("endReceiveDate") String endReceiveDate, + @Param("startDrawTime") String startDrawTime, + @Param("endDrawTime") String endDrawTime) { FolviteRecordQuery query = new FolviteRecordQuery(); + query.setIsconceive(isconceive); + query.setStartReceiveDate(DateUtil.getYmdhmDate(startReceiveDate)); + query.setEndReceiveDate(DateUtil.getYmdhmDate(endReceiveDate)); + query.setStartReceiveDate(DateUtil.getYmdhmDate(startDrawTime)); + query.setEndDrawTime(DateUtil.getYmdhmDate(endDrawTime)); query.setSort("created asc"); query.setQueyNo(queryNo); query.setNeed("true"); + List> list = folviteService.list(query); BaseListResponse baseResponse = new BaseListResponse(); baseResponse.setData(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java index 93de08d..73dbfe0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java @@ -194,6 +194,7 @@ public class FolviteServiceImpl implements FolviteService { } provide.put("hospitalName", hospital); provide.put("id", receiveRecordModel.getId()); + provide.put("issuerId", receiveRecordModel.getIssuer()); provide.put("issuer", usersService.getUsers(Integer.valueOf(receiveRecordModel.getIssuer())).getName()); provide.put("receiveWeek", receiveRecordModel.getReceiveWeek()); } -- 1.8.3.1