ly 2 anos atrás
pai
commit
2313e61759

+ 97 - 76
master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -131,7 +131,7 @@ public class THazardWorkPermitController extends BaseController {
     public AjaxResult add(@RequestBody THazardWorkPermit tHazardWorkPermit) throws IOException {
         TTicketId tTicketId = new TTicketId();
         tTicketId.setId(1l);
-        Long ticketId =  tTicketIdController.createId(tTicketId);
+        Long ticketId = tTicketIdController.createId(tTicketId);
         logger.info("ticketId:" + ticketId);
         tHazardWorkPermit.setaId(ticketId);
         //生成word
@@ -147,7 +147,7 @@ public class THazardWorkPermitController extends BaseController {
         tHazardWorkPermit.setWordUrl(wordPath);
         //使用流的方式转换PDF
         String fileName2 = "A" + tHazardWorkPermit.getaId() + ".pdf";
-        String pdfPath = this.wordController.createPDF( fileDir, fileName,fileName2, params);
+        String pdfPath = this.wordController.createPDF(fileDir, fileName, fileName2, params);
         tHazardWorkPermit.setPdfUrl(pdfPath);
 
         tHazardWorkPermitService.insertTHazardWorkPermit(tHazardWorkPermit);
@@ -220,14 +220,14 @@ public class THazardWorkPermitController extends BaseController {
         // 模板路径
         String templatePath = "static/word/ticket.docx";
         // 生成word的路径
-        String fileDir = RuoYiConfig.getProfile() + "/"+ "ticketWord";
+        String fileDir = RuoYiConfig.getProfile() + "/" + "ticketWord";
         // 生成word的文件
         String fileName = "A" + tHazardWorkPermit.getaId() + ".docx";
         String wordPath = this.wordController.createWord(templatePath, fileDir, fileName, params);
         tHazardWorkPermit.setWordUrl(wordPath);
         //使用流的方式转换PDF
         String fileName2 = "A" + tHazardWorkPermit.getaId() + ".pdf";
-        String pdfPath = this.wordController.createPDF( fileDir, fileName,fileName2, params);
+        String pdfPath = this.wordController.createPDF(fileDir, fileName, fileName2, params);
         tHazardWorkPermit.setPdfUrl(pdfPath);
         return toAjax(tHazardWorkPermitService.updateTHazardWorkPermit(tHazardWorkPermit));
     }
@@ -241,103 +241,124 @@ public class THazardWorkPermitController extends BaseController {
         return toAjax(tHazardWorkPermitService.deleteTHazardWorkPermitByIds(aIds));
     }
 
-    public Map<String, Object> getWordData (THazardWorkPermit tHazardWorkPermit){
+    public Map<String, Object> getWordData(THazardWorkPermit tHazardWorkPermit) {
         Map<String, Object> params = new HashMap<>();
         // 渲染文本
-        params.put("aId",Texts.of(tHazardWorkPermit.getaId().toString()).fontSize(7).bold().create());
-        params.put("aEquipmentName" , Texts.of(tHazardWorkPermit.getaEquipmentName()).fontSize(7).bold().create());
-        params.put("aEquipmentLeader" , Texts.of(tHazardWorkPermit.getaEquipmentLeader()).fontSize(7).bold().create());
-        params.put("aEquipmentTel" , Texts.of(tHazardWorkPermit.getaEquipmentTel()).fontSize(7).bold().create());
-        params.put("aEquipmentOffice" , Texts.of(tHazardWorkPermit.getaEquipmentOffice()).fontSize(7).bold().create());
-        params.put("aConstructionName" , Texts.of(tHazardWorkPermit.getaConstructionName()).fontSize(7).bold().create());
-        params.put("aConstructionLeader" ,Texts.of(tHazardWorkPermit.getaConstructionLeader()).fontSize(7).bold().create());
-        params.put("aConstructionTel" , Texts.of(tHazardWorkPermit.getaConstructionTel()).fontSize(7).bold().create());
-        params.put("aConstructionOffice" , Texts.of(tHazardWorkPermit.getaConstructionOffice()).fontSize(7).bold().create());
-        params.put("aContractorName" , Texts.of(tHazardWorkPermit.getaContractorName()).fontSize(7).bold().create());
-        params.put("aContractorLeader" , Texts.of(tHazardWorkPermit.getaContractorLeader()).fontSize(7).bold().create());
-        params.put("aContractorTel" , Texts.of(tHazardWorkPermit.getaContractorTel()).fontSize(7).bold().create());
-        params.put("aContractorOffice" , Texts.of(tHazardWorkPermit.getaContractorOffice()).fontSize(7).bold().create());
+        params.put("aId", Texts.of(tHazardWorkPermit.getaId().toString()).fontSize(7).bold().create());
+        params.put("aEquipmentName", Texts.of(tHazardWorkPermit.getaEquipmentName()).fontSize(7).bold().create());
+        params.put("aEquipmentLeader", Texts.of(tHazardWorkPermit.getaEquipmentLeader()).fontSize(7).bold().create());
+        params.put("aEquipmentTel", Texts.of(tHazardWorkPermit.getaEquipmentTel()).fontSize(7).bold().create());
+        params.put("aEquipmentOffice", Texts.of(tHazardWorkPermit.getaEquipmentOffice()).fontSize(7).bold().create());
+        params.put("aConstructionName", Texts.of(tHazardWorkPermit.getaConstructionName()).fontSize(7).bold().create());
+        params.put("aConstructionLeader", Texts.of(tHazardWorkPermit.getaConstructionLeader()).fontSize(7).bold().create());
+        params.put("aConstructionTel", Texts.of(tHazardWorkPermit.getaConstructionTel()).fontSize(7).bold().create());
+        params.put("aConstructionOffice", Texts.of(tHazardWorkPermit.getaConstructionOffice()).fontSize(7).bold().create());
+        params.put("aContractorName", Texts.of(tHazardWorkPermit.getaContractorName()).fontSize(7).bold().create());
+        params.put("aContractorLeader", Texts.of(tHazardWorkPermit.getaContractorLeader()).fontSize(7).bold().create());
+        params.put("aContractorTel", Texts.of(tHazardWorkPermit.getaContractorTel()).fontSize(7).bold().create());
+        params.put("aContractorOffice", Texts.of(tHazardWorkPermit.getaContractorOffice()).fontSize(7).bold().create());
 
-        getCheck(params,tHazardWorkPermit.getaIsNeedSafeLiaison().toString() ,"aIsNSL1" ,"aIsNSL2"  );
-        params.put("aSafeLiaisonName" , Texts.of(tHazardWorkPermit.getaSafeLiaisonName()).fontSize(7).bold().create());
-        params.put("aSafeLiaisonSign" , Texts.of(tHazardWorkPermit.getaSafeLiaisonSign()).fontSize(7).bold().create());
-        params.put("aSafeLiaisonTel" , Texts.of(tHazardWorkPermit.getaSafeLiaisonTel()).fontSize(7).bold().create());
-        params.put("aSafeLiaisonOffice" , Texts.of(tHazardWorkPermit.getaSafeLiaisonOffice()).fontSize(7).bold().create());
+        getCheck(params, tHazardWorkPermit.getaIsNeedSafeLiaison().toString(), "aIsNSL1", "aIsNSL2");
+        params.put("aSafeLiaisonName", Texts.of(tHazardWorkPermit.getaSafeLiaisonName()).fontSize(7).bold().create());
+        params.put("aSafeLiaisonSign", Texts.of(tHazardWorkPermit.getaSafeLiaisonSign()).fontSize(7).bold().create());
+        params.put("aSafeLiaisonTel", Texts.of(tHazardWorkPermit.getaSafeLiaisonTel()).fontSize(7).bold().create());
+        params.put("aSafeLiaisonOffice", Texts.of(tHazardWorkPermit.getaSafeLiaisonOffice()).fontSize(7).bold().create());
         // B 栏
-        params.put("bDeviceName" , Texts.of(tHazardWorkPermit.getbDeviceName()).fontSize(7).bold().create());
-        params.put("bAreaNo" , Texts.of(tHazardWorkPermit.getbAreaNo()).fontSize(7).bold().create());
-        params.put("bWorkContent" , Texts.of(tHazardWorkPermit.getbWorkContent()).fontSize(7).bold().create());
-        if (tHazardWorkPermit.getbValidityStartTime()!= null) {
-            params.put("bValidityStartTime" , Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tHazardWorkPermit.getbValidityStartTime())).fontSize(7).bold().create());
+        params.put("bDeviceName", Texts.of(tHazardWorkPermit.getbDeviceName()).fontSize(7).bold().create());
+        params.put("bAreaNo", Texts.of(tHazardWorkPermit.getbAreaNo()).fontSize(7).bold().create());
+        params.put("bWorkContent", Texts.of(tHazardWorkPermit.getbWorkContent()).fontSize(7).bold().create());
+        if (tHazardWorkPermit.getbValidityStartTime() != null) {
+            params.put("bValidityStartTime", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分", tHazardWorkPermit.getbValidityStartTime())).fontSize(7).bold().create());
         }
-        if (tHazardWorkPermit.getbValidityEndTime()!= null) {
-            params.put("bValidityEndTime" , Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tHazardWorkPermit.getbValidityEndTime())).fontSize(7).bold().create());
+        if (tHazardWorkPermit.getbValidityEndTime() != null) {
+            params.put("bValidityEndTime", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分", tHazardWorkPermit.getbValidityEndTime())).fontSize(7).bold().create());
         }
         // C 栏
-        getCheck(params ,tHazardWorkPermit.getcIsDanger(),"cIsDanger");
+        getCheck(params, tHazardWorkPermit.getcIsDanger(), "cIsDanger");
         List<TMatter> tMatters = tMatterMapper.selectTMatterList(new TMatter());
-        for (TMatter t:tMatters
-             ) {
-            if (t.getId().toString().equals(tHazardWorkPermit.getcHarmMatterName())){
-                params.put("cHarmMatterName" , Texts.of(t.getMatterName()).fontSize(7).bold().create());
+        for (TMatter t : tMatters
+        ) {
+            if (t.getId().toString().equals(tHazardWorkPermit.getcHarmMatterName())) {
+                params.put("cHarmMatterName", Texts.of(t.getMatterName()).fontSize(7).bold().create());
             }
         }
-        getCheck(params ,tHazardWorkPermit.getcIsAttention(),"cIsAttention");
-        getCheck(params ,tHazardWorkPermit.getcIsToxic(),"cIsToxic");
-        getCheck(params ,tHazardWorkPermit.getcIsFlammable(),"cIsFlammable");
-        getCheck(params ,tHazardWorkPermit.getcIsOxidizing(),"cIsOxidizing");
-        getCheck(params ,tHazardWorkPermit.getcIsExplosive(),"cIsExplosive");
-        getCheck(params ,tHazardWorkPermit.getcIsCorrosive(),"cIsCorrosive");
-        getCheck(params ,tHazardWorkPermit.getcIsIrritantToxic(),"cIsIrritantToxic");
-        getCheck(params ,tHazardWorkPermit.getcIsHealthHazard(),"cIsHealthHazard");
-        getCheck(params ,tHazardWorkPermit.getcIsCompressedGas(),"cIsCompressedGas");
-        getCheck(params ,tHazardWorkPermit.getcIsEnvironmentalHazard(),"cIsEnvironmentalHazard");
+        getCheck(params, tHazardWorkPermit.getcIsAttention(), "cIsAttention");
+        getCheck(params, tHazardWorkPermit.getcIsToxic(), "cIsToxic");
+        getCheck(params, tHazardWorkPermit.getcIsFlammable(), "cIsFlammable");
+        getCheck(params, tHazardWorkPermit.getcIsOxidizing(), "cIsOxidizing");
+        getCheck(params, tHazardWorkPermit.getcIsExplosive(), "cIsExplosive");
+        getCheck(params, tHazardWorkPermit.getcIsCorrosive(), "cIsCorrosive");
+        getCheck(params, tHazardWorkPermit.getcIsIrritantToxic(), "cIsIrritantToxic");
+        getCheck(params, tHazardWorkPermit.getcIsHealthHazard(), "cIsHealthHazard");
+        getCheck(params, tHazardWorkPermit.getcIsCompressedGas(), "cIsCompressedGas");
+        getCheck(params, tHazardWorkPermit.getcIsEnvironmentalHazard(), "cIsEnvironmentalHazard");
         //设备内物质处于危险状态({{cIsHighTemp}}高温/{{cIsLowTemp}}低温;{{cIsPosPressure}}正压/{{cIsNegPressure}}负压
-        getCheck(params ,tHazardWorkPermit.getcIsHighTemp(),"cIsHighTemp");
-        getCheck(params ,tHazardWorkPermit.getcIsLowTemp(),"cIsLowTemp");
-        getCheck(params ,tHazardWorkPermit.getcIsPosPressure(),"cIsPosPressure");
-        getCheck(params ,tHazardWorkPermit.getcIsNegPressure(),"cIsNegPressure");
+        getCheck(params, tHazardWorkPermit.getcIsHighTemp(), "cIsHighTemp");
+        getCheck(params, tHazardWorkPermit.getcIsLowTemp(), "cIsLowTemp");
+        getCheck(params, tHazardWorkPermit.getcIsPosPressure(), "cIsPosPressure");
+        getCheck(params, tHazardWorkPermit.getcIsNegPressure(), "cIsNegPressure");
+        if ("1".equals(tHazardWorkPermit.getcIsHighTemp()) || "1".equals(tHazardWorkPermit.getcIsLowTemp()) || "1".equals(tHazardWorkPermit.getcIsPosPressure()) || "1".equals(tHazardWorkPermit.getcIsHighTemp())) {
+            getCheck(params, "1", "isFacilityHazards");
+        } else {
+            getCheck(params, "2", "isFacilityHazards");
+        }
         //来自设备/设施的危害({{cIsMovingParts}}移动部件,{{cIsHotSurfaces}}热表面/ {{cIsColdSurfaces}}冷表面,{{cIsVoltages}}电压)
-        getCheck(params ,tHazardWorkPermit.getcIsMovingParts(),"cIsMovingParts");
-        getCheck(params ,tHazardWorkPermit.getcIsHotSurfaces(),"cIsHotSurfaces");
-        getCheck(params ,tHazardWorkPermit.getcIsColdSurfaces(),"cIsColdSurfaces");
-        getCheck(params ,tHazardWorkPermit.getcIsVoltages(),"cIsVoltages");
+        getCheck(params, tHazardWorkPermit.getcIsMovingParts(), "cIsMovingParts");
+        getCheck(params, tHazardWorkPermit.getcIsHotSurfaces(), "cIsHotSurfaces");
+        getCheck(params, tHazardWorkPermit.getcIsColdSurfaces(), "cIsColdSurfaces");
+        getCheck(params, tHazardWorkPermit.getcIsVoltages(), "cIsVoltages");
+        if ("1".equals(tHazardWorkPermit.getcIsMovingParts()) || "1".equals(tHazardWorkPermit.getcIsHotSurfaces()) || "1".equals(tHazardWorkPermit.getcIsColdSurfaces()) || "1".equals(tHazardWorkPermit.getcIsVoltages())) {
+            getCheck(params, "1", "isEquipmentHazards");
+        } else {
+            getCheck(params, "2", "isEquipmentHazards");
+        }
         //{{cIsWorkProtective}} 安全保护设备的施工({{cIsDy}}电仪安全保护设备,{{cIsAqf}}安全阀,{{cIsLq}}冷却系统)
-        getCheck(params ,tHazardWorkPermit.getcIsWorkProtective(),"cIsWorkProtective");
-        getCheck(params ,tHazardWorkPermit.getcIsDy(),"cIsDy");
-        getCheck(params ,tHazardWorkPermit.getcIsAqf(),"cIsAqf");
-        getCheck(params ,tHazardWorkPermit.getcIsLq(),"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());
+        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());
+        getCheck(params, tHazardWorkPermit.getcIsHazardsProd(), "cIsHazardsProd");
+        params.put("cIsHazardsProdContent", Texts.of(tHazardWorkPermit.getcIsHazardsProdContent()).fontSize(7).bold().create());
+        //D 栏
+        // 1.1是否通过打开安全开关断电并上锁和运转测试
+        getCheck(params, tHazardWorkPermit.getdIsOpenSafe(), "dIsOpenSafe", "dIsOpenSafe2");
+        // 1.2
+        getCheck(params, tHazardWorkPermit.getdIsDisFeeder(), "dIsDisFeeder", "dIsDisFeeder2");
+        params.put("dBreakInclContent", Texts.of(tHazardWorkPermit.getdBreakInclContent()).fontSize(7).bold().create());
+        params.put("dEleCircuitNo", Texts.of(tHazardWorkPermit.getdEleCircuitNo()).fontSize(7).bold().create());
+        // 1.3
+        getCheck(params, tHazardWorkPermit.getdIsRadioactiveSources(), "dIsRadioactiveSources", "dIsRadioactiveSources2");
+
 
         return params;
     }
 
     // 勾选框判断渲染
-    public void getCheck (Map<String, Object> params, String ticketWord , String check1 ){
+    public void getCheck(Map<String, Object> params, String ticketWord, String check1) {
         if ("1".equals(ticketWord)) {
-            params.put(check1,new TextRenderData("\u00FE",new Style("Wingdings",7)));
-        }else if ("2".equals(ticketWord)) {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",7)));
-        }else {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",7)));
+            params.put(check1, new TextRenderData("\u00FE", new Style("Wingdings", 7)));
+        } else if ("2".equals(ticketWord)) {
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 7)));
+        } else {
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 7)));
         }
     }
+
     // 勾选框判断渲染
-    public void getCheck (Map<String, Object> params, String ticketWord , String check1 , String check2){
+    public void getCheck(Map<String, Object> params, String ticketWord, String check1, String check2) {
         if ("1".equals(ticketWord)) {
-            params.put(check1,new TextRenderData("\u00FE",new Style("Wingdings",7)));
-            params.put(check2,new TextRenderData("\u006F",new Style("Wingdings",7)));
-        }else if ("2".equals(ticketWord)) {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",7)));
-            params.put(check2,new TextRenderData("\u00FE",new Style("Wingdings",7)));
-        }else {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",7)));
-            params.put(check2,new TextRenderData("\u006F",new Style("Wingdings",7)));
+            params.put(check1, new TextRenderData("\u00FE", new Style("Wingdings", 7)));
+            params.put(check2, new TextRenderData("\u006F", new Style("Wingdings", 7)));
+        } else if ("2".equals(ticketWord)) {
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 7)));
+            params.put(check2, new TextRenderData("\u00FE", new Style("Wingdings", 7)));
+        } else {
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 7)));
+            params.put(check2, new TextRenderData("\u006F", new Style("Wingdings", 7)));
         }
     }
 

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