From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
index f5739a7..f6ce5e5 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -93,7 +93,9 @@
StringBuilder builder = new StringBuilder("");
List<PatrolRecordVO> patrolRecordVOList = taskPlaceRectificationVO.getPatrolRecordVOList();
for (int i = 0; i < patrolRecordVOList.size(); i++) {
- builder.append(i + 1).append(" ： ").append(patrolRecordVOList.get(i).getItemsName()).append("; ");
+ if(patrolRecordVOList.get(i).getState().equals(0)){
+ builder.append(i + 1).append(" ： ").append(patrolRecordVOList.get(i).getItemsName()).append("; ");
+ }
}
taskPlaceRectificationVO.setHiddenDanger(builder.toString());
}
@@ -161,7 +163,13 @@
for (TaskPlaceRectificationExcel taskPlaceRectificationExcel : export) {
for (DictBiz dictBiz : nineType) {
if (StringUtils.isNotBlank(taskPlaceRectificationExcel.getNineType()) && taskPlaceRectificationExcel.getNineType().equals(dictBiz.getDictKey())) {
- taskPlaceRectificationExcel.setNineType(dictBiz.getDictValue());
+ if (taskPlaceRectificationExcel.getNineType().contains("10,11,12")) {
+ taskPlaceRectificationExcel.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
+ } else if (taskPlaceRectificationExcel.getNineType().contains("13,14,15")) {
+ taskPlaceRectificationExcel.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
+ } else {
+ taskPlaceRectificationExcel.setNineType(dictBiz.getDictValue());
+ }
}
}
if (taskPlaceRectificationExcel.getRectificationFlag().equals(1)) {
@@ -177,7 +185,9 @@
StringBuilder builder = new StringBuilder("");
List<PatrolRecordVO> patrolRecordVOList = taskPlaceRectificationExcel.getPatrolRecordVOList();
for (int i = 0; i < patrolRecordVOList.size(); i++) {
- builder.append(i + 1).append(" ： ").append(patrolRecordVOList.get(i).getItemsName()).append("; ");
+ if(patrolRecordVOList.get(i).getState().equals(0)){
+ builder.append(i + 1).append(" ： ").append(patrolRecordVOList.get(i).getItemsName()).append("; ");
+ }
}
taskPlaceRectificationExcel.setHiddenDanger(builder.toString());
}
--
Gitblit v1.9.3