更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -498,6 +498,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "结束时间") @RequestParam(value = "endTime", required = false) String endTime,
             @ApiParam(value = "维保人员") @RequestParam(value = "personId", required = false) String person,
             @ApiParam(value = "业主单位") @RequestParam(value = "teamId", required = false) String teamId,
+            @ApiParam(value = "设施Id") @RequestParam(value = "equipId", required = false) String equipId,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
             @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception{
         HashMap<String, Object> params = new HashMap<>();
@@ -513,6 +514,7 @@ public class CheckController extends AbstractBaseController {
         params.put("endTime", endTime);
         params.put("person", person);
         params.put("teamId", teamId);
+        params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         return CommonResponseUtil.success(checkService.getCheckPage(params, pageable));

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1907,6 +1907,7 @@
                 pp.belong_system_id systemId,
                 pp.belong_system_name systemName,
                 pp.address address,
+                pp.original_id equipId,
                 CONCAT(pp.address, pp.building_name) buildingName
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
@@ -1937,6 +1938,7 @@
                 <include refid="mobile-check-time-last-month"></include>
             </if>
             <if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
+            <if test="equipId != null and equipId != '' "> and a.equipId = #{equipId}</if>
             <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''  ">
                 AND (
                 (