Merge remote-tracking branch 'origin/master'

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.spare.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity;
 import com.hnac.hzims.spare.entity.WtSpBasicEntity;
 import com.hnac.hzims.spare.vo.WtSpBasicVO;
@@ -14,7 +15,7 @@ import java.util.Map;
  *
  * @author Chill
  */
-public interface WtSpBasicMapper extends UserDataScopeBaseMapper<WtSpBasicEntity> {
+public interface WtSpBasicMapper extends BaseMapper<WtSpBasicEntity> {
     /**
      * 备品备件基础信息列表
      * @param params

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java

@@ -836,6 +836,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 					dto.setModelSignage(emTreeInspect.getModelSignage());
 					dto.setAttrSignage(emTreeInspect.getModelAttrSignage());
 					dto.setAttrName(emTreeInspect.getModelAttrName());
+					dto.setCreateDept(emInfo.getDepartment());
 					dto.setId(null);
 					contentDTOList.add(dto);
 				}

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java

@@ -205,7 +205,7 @@ public class ThreadTask {
 		faultAllReq.setStationId(fdpFaultEntity.getStationId());
 
 		DiagnoseFaultReq diagnoseFaultReq = new DiagnoseFaultReq();
-		diagnoseFaultReq.setTaskId(req.getId().toString());
+		diagnoseFaultReq.setTaskId(key);
 		diagnoseFaultReq.setFaultId(req.getFaultId());
 		diagnoseFaultReq.setConfidence(1.0);
 		diagnoseFaultReq.setLifeTime(24*3);//设置有效期3天

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java

@@ -53,172 +53,186 @@ import java.util.Optional;
 @Api(value = "站点视频类型配置", tags = "站点视频类型配置")
 public class StationVideoTypeController extends BladeController {
 
-	private final IStationVideoTypeService stationVideoTypeService;
+    private final IStationVideoTypeService stationVideoTypeService;
-
+
-	private final ISysClient sysClient;
+    private final ISysClient sysClient;
-
+
-	private final IStationService stationService;
+    private final IStationService stationService;
-
+
-	/**秘钥appKey**/
+    /** 秘钥appKey **/
-	@Value("${hzims.videoProperties.appKey}")
+    @Value("${hzims.videoProperties.appKey}")
-	private String appKey;
+    private String appKey;
-	/**代理API网关nginx服务器ip端口**/
+    /** 代理API网关nginx服务器ip端口 **/
-	@Value("${hzims.videoProperties.videoHost}")
+    @Value("${hzims.videoProperties.videoHost}")
-	private String videoHost;
+    private String videoHost;
-	/**秘钥appSecret**/
+    /** 秘钥appSecret **/
-	@Value("${hzims.videoProperties.appSecret}")
+    @Value("${hzims.videoProperties.appSecret}")
-	private String appSecret;
+    private String appSecret;
-
+
-	/**
+    /**
-	 * 分页 代码自定义代号
+     * 分页 代码自定义代号
-	 */
+     */
-	@ApiLog
+    @ApiLog
-	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
+    @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
-	@ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 10)
-	@ApiOperation(value = "分页", notes = "传入stationVideoType")
+    @ApiOperation(value = "分页", notes = "传入stationVideoType")
-	@OperationAnnotation(
+    @OperationAnnotation(
-			moduleName = "站点管理",
+            moduleName = "站点管理",
-			title = "视频配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+            title = "视频配置", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE,
-			action = "分页查询")
+            action = "分页查询")
-	public R<IPage<StationVideoTypeVO>> list(StationVideoTypeEntity entity, Query query) {
+    public R<IPage<StationVideoTypeVO>> list(StationVideoTypeEntity entity, Query query) {
-		LambdaQueryWrapper<StationVideoTypeEntity> queryWrapper = Condition.getQueryWrapper(new StationVideoTypeEntity(),entity);
+        LambdaQueryWrapper<StationVideoTypeEntity> queryWrapper = Condition.getQueryWrapper(new StationVideoTypeEntity(), entity);
-		queryWrapper.orderByAsc(StationVideoTypeEntity::getStationId).orderByAsc(StationVideoTypeEntity::getSort);
+        queryWrapper.orderByAsc(StationVideoTypeEntity::getStationId).orderByAsc(StationVideoTypeEntity::getSort);
-		IPage<StationVideoTypeEntity> pages = stationVideoTypeService.page(Condition.getPage(query), queryWrapper);
+        IPage<StationVideoTypeEntity> pages = stationVideoTypeService.page(Condition.getPage(query), queryWrapper);
-		IPage<StationVideoTypeVO> vos = StationVideoTypeWrapper.builder().pageVO(pages);
+        IPage<StationVideoTypeVO> vos = StationVideoTypeWrapper.builder().pageVO(pages);
-		List<StationVideoTypeVO> records = vos.getRecords();
+        List<StationVideoTypeVO> records = vos.getRecords();
-		records.forEach(stationVideoTypeVO -> {
+        records.forEach(stationVideoTypeVO -> {
-			R<Dept> deptR = sysClient.getDept(stationVideoTypeVO.getDeptId());
+            R<Dept> deptR = sysClient.getDept(stationVideoTypeVO.getDeptId());
-			if(deptR.isSuccess()){
+            if (deptR.isSuccess()) {
-				stationVideoTypeVO.setDeptName(Optional.ofNullable(deptR.getData()).map(Dept::getDeptName).orElse(null));
+                stationVideoTypeVO.setDeptName(Optional.ofNullable(deptR.getData()).map(Dept::getDeptName).orElse(null));
-			}
+            }
-		});
+        });
-		return R.data(vos);
+        return R.data(vos);
-	}
+    }
-
+
-	/**
+    /**
-	 * 新增
+     * 新增
-	 */
+     */
-	@PostMapping("/save")
+    @PostMapping("/save")
-	@ApiOperationSupport(order = 20)
+    @ApiOperationSupport(order = 20)
-	@ApiOperation(value = "新增")
+    @ApiOperation(value = "新增")
-	public R save(@Valid @RequestBody StationVideoTypeEntity req) {
+    public R save(@Valid @RequestBody StationVideoTypeEntity req) {
-		List<StationVideoTypeEntity> list = stationVideoTypeService.list(Wrappers.<StationVideoTypeEntity>lambdaQuery()
+        List<StationVideoTypeEntity> list = stationVideoTypeService.list(Wrappers.<StationVideoTypeEntity>lambdaQuery()
-			.eq(StationVideoTypeEntity::getStationId,req.getStationId())
+                .eq(StationVideoTypeEntity::getStationId, req.getStationId())
-			.eq(StationVideoTypeEntity::getName,req.getName())
+                .eq(StationVideoTypeEntity::getName, req.getName())
-		);
+        );
-		StationVO stationVO = stationService.getStationByCode(req.getStationId());
+        StationVO stationVO = stationService.getStationByCode(req.getStationId());
-		if(ObjectUtil.isNotEmpty(stationVO)){
+        if (ObjectUtil.isNotEmpty(stationVO)) {
-			req.setCreateDept(stationVO.getRefDept());
+            req.setCreateDept(stationVO.getRefDept());
-		}
+        }
-		req.setAppKey(appKey);
+        req.setAppKey(appKey);
-		req.setVideoHost(videoHost);
+        req.setVideoHost(videoHost);
-		req.setAppSecret(appSecret);
+        req.setAppSecret(appSecret);
-		return list.size()>0 ? R.fail(400,"该名称已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.save(req));
+        return list.size() > 0 ? R.fail(400, "该名称已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.save(req));
-	}
+    }
-
+
-	/**
+    /**
-	 * 修改 代码自定义代号
+     * 修改 代码自定义代号
-	 */
+     */
-	@PostMapping("/update")
+    @PostMapping("/update")
-	@ApiOperationSupport(order = 30)
+    @ApiOperationSupport(order = 30)
-	@ApiOperation(value = "修改", notes = "传入stationVideoType")
+    @ApiOperation(value = "修改", notes = "传入stationVideoType")
-	public R update(@Valid @RequestBody StationVideoTypeEntity req) {
+    public R update(@Valid @RequestBody StationVideoTypeEntity req) {
-		List<StationVideoTypeEntity> list = stationVideoTypeService.list(Wrappers.<StationVideoTypeEntity>lambdaQuery()
+        List<StationVideoTypeEntity> list = stationVideoTypeService.list(Wrappers.<StationVideoTypeEntity>lambdaQuery()
-			.eq(StationVideoTypeEntity::getStationId,req.getStationId())
+                .eq(StationVideoTypeEntity::getStationId, req.getStationId())
-			.eq(StationVideoTypeEntity::getName,req.getName())
+                .eq(StationVideoTypeEntity::getName, req.getName())
-			.ne(StationVideoTypeEntity::getId,req.getId())
+                .ne(StationVideoTypeEntity::getId, req.getId())
-		);
+        );
-		return list.size()>0 ? R.fail(400,"该名称/视频源已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.updateById(req));
+        return list.size() > 0 ? R.fail(400, "该名称/视频源已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.updateById(req));
-	}
+    }
-
+
-	/**
+    /**
-	 * 删除 代码自定义代号
+     * 删除 代码自定义代号
-	 */
+     */
-	@PostMapping("/remove")
+    @PostMapping("/remove")
-	@ApiOperationSupport(order = 40)
+    @ApiOperationSupport(order = 40)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(stationVideoTypeService.deleteLogic(Func.toLongList(ids)));
+        return R.status(stationVideoTypeService.deleteLogic(Func.toLongList(ids)));
-	}
+    }
-
+
-	@ApiLog
+    @ApiLog
-	@RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST})
+    @RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST})
-	@ApiOperationSupport(order = 50)
+    @ApiOperationSupport(order = 50)
-	@ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表")
+    @ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表")
-	@OperationAnnotation(moduleName = "视频监控",title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType =
+    public R<List<VideoMonitorVO>> getVideoMonitor() {
-			BusinessType.GENCODE,
+        List<VideoMonitorVO> result = stationVideoTypeService.getVideoMonitor();
-			action = "获取视频监测列表")
+        return R.data(result);
-	public R<List<VideoMonitorVO>> getVideoMonitor(){
+    }
-		List<VideoMonitorVO> result = stationVideoTypeService.getVideoMonitor();
+
-		return R.data(result);
+    @ApiLog
-	}
+    @RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST})
-
+    @ApiOperationSupport(order = 60)
-	@ApiLog
+    @ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象")
-	@RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST})
+    public R<StationVideoTypeEntity> getById(@RequestParam Long id, @RequestParam int streamType) {
-	@ApiOperationSupport(order = 60)
+        return R.data(stationVideoTypeService.getById(id, streamType));
-	@OperationAnnotation(moduleName = "视频监控",title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+    }
-			action = "获取视频监测对象")
+
-	@ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象")
+    @ApiLog
-	public R<StationVideoTypeEntity> getById(@RequestParam Long id,@RequestParam int streamType){
+    @RequestMapping(value = "/getHikVideo", method = {RequestMethod.GET, RequestMethod.POST})
-		return R.data(stationVideoTypeService.getById(id,streamType));
+    public R<String> getHikVideo() {
-	}
+        return R.data(stationVideoTypeService.getHikVideo());
-	@ApiLog
+    }
-	@RequestMapping(value = "/getHikVideo", method = {RequestMethod.GET, RequestMethod.POST})
+
-	public R<String> getHikVideo(){
+    @ApiLog
-		return R.data(stationVideoTypeService.getHikVideo());
+    @RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST})
-	}
+    @ApiOperationSupport(order = 70)
-	@ApiLog
+    @ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点")
-	@RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST})
+    public R<List<StationEntity>> getStationsByVideo() {
-	@ApiOperationSupport(order = 70)
+        return R.data(stationVideoTypeService.getStationsByVideo());
-	@ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点")
+    }
-	public R<List<StationEntity>> getStationsByVideo() {
+
-		return R.data(stationVideoTypeService.getStationsByVideo());
+    @ApiLog
-	}
+    @GetMapping("/getStationVideoOrderBySort")
-	@ApiLog
+    @ApiOperationSupport(order = 80)
-	@GetMapping("/getStationVideoOrderBySort")
+    @ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表")
-	@ApiOperationSupport(order = 80)
+    public R<IPage> getStationVideoOrderBySort(StationVideoTypeDTO stationVideoTypeDTO, Query query) {
-	@ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表")
+        return R.data(stationVideoTypeService.getStationVideoOrderBySort(stationVideoTypeDTO, query));
-	public R<IPage> getStationVideoOrderBySort(StationVideoTypeDTO stationVideoTypeDTO,Query query) {
+    }
-		return R.data(stationVideoTypeService.getStationVideoOrderBySort(stationVideoTypeDTO,query));
+
-	}
+    @ApiLog
-	@ApiLog
+    @RequestMapping(value = "/getVideoByIdsAndType", method = {RequestMethod.GET, RequestMethod.POST})
-	@RequestMapping(value = "/getVideoByIdsAndType", method = {RequestMethod.GET, RequestMethod.POST})
+    @ApiOperationSupport(order = 90)
-	@ApiOperationSupport(order = 90)
+    @ApiOperation(value = "根据视频ID、视频流类型获取视频地址", notes = "根据视频ID、视频流类型获取视频地址")
-	@ApiOperation(value = "根据视频ID、视频流类型获取视频地址", notes = "根据视频ID、视频流类型获取视频地址")
+    public R<List<StationVideoTypeEntity>> getVideoByIdsAndType(@RequestParam String ids, @RequestParam String type) {
-	public R<List<StationVideoTypeEntity>> getVideoByIdsAndType(@RequestParam String ids, @RequestParam String type) {
+        return R.data(stationVideoTypeService.getVideoByIdsAndType(ids, type));
-		return R.data(stationVideoTypeService.getVideoByIdsAndType(ids,type));
+    }
-	}
+
-	@ApiLog
+    @ApiLog
-	@GetMapping("/getVideoByIds")
+    @GetMapping("/getVideoByIds")
-	@ApiOperationSupport(order = 100)
+    @ApiOperationSupport(order = 100)
-	@ApiOperation(value = "根据视频ID获取视频地址", notes = "根据视频ID获取视频地址")
+    @ApiOperation(value = "根据视频ID获取视频地址", notes = "根据视频ID获取视频地址")
-	public R<List<StationVideoTypeEntity>> getVideoByIds(@RequestParam String ids,@RequestParam String randomCode) {
+    public R<List<StationVideoTypeEntity>> getVideoByIds(@RequestParam String ids, @RequestParam String randomCode) {
-		return R.data(stationVideoTypeService.getVideoByIds(ids,randomCode));
+        return R.data(stationVideoTypeService.getVideoByIds(ids, randomCode));
-	}
+    }
-	@ApiLog
+
-	@RequestMapping(value = "/getVideoReviewerToken",method = {RequestMethod.GET, RequestMethod.POST})
+    @ApiLog
-	public R<String> getVideoReviewerToken() {
+    @RequestMapping(value = "/getVideoReviewerToken", method = {RequestMethod.GET, RequestMethod.POST})
-		return R.data(stationVideoTypeService.getVideoReviewerToken());
+    public R<String> getVideoReviewerToken() {
-	}
+        return R.data(stationVideoTypeService.getVideoReviewerToken());
-	@ApiLog
+    }
-	@GetMapping("/getVideoMonitorByAgency")
+
-	@ApiOperationSupport(order = 110)
+    @ApiLog
-	@ApiOperation(value = "获取云服务站点（清污机类型）视频", notes = "根获取代运维站点（清污机类型）视频")
+    @GetMapping("/getVideoMonitorByAgency")
-	public R<List<VideoMonitorVO>> getVideoMonitorByAgency(@RequestParam @ApiParam("视频分类") String type) {
+    @ApiOperationSupport(order = 110)
-		return R.data(stationVideoTypeService.getVideoMonitor(type));
+    @ApiOperation(value = "获取云服务站点（清污机类型）视频", notes = "根获取代运维站点（清污机类型）视频")
-	}
+    public R<List<VideoMonitorVO>> getVideoMonitorByAgency(@RequestParam @ApiParam("视频分类") String type) {
-	@ApiLog
+        return R.data(stationVideoTypeService.getVideoMonitor(type));
-	@GetMapping("/getHikVisionStations")
+    }
-	@ApiOperationSupport(order = 120)
+
-	@ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表")
+    @ApiLog
-	public R<List<JSONObject>> getHikVisionStations() {
+    @GetMapping("/getHikVisionStations")
-		return R.data(stationVideoTypeService.getHikVisionStations());
+    @ApiOperationSupport(order = 120)
-	}
+    @ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表")
-	@ApiLog
+    public R<List<JSONObject>> getHikVisionStations() {
-	@GetMapping("/getMonitorsByStation")
+        return R.data(stationVideoTypeService.getHikVisionStations());
-	@ApiOperationSupport(order = 130)
+    }
-	@ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点")
+
-	public R<Map<HikDeviceResp, List<HikMonitorResp>>> getMonitorsByStation(@RequestParam String stationId) {
+    @ApiLog
-		return R.data(stationVideoTypeService.getMonitorsByStation(stationId));
+    @GetMapping("/getMonitorsByStation")
-	}
+    @ApiOperationSupport(order = 130)
+    @ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点")
+    public R<Map<HikDeviceResp, List<HikMonitorResp>>> getMonitorsByStation(@RequestParam String stationId) {
+        return R.data(stationVideoTypeService.getMonitorsByStation(stationId));
+    }
+
+
+    @OperationAnnotation(moduleName = "视频监控", title = "视频监控", operatorType = OperatorType.APPSYSTEMS, businessType =
+            BusinessType.GENCODE,
+            action = "获取视频监测列表")
+    @GetMapping("/videoimages")
+    public R videoimages() {
+        return R.success("视频监控处理成功");
+    }
+
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java

