大屏-应急处置-陕西省-右屏-月度困人故障高发使用单位下钻-安康市人民医院详情-设备列表第一条数据查看详情报错

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml

@@ -109,11 +109,10 @@
 			tzs_safety_problem_tracing
 		WHERE
 			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
-			AND problem_level IS NOT NULL
 			<if test="now != null and now != ''">
 				AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
 			</if>
-			<if test="sourceTypeCode !=null and sourceTypeCode !=''">
+			<if test="sourceTypeCode !=null and sourceTypeCode !='' and sourceTypeCode != 2">
 				and source_type_code = #{sourceTypeCode}
 			</if>
 	</select>
@@ -193,7 +192,6 @@
 		WHERE
 			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
 		  AND DATE_FORMAT ( problem_time, '%Y' ) = #{time}
-		  AND problem_level IS NOT NULL
 		GROUP BY
 			principal_unit_code
 		ORDER BY
@@ -373,14 +371,13 @@
 		from tzs_safety_problem_tracing spt
 		<where>
 			spt.is_delete = false
-			AND spt.problem_level IS NOT NULL
 			<if test="problemModel.problemNum != null and problemModel.problemNum != ''">
 				and spt.problem_num = LIKE CONCAT('%', #{problemModel.problemNum}, '%')
 			</if>
 			<if test="problemModel.problemStatus != null and problemModel.problemStatus != ''">
 				and spt.problem_status = #{problemModel.problemStatus}
 			</if>
-			<if test="problemModel.sourceTypeCode != null and problemModel.sourceTypeCode != ''">
+			<if test="problemModel.sourceTypeCode != null and problemModel.sourceTypeCode != '' and problemModel.sourceTypeCode != 2">
 				and spt.source_type_code = #{problemModel.sourceTypeCode}
 			</if>
 			<if test="problemModel.problemLevelCode != null and problemModel.problemLevelCode != ''">

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -608,12 +608,14 @@ public class DPSubServiceImpl {
                     log.info("附件数据：{}", value);
                     ((JSONArray)value).stream().forEach(y -> {
                         JSONObject yObj = (JSONObject) y;
-                        String[] str = yObj.getString("url").split("\\.");
-                        if (ValidationUtil.isEmpty(str)){
-                            yObj.put("thumb", yObj.getString("url"));
-                        } else {
-                            MatinfoEnum iconUrl = MatinfoEnum.getIconUrl(str[1]);
-                            yObj.put("thumb", ValidationUtil.isEmpty(iconUrl) ? yObj.getString("url") : iconUrl.getIcon());
+                        if(!ValidationUtil.isEmpty(yObj.getString("url"))) {
+                            String[] str = yObj.getString("url").split("\\.");
+                            if (ValidationUtil.isEmpty(str)) {
+                                yObj.put("thumb", yObj.getString("url"));
+                            } else {
+                                MatinfoEnum iconUrl = MatinfoEnum.getIconUrl(str[1]);
+                                yObj.put("thumb", ValidationUtil.isEmpty(iconUrl) ? yObj.getString("url") : iconUrl.getIcon());
+                            }
                         }
                     });
                     attachmentUploadDatasObj.put("value", value);