防火监督联调

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

@@ -280,6 +280,6 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("checkUserId", checkInput.getUserId());
         result.put("checkUserName", checkInput.getUserName());
         result.put("planExecuteTime", checkInput.getCreateDate());
-        result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).toString());
+        result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(",")));
     }
 }

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

@@ -1221,13 +1221,17 @@ public class PointServiceImpl implements IPointService {
                 if (map.containsKey("picJson") && !ObjectUtils.isEmpty(map.get("picJson"))) {
                     map.put("remark", fileUrl + map.get("remark"));
                 }
+                List<DangerDto> dangerDtoList = new ArrayList<>();
                 if (map.containsKey("inputId") && !ObjectUtils.isEmpty(map.get("inputId"))) {
                     String inputId = map.get("inputId").toString();
                     if (!"0".equals(inputId) && !ObjectUtils.isEmpty(collect)) {
-                        List<DangerDto> dangerDtoList = collect.get(Long.parseLong(inputId));
-                        map.put("dangerList", dangerDtoList);
+                        dangerDtoList = collect.get(Long.parseLong(inputId));
+                        if (ObjectUtils.isEmpty(dangerDtoList)) {
+                            dangerDtoList = new ArrayList<>();
+                        }
                     }
                 }
+                map.put("dangerList", dangerDtoList);
             }
         }
         return list;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/core/framework/PersonIdentifyAspect.java

@@ -55,7 +55,7 @@ public class PersonIdentifyAspect {
                 Map person = (Map) map.get("PERSON");
                 if (!ObjectUtils.isEmpty(person)) {
                     personIdentity.setPersonSeq((String) person.get("sequenceNbr"));
-                    personIdentity.setPersonName((String) person.get("recUserName"));
+                    personIdentity.setPersonName((String) person.get("bizOrgName"));
                 }
                 if (!ObjectUtils.isEmpty(other)) {
                     personIdentity.setCompanyId((String) other.get("sequenceNbr"));

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

@@ -1150,7 +1150,11 @@
 			pii.data_json dataJson,
 			pii.remark remark,
 			pii.picture_json picJson,
+			pci.user_id userId,
+			pci.user_name userName,
 			pii.id itemId,
+			group_concat(pcs.photo_data) photoData,
+			COALESCE (pci.input_value, '') selectValue,
 			CASE pii.`input_type`
 			WHEN 0 THEN
 				'手动录入'
@@ -1162,10 +1166,11 @@
 			LEFT JOIN p_route_point_item  ppi ON ppi.route_point_id = prp.id
 			LEFT JOIN p_input_item pii ON ppi.input_item_id = pii.id
 			LEFT JOIN p_check_input pci ON pci.route_point_item_id = ppi.id
+			LEFT JOIN p_check_shot pcs ON pci.id = pcs.check_input_id
 		WHERE
 			prp.route_id = #{routeId} AND pii.is_delete = 0
--- 			 AND pci.route_point_item_id is NULL
-			ORDER BY pii.order_no
+			AND pci.input_value is NULL OR pci.input_value <![CDATA[<>]]> 'pass'
+			GROUP BY ppi.id
 	</select>
 
 	<select id="getPlanExecuteTeams" resultType="map">