|
@@ -24,6 +24,8 @@ import com.ruoyi.project.patrol.emergency.domain.TEmergencyEyewash;
|
|
|
import com.ruoyi.project.patrol.emergency.domain.TEmergencyPaga;
|
|
|
import com.ruoyi.project.patrol.fire.controller.*;
|
|
|
import com.ruoyi.project.patrol.fire.domain.*;
|
|
|
+import com.ruoyi.project.patrol.patrol.domain.TPatrolPlan;
|
|
|
+import com.ruoyi.project.patrol.patrol.mapper.TPatrolPlanMapper;
|
|
|
import com.ruoyi.project.plant.domain.TStaffmgr;
|
|
|
import com.ruoyi.project.pssr.domain.*;
|
|
|
import com.ruoyi.project.pssr.domain.dto.TPssrApproveDto;
|
|
@@ -392,6 +394,8 @@ public class TPssrApproveController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private TPssrSubcontentController subcontentController;
|
|
|
+ @Autowired
|
|
|
+ private TPatrolPlanMapper tPatrolPlanMapper;
|
|
|
//endregion
|
|
|
|
|
|
@PutMapping("/handleConfirm")
|
|
@@ -1909,10 +1913,12 @@ public class TPssrApproveController extends BaseController {
|
|
|
for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
|
|
|
String planType = tPssrPatrol.getPlanType().toString();
|
|
|
Long planId = tPssrPatrol.getPlanId();
|
|
|
+ TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
|
|
|
switch (planType) {
|
|
|
case "1"://手提式/小推车式灭火器/灭火器材箱检查记录
|
|
|
TFireAnnihilator annihilator = new TFireAnnihilator();
|
|
|
annihilator.setPlanId(planId);
|
|
|
+ annihilator.setYear(plan.getPlanYear());
|
|
|
result = annihilatorController.export(annihilator);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1925,6 +1931,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "2"://消防水炮检查记录
|
|
|
TFireWaterCannon waterCannon = new TFireWaterCannon();
|
|
|
waterCannon.setPlanId(planId);
|
|
|
+ waterCannon.setYear(plan.getPlanYear());
|
|
|
result = waterCannonController.export(waterCannon);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1937,6 +1944,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "3"://地上消火栓检查记录
|
|
|
TFirePostFire postFire = new TFirePostFire();
|
|
|
postFire.setPlanId(planId);
|
|
|
+ postFire.setYear(plan.getPlanYear());
|
|
|
result = postFireController.export(postFire);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1949,6 +1957,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "4"://消防水带箱检查记录
|
|
|
TFireHoseBox hoseBox = new TFireHoseBox();
|
|
|
hoseBox.setPlanId(planId);
|
|
|
+ hoseBox.setYear(plan.getPlanYear());
|
|
|
result = hoseBoxController.export(hoseBox);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1961,6 +1970,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "5"://消防竖管检查记录
|
|
|
TFireStandpipePatrol standpipe = new TFireStandpipePatrol();
|
|
|
standpipe.setPlanId(planId);
|
|
|
+ standpipe.setYear(plan.getPlanYear());
|
|
|
result = standpipeController.export(standpipe);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1973,6 +1983,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "6"://自动喷淋灭火系统检查记录
|
|
|
TFireSprinkler sprinkler = new TFireSprinkler();
|
|
|
sprinkler.setPlanId(planId);
|
|
|
+ sprinkler.setYear(plan.getPlanYear());
|
|
|
result = sprinklerController.export(sprinkler);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1985,6 +1996,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "7"://应急事故柜检查记录
|
|
|
TEmergencyCabinet cabinet = new TEmergencyCabinet();
|
|
|
cabinet.setPlanId(planId);
|
|
|
+ cabinet.setYear(plan.getPlanYear());
|
|
|
result = cabinetController.export(cabinet);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -1997,6 +2009,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "8"://现场可燃气体检测器/火灾报警系统检查记录
|
|
|
TFireAlarm alarm = new TFireAlarm();
|
|
|
alarm.setPlanId(planId);
|
|
|
+ alarm.setYear(plan.getPlanYear());
|
|
|
result = alarmController.export(alarm);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2021,6 +2034,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "12"://淋浴洗眼器检查记录
|
|
|
TEmergencyEyewash eyewash = new TEmergencyEyewash();
|
|
|
eyewash.setPlanId(planId);
|
|
|
+ eyewash.setYear(plan.getPlanYear());
|
|
|
result = eyewashController.export(eyewash);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2033,6 +2047,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "13"://应急沙箱检查记录
|
|
|
TFireSandbox sandbox = new TFireSandbox();
|
|
|
sandbox.setPlanId(planId);
|
|
|
+ sandbox.setYear(plan.getPlanYear());
|
|
|
result = sandboxController.export(sandbox);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2045,6 +2060,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "14"://常闭式防爆门/防火门检查记录
|
|
|
TFireDoor door = new TFireDoor();
|
|
|
door.setPlanId(planId);
|
|
|
+ door.setYear(plan.getPlanYear());
|
|
|
result = doorController.export(door);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2057,6 +2073,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "15"://风向标/风向袋/新风系统正压计检查记录
|
|
|
TFireWeathervane weathervane = new TFireWeathervane();
|
|
|
weathervane.setPlanId(planId);
|
|
|
+ weathervane.setYear(plan.getPlanYear());
|
|
|
result = weathervaneController.export(weathervane);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2069,6 +2086,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "16"://蒸汽幕检查记录
|
|
|
TFireSteamCurtain steamCurtain = new TFireSteamCurtain();
|
|
|
steamCurtain.setPlanId(planId);
|
|
|
+ steamCurtain.setYear(plan.getPlanYear());
|
|
|
result = steamCurtainController.export(steamCurtain);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2081,6 +2099,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "27"://急救箱检查记录
|
|
|
TFireAidkit aidkit = new TFireAidkit();
|
|
|
aidkit.setPlanId(planId);
|
|
|
+ aidkit.setYear(plan.getPlanYear());
|
|
|
result = aidkitController.export(aidkit);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2155,10 +2174,12 @@ public class TPssrApproveController extends BaseController {
|
|
|
for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
|
|
|
String planType = tPssrPatrol.getPlanType().toString();
|
|
|
Long planId = tPssrPatrol.getPlanId();
|
|
|
+ TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
|
|
|
switch (planType) {
|
|
|
case "10"://PAGA系统检查记录
|
|
|
TEmergencyPaga paga = new TEmergencyPaga();
|
|
|
paga.setPlanId(planId);
|
|
|
+ paga.setYear(plan.getPlanYear());
|
|
|
result = pagaController.export(paga);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2171,6 +2192,7 @@ public class TPssrApproveController extends BaseController {
|
|
|
case "11"://CCTV系统检查记录
|
|
|
TEmergencyCctv cctv = new TEmergencyCctv();
|
|
|
cctv.setPlanId(planId);
|
|
|
+ cctv.setYear(plan.getPlanYear());
|
|
|
result = cctvController.export(cctv);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|
|
@@ -2188,10 +2210,12 @@ public class TPssrApproveController extends BaseController {
|
|
|
for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
|
|
|
String planType = tPssrPatrol.getPlanType().toString();
|
|
|
Long planId = tPssrPatrol.getPlanId();
|
|
|
+ TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
|
|
|
switch (planType) {
|
|
|
case "18"://四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录
|
|
|
TCommonuseTester tester = new TCommonuseTester();
|
|
|
tester.setPlanId(planId);
|
|
|
+ tester.setYear(plan.getPlanYear());
|
|
|
result = testerController.export(tester);
|
|
|
if (result != null) {
|
|
|
msg = (String) result.get("msg");
|