Browse Source

fix: 工作票导出勾选图标异常问题

zhongwei
liwen 4 months ago
parent
commit
889c3110e3
  1. 2
      hzims-service/ticket/pom.xml
  2. 12
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java
  3. BIN
      hzims-service/ticket/src/main/resources/template/电气第一种工作票模版.docx

2
hzims-service/ticket/pom.xml

@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- <poi.version>3.17</poi.version>--> <!-- <poi.version>3.17</poi.version>-->
<documents4j.version>1.0.3</documents4j.version> <documents4j.version>1.1.5</documents4j.version>
<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version> <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
<!--特定版本--> <!--特定版本-->
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>

12
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java

@ -370,11 +370,13 @@ public class FirstWorkTicketServiceImpl extends ServiceImpl<WorkTicketInfoMapper
return result; return result;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
params.put("ticketInfoDangers", dangerList); params.put("ticketInfoDangers", dangerList);
params.put("isSafety",workTicketInfoEntity.getIsSafety() ? "☑" : "□"); params.put("isSafety", workTicketInfoEntity.getIsSafety());
params.put("isHazard",workTicketInfoEntity.getIsHazard() ? "☑" : "□"); params.put("isHazard", workTicketInfoEntity.getIsHazard());
params.put("isRailway",workTicketInfoEntity.getIsRailway() ? "☑" : "□"); params.put("isRailway", workTicketInfoEntity.getIsRailway());
params.put("isLimited",workTicketInfoEntity.getIsLimited() ? "☑" : "□"); params.put("isLimited", workTicketInfoEntity.getIsLimited());
params.put("isStart",workTicketInfoEntity.getIsStart() ? "☑" : "□"); params.put("isStart", workTicketInfoEntity.getIsStart());
params.put("isTestTrue", true);
params.put("isTestFalse", false);
// 许可人许可环节 // 许可人许可环节
if(ObjectUtil.isNotEmpty(workTicketInfoEntity.getLicenseTime())) { if(ObjectUtil.isNotEmpty(workTicketInfoEntity.getLicenseTime())) {
String licensorName = StringUtil.isNotBlank(workTicketInfoEntity.getLicensorName()) && Func.isNotEmpty(workTicketInfoEntity.getLicensorName()) ? String licensorName = StringUtil.isNotBlank(workTicketInfoEntity.getLicensorName()) && Func.isNotEmpty(workTicketInfoEntity.getLicensorName()) ?

BIN
hzims-service/ticket/src/main/resources/template/电气第一种工作票模版.docx

Binary file not shown.
Loading…
Cancel
Save