Przeglądaj źródła

二期后台 bug

suntianwu 3 lat temu
rodzic
commit
f6cc2465be

+ 5 - 2
src/main/java/com/care/bms/controller/EventHandleController.java

@@ -96,15 +96,17 @@ public class EventHandleController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "header", name = "status", value = "状态"),
             @ApiImplicitParam(paramType = "query", name = "status", value = "状态"),
+            @ApiImplicitParam(paramType = "query", name = "title", value = "工单标题"),
             @ApiImplicitParam(paramType = "query", name = "olderName", value = "老人姓名"),
     })
     public PageResult<List<EventOrderVO>> listMyHandle(HttpServletRequest request,@RequestHeader(value = "token") String token,
                                                            @RequestParam(value = "status", required = false) String status,
+                                                           @RequestParam(value = "title", required = false) String title,
                                                            @RequestParam(value = "olderName", required = false) String olderName,
                                                             PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent4MyDo(status, olderName,loginUser ,pageReqVo);
+            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent4MyDo(status, title, olderName,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("我的处理事件查询-分页列表出现异常",e);
@@ -140,11 +142,12 @@ public class EventHandleController {
     @ApiOperation(tags = {"事件查询"},value = "事件查询 分页")
     public PageResult<List<EventOrderVO>> list(HttpServletRequest request,
                                                            @RequestParam(value = "status", required = false) String status,
+                                                              @RequestParam(value = "title", required = false) String title,
                                                            @RequestParam(value = "olderName", required = false) String olderName,
                                                            PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent(status, olderName,loginUser ,pageReqVo);
+            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent(status,title, olderName,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("我的处理事件查询-分页列表出现异常",e);

+ 4 - 2
src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -81,10 +81,11 @@ public class BmsEventOrderService {
      * @param pageReqVo
      * @return
      */
-    public IPage<EventOrderVO> listEvent(String orderStatus, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<EventOrderVO> listEvent(String orderStatus,String title, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         IPage<CareEventOrder> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StrUtil.isNotEmpty(orderStatus),CareEventOrder::getStatus, orderStatus)
+                .like(StrUtil.isNotEmpty(title),CareEventOrder::getTitle,title)
                 .like(StrUtil.isNotEmpty(olderName),CareEventOrder::getOlderName,olderName)
                 .eq(CareEventOrder::getOrgId,loginUser.getOrgId())
                 .eq(loginUser.getStationId()!=null,CareEventOrder::getStationId,loginUser.getStationId())
@@ -163,10 +164,11 @@ public class BmsEventOrderService {
      * @param pageReqVo
      * @return
      */
-    public IPage<EventOrderVO> listEvent4MyDo(String orderStatus, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<EventOrderVO> listEvent4MyDo(String orderStatus,String title, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         IPage<CareEventOrder> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StrUtil.isNotEmpty(orderStatus),CareEventOrder::getStatus, orderStatus)
+                .like(StrUtil.isNotEmpty(title),CareEventOrder::getTitle,title)
                 .like(StrUtil.isNotEmpty(olderName),CareEventOrder::getOlderName,olderName)
                 .eq(CareEventOrder::getOrgId,loginUser.getOrgId())
                 .eq(CareEventOrder::getSeatId,loginUser.getId())