ly 3 vuotta sitten
vanhempi
commit
5822d6909b

+ 21 - 4
master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -224,10 +224,27 @@ public class THazardWorkPermitController extends BaseController {
         getCheck(params ,tHazardWorkPermit.getcIsHealthHazard(),"cIsHealthHazard");
         getCheck(params ,tHazardWorkPermit.getcIsCompressedGas(),"cIsCompressedGas");
         getCheck(params ,tHazardWorkPermit.getcIsEnvironmentalHazard(),"cIsEnvironmentalHazard");
-//        getCheck(params ,tHazardWorkPermit.getcIsDanger(),"cIsHighTemp");
-//        getCheck(params ,tHazardWorkPermit.getcIsDanger(),"cIsCompressedGas");
-//        getCheck(params ,tHazardWorkPermit.getcIsDanger(),"cIsCompressedGas");
-
+        //设备内物质处于危险状态({{cIsHighTemp}}高温/{{cIsLowTemp}}低温;{{cIsPosPressure}}正压/{{cIsNegPressure}}负压
+        getCheck(params ,tHazardWorkPermit.getcIsHighTemp(),"cIsHighTemp");
+        getCheck(params ,tHazardWorkPermit.getcIsLowTemp(),"cIsLowTemp");
+        getCheck(params ,tHazardWorkPermit.getcIsPosPressure(),"cIsPosPressure");
+        getCheck(params ,tHazardWorkPermit.getcIsNegPressure(),"cIsNegPressure");
+        //来自设备/设施的危害({{cIsMovingParts}}移动部件,{{cIsHotSurfaces}}热表面/ {{cIsColdSurfaces}}冷表面,{{cIsVoltages}}电压)
+        getCheck(params ,tHazardWorkPermit.getcIsMovingParts(),"cIsMovingParts");
+        getCheck(params ,tHazardWorkPermit.getcIsHotSurfaces(),"cIsHotSurfaces");
+        getCheck(params ,tHazardWorkPermit.getcIsColdSurfaces(),"cIsColdSurfaces");
+        getCheck(params ,tHazardWorkPermit.getcIsVoltages(),"cIsVoltages");
+        //{{cIsWorkProtective}} 安全保护设备的施工({{cIsDy}}电仪安全保护设备,{{cIsAqf}}安全阀,{{cIsLq}}冷却系统)
+        getCheck(params ,tHazardWorkPermit.getcIsWorkProtective(),"cIsWorkProtective");
+        getCheck(params ,tHazardWorkPermit.getcIsDy(),"cIsDy");
+        getCheck(params ,tHazardWorkPermit.getcIsAqf(),"cIsAqf");
+        getCheck(params ,tHazardWorkPermit.getcIsLq(),"cIsLq");
+        //{{cIsOtherDanger}} 其它危害:{{cOtherDangerContent}}
+        getCheck(params ,tHazardWorkPermit.getcIsOtherDanger(),"cIsOtherDanger");
+        params.put("cOtherDangerContent" , Texts.of(tHazardWorkPermit.getcOtherDangerContent()).fontSize(7).bold().create());
+        //{{cIsHazardsProd}}	施工对生产单位的危害:{{cIsHazardsProdContent}}
+        getCheck(params ,tHazardWorkPermit.getcIsHazardsProd(),"cIsHazardsProd");
+        params.put("cIsHazardsProdContent" , Texts.of(tHazardWorkPermit.getcIsHazardsProdContent()).fontSize(7).bold().create());
 
         return params;
     }

BIN
master/src/main/resources/static/word/ticket.docx