From a0d5f2224a6ec422f9f9d1493d81bdc0b161e18b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:21:22 +0800
Subject: [PATCH] 质量监督：新增监督计划下发接口（校验已批准且未重复下发，向监督员及被监督人推送站内消息与企业微信通知）；详情记录新增监督内容、监督记录、存在问题、整改意见字段；计划导出监督频次按月份数自动计算、监督时间仅显示月份、签名缺失兜底透明图避免导出失败，模板补全标题并新增记录编号；新增日常监督检查记录表 Word 模板并接入记录单导出；方法验证：新增数据处理、质量控制方法、方法结果验证、验证结论及评审、审批意见字段，导出支持评审、审批勾选项与日期格式化，同步调整 Word 模板
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
index b0438c0..ca298cb 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.process.service.impl;
-import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -389,9 +389,24 @@
}
// 纭鏃ユ湡
processMethodVerifyExportWordDto.setConfirmDateStr(processMethodVerify.getConfirmDate() != null ? processMethodVerify.getConfirmDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")): null);
+ // 璇勫鎰忚
+ processMethodVerifyExportWordDto.setReviewResultStr(buildOpinionCheckBox(processMethodVerify.getReviewResult()));
+ processMethodVerifyExportWordDto.setReviewDateStr(processMethodVerify.getReviewDate() != null ? processMethodVerify.getReviewDate().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")): null);
+ // 瀹℃壒鎰忚
+ processMethodVerifyExportWordDto.setApprovalResultStr(buildOpinionCheckBox(processMethodVerify.getApprovalResult()));
+ processMethodVerifyExportWordDto.setApprovalDateStr(processMethodVerify.getApprovalDate() != null ? processMethodVerify.getApprovalDate().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")): null);
return processMethodVerifyExportWordDto;
}
+ /**
+ * 鎷兼帴"鍚屾剰浣跨敤/涓嶈兘浣跨敤/闄愬埗浣跨敤"鍕鹃�夐」灞曠ず涓�
+ */
+ private String buildOpinionCheckBox(String result) {
+ return ("鍚屾剰浣跨敤".equals(result) ? "鈽�" : "鈻�") + "鍚屾剰浣跨敤銆�"
+ + ("涓嶈兘浣跨敤".equals(result) ? "鈽�" : "鈻�") + "涓嶈兘浣跨敤銆�"
+ + ("闄愬埗浣跨敤".equals(result) ? "鈽�" : "鈻�") + "闄愬埗浣跨敤";
+ }
+
/**
* 娣诲姞涓婂矖璇�
--
Gitblit v1.9.3