From 56f5157ae8dba22eb30fb6c7cb132f80b7161932 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 00:53:08 +0800
Subject: [PATCH] 派工界面增加选择主管工艺
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 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..dfad95f 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,27 +91,28 @@
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);
+
+ 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);
+
String checkDateStr = " ";
if (checkDate != null) {
@@ -126,8 +123,9 @@
if (approveInfo.getApproveDate() != null) {
approveDateStr = DateUtil.format(approveInfo.getApproveDate(), DATE_PATTERN);
}
-
- dataMap.put("programmer",approveInfo.getProgrammerName()+"/"+bianzhiDateStr);
+ String bianzhi = userCommonService.getUserNameById(dispatch.getCreateUser());
+ String bianzhiDateStr = DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
+ dataMap.put("bianzhi",bianzhi+"/"+bianzhiDateStr);//缂栧埗锛氳鍒掑憳/鍙戣捣鏃堕棿
dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/鏃堕棿涓嶇‘瀹�");
dataMap.put("shenpi",approveInfo.getSeniorName()+"/鏃堕棿涓嶇‘瀹�");
--
Gitblit v1.9.3