修改报表显示

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FirePatrolReportController.java

@@ -44,10 +44,10 @@ public class FirePatrolReportController {
 	@GetMapping(value = "/download")
 	@TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
 	public void download(HttpServletRequest request, HttpServletResponse response,
-			@ApiParam(value = "换流站编码", required = true) @RequestParam String code,
+			@ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode,
 			@ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern="yyyy-MM-dd")Date startDate,
 			@ApiParam(value = "结束日期", required = true) @RequestParam @DateTimeFormat(pattern="yyyy-MM-dd")Date endDate) {
-		iFirePatrolReportService.download(request, response, code, startDate, endDate);
+		iFirePatrolReportService.download(request, response, stationCode, startDate, endDate);
 	}
 	
 	@ApiOperation(value = "所有站查询列表", notes = "所有站查询列表")

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

@@ -87,35 +87,50 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		SimpleDateFormat dateFm = new SimpleDateFormat("EEEE");
 		String currSun = dateFm.format(new Date());
 		map.put("create_date", timeStr2 + currSun);
+		map.put("create_date2", timeStr2);
 		// 统计时间2
 		map.put("statistical_time2", statisticalTime.replaceAll("-", "至"));
 		// 巡查任务数
 		map.put("task_count", "10");
 		// 完成任务数
 		map.put("complete_task_count", "5");
+		int uncomplete_task_count = 2;
 		// 未完成任务数
-		map.put("uncomplete_task_count", "2");
+		map.put("uncomplete_task_count", uncomplete_task_count);
+		double complete_task_percent = 0.4;
 		// 任务完成率
 		map.put("complete_task_percent", "40%");
+		// 任务合格
+		map.put("task_qualified", uncomplete_task_count!=0?"不合格":"合格");
+		// 任务完成率合格
+		map.put("task_percent_qualified", complete_task_percent!=1?"不合格":"合格");
 		// 巡查人员数
 		map.put("person_count", "5");
 		// 持证人员数
 		map.put("certified_person_count", "3");
+		double certified_percent = 0.6;
 		// 持证率
 		map.put("certified_percent", "60%");
+		// 人员合格
+		map.put("person_qualified", certified_percent!=1?"不合格":"合格");
 		// 应巡查设备总数
-		map.put("equipment_count", "12");
+		int equipment_count = 12;
+		map.put("equipment_count", equipment_count);
 		int checked_equipment_count = 7;
 		// 实际巡查设备总数
 		map.put("checked_equipment_count", checked_equipment_count);
-		int unchecked_equipment_count = 5;
+		// 实际巡查设备总数-合格
+		map.put("checked_equipment_qualified", checked_equipment_count!=equipment_count?"不合格":"合格");
 		// 漏查设备总数
+		int unchecked_equipment_count = 5;
 		map.put("unchecked_equipment_count", unchecked_equipment_count);
+		// 漏查设备总数-合格
+		map.put("unchecked_equipment_qualified", unchecked_equipment_count>0?"不合格":"合格");
 		// 发现问题总数
 		map.put("problem_count", "5");
-		// 发现问题总数
+		// 修复问题总数
 		map.put("fixed_problem_count", "3");
-		// 发现问题总数
+		// 未修复问题总数
 		map.put("unfixed_problem_count", "2");
 		// 巡查点位数
 		map.put("checked_location_count", "2");

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -5,6 +5,7 @@
     <select id="allPage" resultType="com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto">
 		SELECT
 			*,
+	        cb_org_usr.biz_org_code AS stationCode,
 	     '消防巡查报表'   AS reportName,
 		 cb_org_usr.biz_org_name AS stationName,
 		 (CASE wl_analysis_report_log.report_type