修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3343,6 +3343,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				peopleBasicInfoDto.setBizOrgName(firefighters.getBizOrgName());
 				peopleBasicInfoDto.setFireTeamId(firefighters.getFireTeamId());
 				peopleBasicInfoDto.setFireTeamName(firefighters.getFireTeamName());
+				//10445 BUG
+				peopleBasicInfoDto.setCertificatesType(firefighters.getCertificatesType());
 			}
 		}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1919,6 +1919,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     List<String> indicatorList = Arrays.asList(split);
                     List<Map<String, Object>> weekReportList = fireFightingSystemMapper.selectWeekReportList(String.valueOf(system.get("id")), startDate, endDate);
                     ArrayList<Map<String, Object>> list = new ArrayList<>();
+                    ArrayList<Map<String, Object>> alarmMapList = new ArrayList<>();
+
                     if (!CollectionUtils.isEmpty(weekReportList)) {
                         for (Map<String, Object> weekItem : weekReportList) {
                             HashMap<String, Object> listItem = new HashMap<>();
@@ -1945,6 +1947,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             } else {
                                 listItem.put("trueNum", String.valueOf(0));
                             }
+                            Map<String, Object> alarmMap = new HashMap<>();
+                            alarmMap.put("type",listItem.get("name"));
+                            alarmMap.put("value",listItem.get("alarmEquipNum"));
+                            alarmMapList.add(alarmMap);
                             list.add(listItem);
                         }
                     } else {
@@ -1973,8 +1979,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             "条，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))+"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))+"%");
 
                     // echarts 图表
-                    List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate);
-                    String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
+                   // List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate);
+                    String pieChart1 = ChartsUtils.pieChart(alarmMapList, "故障设备类型占比");
 
                    // List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);
                     ArrayList<Map<String, Object>> dayEchart = new ArrayList<>();
@@ -1992,7 +1998,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     }
 
                     dayEchart.add(dayEchartsDate1);
-                    String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警信息占比");
+                    String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警设备占比");
                     systemData.put("pictureRight", pieChart1);
                     systemData.put("pictureLeft", pieChart2);
 

amos-boot-system-patrol/src/main/resources/db/mapper/CheckInputMapper.xml

@@ -81,7 +81,7 @@
 			c.point_id,
 			c.point_name,
 			c.check_time,
-			pt.end_time AS `date`,
+			null AS `date`,
 			c.plan_id,
 			c.plan_name,
 			c.route_id,

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

@@ -83,7 +83,7 @@
             <if test="pointName!=null">and b.name like concat(concat("%",#{pointName}),"%")</if>
             <if test="pointNo!=null">and b.point_no like concat('%',#{pointNo},'%')</if>
             <if test="isFixed!=null">and b.is_fixed = #{isFixed}</if>
-            <if test="isOK!=null">and a.is_OK = #{isOK}</if>
+            <if test="isOK!=null and isOk!=''">and a.is_OK = #{isOK}</if>
             <if test="planId!=null">and a.plan_Id = #{planId}</if>
             <if test="planTaskId!=null">and a.plan_task_id = #{planTaskId}</if>
             <if test="userId!=null">and find_in_set(#{userId}, a.user_id) > 0</if>