@@ -130,9 +130,11 @@ public interface IStandardTicketInfoService extends BaseService<StandardTicketIn
 
 
 	/**
-	 * 查看操作票
+     * 查看操作票
-	 * @param ticketCountQueryVo
+     *
-	 * @return
+     * @param entityPage
-	 */
+     * @param ticketCountQueryVo
-	List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo);
+     * @return
+     */
+	IPage<StandardTicketInfoEntity> listByOperationTicketWithKeyword(Page<StandardTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java

@@ -707,12 +707,14 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
     /**
      * 查看操作票
      *
+     * @param entityPage
      * @param ticketCountQueryVo
      * @return
      */
     @Override
-    public List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public IPage<StandardTicketInfoEntity> listByOperationTicketWithKeyword(Page<StandardTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo) {
         String flowTaskName = ticketCountQueryVo.getFlowTaskName();
+        String dateTime = ticketCountQueryVo.getDateTime();
         String type = ticketCountQueryVo.getType();
         QueryWrapper<StandardTicketInfoEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StringUtils.isNotBlank(type), StandardTicketInfoEntity::getTicketType, type);
@@ -735,6 +737,11 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
                     evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
             queryWrapper.lambda().in(BaseEntity::getId, idList);
         }
-        return baseMapper.selectList(queryWrapper);
+
+
+        if (StringUtils.isNotBlank(dateTime)) {
+            queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
+        }
+        return baseMapper.selectPages(entityPage,queryWrapper);
     }
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketCountController.java

