Browse Source

删除注释的信息

zhongwei
段飞宇 2 years ago
parent
commit
1cff3d9669
  1. 10
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
  2. 1
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java
  3. 32
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java

10
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@ -535,10 +535,10 @@ public class TicketProcessServiceImpl implements TicketProcessService {
log.info("获取启动流程数据 : {}", processInstanceContainNameByKey); log.info("获取启动流程数据 : {}", processInstanceContainNameByKey);
Duration between = Duration.between(start, Instant.now()); Duration between = Duration.between(start, Instant.now());
System.out.println("================================================================"); log.info("================================================================");
System.err.println("耗时: " + (between.getSeconds()) + "秒"); log.info("耗时: " + (between.getSeconds()) + "秒");
System.err.println("耗时: " + (between.toMillis()) + "毫秒"); log.info("耗时: " + (between.toMillis()) + "毫秒");
System.out.println("================================================================"); log.info("================================================================");
} }
@ -774,8 +774,6 @@ public class TicketProcessServiceImpl implements TicketProcessService {
String url = "template/" + workTicketStatus; String url = "template/" + workTicketStatus;
XWPFDocument doc = WordExportUtil.exportWord07(url, workTicketInfoMap); XWPFDocument doc = WordExportUtil.exportWord07(url, workTicketInfoMap);
log.info("当前系统版本是:{}", os); log.info("当前系统版本是:{}", os);
//String name = "D:/导出excel/电气第一种工作票模版.docx";
//FileOutputStream fos = new FileOutputStream(name);
doc.write(response.getOutputStream()); doc.write(response.getOutputStream());
} else { } else {
String url = TicketConstant.TICKET_LIUNX_PATH + "/" + workTicketStatus; String url = TicketConstant.TICKET_LIUNX_PATH + "/" + workTicketStatus;

1
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java

@ -216,7 +216,6 @@ public class WordHelper extends StringUtils {
*/ */
public static void isEntryMap(Map<String, Object> result, String fieldName, String key, Object value, int count) { public static void isEntryMap(Map<String, Object> result, String fieldName, String key, Object value, int count) {
if (fieldName.equals(key)) { if (fieldName.equals(key)) {
// Object newValue = Optional.ofNullable(value).orElse("\u00A0" + printSpace(count));
Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0" + printSpace(count); Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0" + printSpace(count);
result.put(key, newValue); result.put(key, newValue);
} else { } else {

32
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java

@ -257,36 +257,8 @@ public class PdfUtils {
result.put(StringUtil.isNoneBlank(defaultValue.name()) ? defaultValue.name() : field.getName(), result.put(StringUtil.isNoneBlank(defaultValue.name()) ? defaultValue.name() : field.getName(),
ObjectUtil.isNotEmpty(defaultValue.value()) ? defaultValue.value() : value); ObjectUtil.isNotEmpty(defaultValue.value()) ? defaultValue.value() : value);
} else { } else {
// if ("initialPrincipalName".equals(field.getName()) //如果导出word为null会出现{{ ,value设置"\u00A0"
// || "principalChangeTime".equals(field.getName()) result.put(field.getName(), Optional.ofNullable(value).orElse(""));
// || "principalName".equals(field.getName())
// || "jobReceiver".equals(field.getName())
// || "jobReceiverTime".equals(field.getName())
// || "watchPrincipalEndTime".equals(field.getName())
// || "licenseTime".equals(field.getName())
// || "licensorName".equals(field.getName())
// || "signerDateTime".equals(field.getName())
// || "classGroupName".equals(field.getName())
// || "code".equals(field.getName())
// || "signerName".equals(field.getName())
// || "watchPrincipalName".equals(field.getName())
// || "projectName".equals(field.getName()))
// {
// result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 "));
//
// } else if (
// "groundNum".equals(field.getName()) ||
// "dismantleNum".equals(field.getName()) ||
// "retainNum".equals(field.getName())
//
// ) {
// result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 "));
// } else {
//如果导出word为null会出现{{ ,value设置"\u00A0"
result.put(field.getName(), Optional.ofNullable(value).orElse(""));
//}
} }
}); });
} }

Loading…
Cancel
Save