防火监督图片查看

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

@@ -592,8 +592,10 @@ public class CheckController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "根据检查记录查询照片", notes = "根据检查记录查询照片")
     @RequestMapping(value = "/getPictureByCheckId", method = RequestMethod.GET)
-    public CommonResponse getPictureByCheckId(@ApiParam(value = "检查记录ID") @RequestParam String checkId) {
-        List<String> pictures = checkService.getPictureByCheckId(checkId);
+    public CommonResponse getPictureByCheckId(@ApiParam(value = "检查记录ID") @RequestParam String checkId,
+                                              @ApiParam(value = "检查项ID") @RequestParam String id
+    ) {
+        List<String> pictures = checkService.getPictureByCheckId(checkId,id);
         return CommonResponseUtil.success(pictures);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/CheckMapper.java

@@ -305,5 +305,5 @@ public interface CheckMapper extends BaseMapper {
      */
     List<Check> getCheckListByTaskId(@Param(value = "planTaskId") long id);
 
-    List<String> getPictureByCheckId(String checkId);
+    List<String> getPictureByCheckId(String checkId,String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -1577,7 +1577,7 @@ public class CheckServiceImpl implements ICheckService {
 
             Plan plan = planService.queryPlanById(planTask.getPlanId());
             // 计划完成，规则推送消息
-            if (PlanStatusEnum.COMPLETED.getValue() == plan.getStatus()){
+            if (PlanStatusEnum.COMPLETED.getValue() == plan.getStatus()) {
                 rulePlanService.addPlanRule(plan, null, RuleTypeEnum.计划完成, null);
             }
 
@@ -1686,7 +1686,7 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public List<String> getPictureByCheckId(String checkId) {
-        return checkMapper.getPictureByCheckId(checkId);
+    public List<String> getPictureByCheckId(String checkId, String id) {
+        return checkMapper.getPictureByCheckId(checkId,id);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/ICheckService.java

@@ -283,5 +283,5 @@ public interface ICheckService {
 
     Page<CheckVo> queryPage(CheckPageParam criterias);
 
-    List<String> getPictureByCheckId(String checkId);
+    List<String> getPictureByCheckId(String checkId,String id);
 }

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

@@ -2057,8 +2057,14 @@
         SELECT
             photo_data
         FROM
-            p_check_shot
+            p_check_shot a
+        LEFT JOIN
+            p_check_input b
+        ON
+        a.check_input_id=b.id
         WHERE
-            check_id = #{checkId}
+            a.check_id = #{checkId}
+        AND
+            b.input_id= #{id}
     </select>
 </mapper>
\ No newline at end of file