bug修改

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

@@ -498,7 +498,8 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
             @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 {
+            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize,
+            @ApiParam(value = "qrCode") @RequestParam(value = "qrCode", required = false) String qrCode) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -528,6 +529,7 @@ public class CheckController extends AbstractBaseController {
         params.put("companyId", companyId);
         params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);
+        params.put("qrCode", qrCode);
         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

@@ -1906,6 +1906,7 @@
                 ) checkDate,
                 pp.id pointId,
                 pp.equipment_id equipmentId,
+                pp.point_no as qrCode,
                 pp.equipment_name equipmentName,
                 pp.name equipmentDetailName,
                 pp.belong_system_id systemId,
@@ -1949,6 +1950,8 @@
             </if>
             <if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
             <if test="equipId != null and equipId != '' "> and a.equipId = #{equipId}</if>
+
+            <if test="qrCode != null and qrCode != ''"> and a.qrCode = #{qrCode}</if>
             <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''  ">
                 AND (
                 (
@@ -2017,6 +2020,7 @@
         ) checkDate,
         pp.id pointId,
         pp.equipment_id equipmentId,
+        pp.point_no as qrCode,
         pp.equipment_name equipmentName,
         pp.belong_system_id systemId,
         pp.belong_system_name systemName,