@@ -1,6 +1,8 @@
 package com.hnac.hzims.ticket.twoTicket.controller;
 
 import cn.hutool.http.server.HttpServerResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService;
 import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
@@ -79,10 +81,14 @@ public class TicketCountController {
     /**
      * 查看工作票
      */
-    @GetMapping("/listByTicketWithKeyword")
+    @GetMapping("/listByTicketWithKeyword/{page}/{size}")
-    public R listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public R listByTicketWithKeyword(
-        List<WorkTicketInfoEntity> workTicketInfoEntities =
+            @PathVariable Long page,
-                workTicketService.listByTicketWithKeyword(ticketCountQueryVo);
+            @PathVariable Long size,
+            TicketCountQueryVo ticketCountQueryVo) {
+        Page<WorkTicketInfoEntity> entityPage = new Page<>(page,size);
+        IPage<WorkTicketInfoEntity> workTicketInfoEntities =
+                workTicketService.listByTicketWithKeyword(entityPage,ticketCountQueryVo);
         return R.data(workTicketInfoEntities);
     }
 
@@ -90,10 +96,14 @@ public class TicketCountController {
     /**
      * 查看操作票
      */
-    @GetMapping("/listByOperationTicketWithKeyword")
+    @GetMapping("/listByOperationTicketWithKeyword/{page}/{size}")
-    public R listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public R listByOperationTicketWithKeyword(
-        List<StandardTicketInfoEntity> ticketInfoEntities =
+            @PathVariable Long page,
-                standardTicketInfoService.listByOperationTicketWithKeyword(ticketCountQueryVo);
+            @PathVariable Long size,
+            TicketCountQueryVo ticketCountQueryVo) {
+        Page<StandardTicketInfoEntity> entityPage = new Page<>(page,size);
+        IPage<StandardTicketInfoEntity> ticketInfoEntities =
+                standardTicketInfoService.listByOperationTicketWithKeyword(entityPage,ticketCountQueryVo);
         return R.data(ticketInfoEntities);
     }
 

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java

@@ -31,4 +31,10 @@ public class TicketCountQueryVo {
      * 合格
      */
     private String qualified;
+
+
+    /**
+     * 时间
+     */
+    private String dateTime;
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.ticket.workTicket.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hnac.hzims.ticket.areamonthly.vo.AreaMonthlyVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
 import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
@@ -173,8 +172,10 @@ public interface IWorkTicketInfoService extends BaseService<WorkTicketInfoEntity
 
 	/**
 	 * 查看工作票
+	 *
+	 * @param entityPage
 	 * @param ticketCountQueryVo
 	 * @return
 	 */
-	List<WorkTicketInfoEntity> listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo);
+	IPage<WorkTicketInfoEntity> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -26,7 +26,6 @@ import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
 import com.hnac.hzims.ticket.aspect.AroundFlow;
 import com.hnac.hzims.ticket.constants.TicketConstants;
-import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger;
 import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
 import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService;
@@ -1135,11 +1134,12 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
     /**
      * 查看工作票
      *
+     * @param entityPage
      * @param ticketCountQueryVo
      * @return
      */
     @Override
-    public List<WorkTicketInfoEntity> listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public IPage<WorkTicketInfoEntity> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo) {
         //延期
         String input = ticketCountQueryVo.getInput();
         //开票 结束 作废
@@ -1148,6 +1148,8 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         String qualified = ticketCountQueryVo.getQualified();
 
         String type = ticketCountQueryVo.getType();
+
+        String dateTime = ticketCountQueryVo.getDateTime();
         //查询
         QueryWrapper<WorkTicketInfoEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StringUtils.isNotBlank(type), WorkTicketInfoEntity::getType,
@@ -1163,6 +1165,9 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         }
 
 
+        if (StringUtils.isNotBlank(dateTime)) {
+            queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
+        }
         //合格
         if (StringUtils.isNoneBlank(qualified) && "合格".equals(qualified)) {
             List<WorkTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(null);
@@ -1175,6 +1180,6 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
                     evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
             queryWrapper.lambda().in(BaseEntity::getId, idList);
         }
-        return baseMapper.selectList(queryWrapper);
+        return baseMapper.selectPages(entityPage,queryWrapper);
     }
 }