From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java | 53 ++++++++++++++++++++++-------------------------------
1 files changed, 22 insertions(+), 31 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 2de1b6c..f9dd688 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
@@ -5,27 +5,23 @@
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
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.flow.constants.FlowContants;
+import org.springblade.mdm.commons.service.UserCommonService;
+import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.ApproveInfoQueryService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
-import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
-import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.statreport.utils.WordReplaceUtil;
import org.springblade.system.feign.IUserClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +35,7 @@
@Service
public class ApproveTableService {
@Autowired
- private NcNodeService ncNodeService;
+ private UserCommonService userCommonService;
@Autowired
private MachineService machineService;
@Autowired
@@ -90,47 +86,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)){
+
+ if(StringUtils.equals(props.getHasCuredProgram(), FlowConstant.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();
+ dataMap.put("programNo",props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition());
- 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