From fc3ae614a4c5a2a7cdb9029ecfc4372eb1c28b18 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 11:41:42 +0800
Subject: [PATCH] 补充确认表，审批表模板字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
index 7eda2b9..89b21f8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
@@ -1,9 +1,6 @@
package org.springblade.mdm.statreport.service;
-import com.itextpdf.text.DocumentException;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.oss.OssTemplate;
@@ -12,11 +9,10 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
-import org.springblade.mdm.commons.support.TemplatedPdfWriter;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.ApproveInfoQueryService;
-import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
@@ -44,7 +40,7 @@
@Service
public class ApproveTableService {
@Autowired
- private NcNodeService ncNodeService;
+ private UserCommonService userCommonService;
@Autowired
private MachineService machineService;
@Autowired
@@ -95,47 +91,42 @@
dispatchDateStr = DateUtil.format(approveInfo.getDispatchDate(), DATE_PATTERN);
}
- dataMap.put("teamLeader",approveInfo.getTeamLeaderName()+"/"+dispatchDateStr);
+ dataMap.put("startTime",dispatchDateStr);//宸ユ璐熻矗浜�/鍗曞厓璐熻矗浜烘淳鍑烘椂闂�
dataMap.put("fuzeren",approveInfo.getProgrammerName());//璐熻矗浜�
- int isProgram = 0;
+
if(StringUtils.equals(props.getHasCuredProgram(),FlowContants.Y)){
//鏍″浠诲姟
dataMap.put("jd", WordReplaceUtil.CHECKED);
- dataMap.put("bc", WordReplaceUtil.UNCHECKED);
+ dataMap.put("bz", WordReplaceUtil.UNCHECKED);
}else{
//缂栫▼浠诲姟
dataMap.put("jd", WordReplaceUtil.UNCHECKED);
- dataMap.put("bc", WordReplaceUtil.CHECKED);
+ dataMap.put("bz", WordReplaceUtil.CHECKED);
}
dataMap.put("programNo",dispatch.getProgramNo());
- dataMap.put("fzy",WordReplaceUtil.CHECKED);
- dataMap.put("fzn",WordReplaceUtil.UNCHECKED);
- Date programDate = approveInfo.getCheckDate();
- Date checkDate = approveInfo.getCheckDate();
- String bianzhiDateStr = DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
+ dataMap.put("fzy",WordReplaceUtil.CHECKED); //浠跨湡 鏄�
+ dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//浠跨湡 鍚�
- String checkDateStr = " ";
- if (checkDate != null) {
- checkDateStr = DateUtil.format(programDate, DATE_PATTERN);
- }
-
- String approveDateStr = " ";
- if (approveInfo.getApproveDate() != null) {
- approveDateStr = DateUtil.format(approveInfo.getApproveDate(), DATE_PATTERN);
- }
-
- dataMap.put("programmer",approveInfo.getProgrammerName()+"/"+bianzhiDateStr);
- dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/鏃堕棿涓嶇‘瀹�");
- dataMap.put("shenpi",approveInfo.getSeniorName()+"/鏃堕棿涓嶇‘瀹�");
+ String bianzhi = userCommonService.getUserNameById(dispatch.getCreateUser());
+ dataMap.put("bianzhi",bianzhi+"/"+formatTimeForTable(dispatch.getCreateTime()));//缂栧埗锛氳鍒掑憳/鍙戣捣鏃堕棿
+ dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/"+formatTimeForTable(approveInfo.getDispatchDate())); //
+ dataMap.put("shenpi",approveInfo.getSeniorName()+"/"+formatTimeForTable(approveInfo.getApproveDate()));//灏辨槸楂樺笀瀹℃壒鏃堕棿
dataMap.put("sendPath",machine.getProgSendDir()!=null?machine.getProgSendDir():"");
return dataMap;
}
+ String formatTimeForTable(Date date){
+ String DATE_PATTERN = "yyyy-M-d";
+ if(date==null){
+ return "";
+ }
+ return DateUtil.format(date, DATE_PATTERN);
+ }
/*
public void exportApproveTableOld(String processInstanceId, OutputStream os) throws DocumentException, IOException {
--
Gitblit v1.9.3