报销功能调整、红字发票不关联且填写情况说明调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -856,6 +856,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 						projectRecords.setPaperFilingStatus("10");
 					} else if ("10".equals(projectRecords.getAttachmentProjectSort())) {	//工程咨询 配合类
 						projectRecords.setPaperFilingStatus("10");
+					} else if ("12".equals(projectRecords.getAttachmentProjectSort())) {	//工程咨询 配合类
+						projectRecords.setPaperFilingStatus("10");
 					} else {
 						projectRecords.setPaperFilingStatus("10");
 					}

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -2261,15 +2261,13 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
      */
     public Map<String,String> xmlNodeListDataDispose(NodeList nodeList,Document document){
         Map<String,String> map = new HashMap<>();
+        Map<String, Integer> keyCounter = new HashMap<>(); // 同名节点计数器
         if(null != nodeList && nodeList.getLength()>0){
-            //遍历每一个header节点
             for (int i = 0; i < nodeList.getLength(); i++) {
-                //通过 item(i)方法 获取一个header节点，nodelist的索引值从0开始
-                Node header = nodeList.item(i);
-                //解析定义节点的子节点
-                NodeList childNodes = header.getChildNodes();
-                //节点数据处理
-                Map<String,String> map1 = xmlDataDispose(childNodes, document);
+                Node topNode = nodeList.item(i); // 0层：Header/EInvoiceData/TaxSupervisionInfo
+                NodeList childNodes = topNode.getChildNodes();
+                // 初始化层级为1（顶层直接子节点），父前缀为空
+                Map<String,String> map1 = xmlDataDispose(childNodes, document, "", 1, keyCounter);
                 map.putAll(map1);
             }
         }
@@ -2277,42 +2275,47 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
 
     /**
-     * 子节点遍历获取参数，若其下还有子节点，则循环调用 xmlNodeListDataDispose 方法
-     * @param childNodes
-     * @param document
-     * @return
+     * 修复同名节点重复拼接问题：第2层与第1层同名时，仅保留1次节点名
+     * 规则：0/1层不拼接，2层若与1层同名则不重复拼接，3层及以下正常拼接
      */
-    public Map<String,String> xmlDataDispose(NodeList childNodes,Document document){
+    public Map<String,String> xmlDataDispose(NodeList childNodes,Document document, String parentPrefix, int currentLevel, Map<String, Integer> keyCounter){
         Map<String,String> map = new HashMap<>();
         for (int k = 0; k < childNodes.getLength(); k++) {
-            // 区分出text类型的node以及element类型的node
             if (childNodes.item(k).getNodeType() == Node.ELEMENT_NODE) {
-                Node firstChild = childNodes.item(k).getFirstChild();
-                if(null != firstChild){
-                    if(StringUtils.isBlank(childNodes.item(k).getFirstChild().getNodeValue())){
-                        // 获取所有header节点的集合
-                        NodeList childList = document.getElementsByTagName(childNodes.item(k).getNodeName());
-
-                        String parentName = childNodes.item(k).getNodeName();
-                        //循环调用，获取最低级节点数据信息
-                        Map<String,String> map1 = xmlNodeListDataDispose(childList, document);
-                        Map<String,String> map2 = new HashMap<>();
-                        if(map1.size()>0){
-                            //将获取到的数据进行遍历，添加父节点的参数信息，防止子节点key键相同，导致数据被覆盖
-                            for (String key : map1.keySet()) {
-                                if(key.contains("-")){
-                                    String newKey = key.replaceAll("-","");
-                                    map2.put(parentName + newKey,map1.get(key));
-                                }else{
-                                    map2.put(parentName + key,map1.get(key));
-                                }
-                            }
-                        }
-                        map.putAll(map2);
+                Node currentNode = childNodes.item(k);
+                String nodeName = currentNode.getNodeName();
+                // 【核心新增：去除节点名中的 `-` 字符】
+                String cleanNodeName = nodeName.replaceAll("-", ""); // 关键步骤：替换所有 `-` 为空
+                NodeList grandChildNodes = currentNode.getChildNodes();
+
+                // 拼接逻辑（改用处理后的 cleanNodeName）
+                String currentKeyPrefix;
+                if (currentLevel == 1) {
+                    // 第1层：用处理后的节点名作为前缀
+                    currentKeyPrefix = cleanNodeName;
+                } else if (currentLevel == 2) {
+                    // 第2层：判断是否与第1层前缀同名（基于处理后的名称）
+                    if (cleanNodeName.equals(parentPrefix)) {
+                        currentKeyPrefix = parentPrefix;
+                    } else {
+                        currentKeyPrefix = parentPrefix + cleanNodeName;
                     }
-                    //判定key 和value 值均存在，则进行储存，否则不进行储存
-                    if(StringUtils.isNotBlank(childNodes.item(k).getNodeName()) && StringUtils.isNotBlank(childNodes.item(k).getFirstChild().getNodeValue())){
-                        map.put(childNodes.item(k).getNodeName(),childNodes.item(k).getFirstChild().getNodeValue());
+                } else {
+                    // 第3层及以上：正常拼接处理后的节点名
+                    currentKeyPrefix = parentPrefix + cleanNodeName;
+                }
+
+                // 获取节点文本值
+                String textValue = getNodeTextValue(grandChildNodes);
+                if (StringUtils.isNotBlank(textValue)) {
+                    // 生成不重复的最终key（基于处理后的前缀）
+                    String finalKey = generateUniqueKey(currentKeyPrefix, keyCounter);
+                    map.put(finalKey, textValue);
+                } else {
+                    // 无文本值，递归时传递处理后的前缀
+                    if (hasChildElements(grandChildNodes)) {
+                        Map<String,String> childMap = xmlDataDispose(grandChildNodes, document, currentKeyPrefix, currentLevel + 1, keyCounter);
+                        map.putAll(childMap);
                     }
                 }
             }
@@ -2321,6 +2324,45 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
 
     /**
+     * 提取节点有效文本值（仅保留非空白文本）
+     */
+    private String getNodeTextValue(NodeList childNodes) {
+        StringBuilder text = new StringBuilder();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node child = childNodes.item(i);
+            if (child.getNodeType() == Node.TEXT_NODE) {
+                String trimText = StringUtils.trim(child.getNodeValue());
+                if (StringUtils.isNotBlank(trimText)) {
+                    text.append(trimText);
+                }
+            }
+        }
+        return text.toString();
+    }
+
+    /**
+     * 判断是否有子元素节点
+     */
+    private boolean hasChildElements(NodeList childNodes) {
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            if (childNodes.item(i).getNodeType() == Node.ELEMENT_NODE) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 生成不重复key（同名节点加序号，避免覆盖）
+     */
+    private String generateUniqueKey(String keyPrefix, Map<String, Integer> keyCounter) {
+        int count = keyCounter.getOrDefault(keyPrefix, 0) + 1;
+        keyCounter.put(keyPrefix, count);
+        return count == 1 ? keyPrefix : keyPrefix + count;
+    }
+
+
+    /**
      * 根据id修改报销详情中喝项目的关联关系信息
      * @param invoiceNumber
      * @return

src/main/webapp/WEB-INF/tags/table/attachmentManager.tag

@@ -6,6 +6,7 @@
 
 <%-- 可配置参数定义 --%>
 <%@ attribute name="title" type="java.lang.String" description="附件区域标题"%>
+<%@ attribute name="titleDescribe" type="java.lang.String" description="附件区域描述"%>
 <%@ attribute name="addBtnText" type="java.lang.String" description="添加附件按钮文本"%>
 <%@ attribute name="onChangeFunc" type="java.lang.String" description="文件选择onChange回调函数名"%>
 <%@ attribute name="baseId" type="java.lang.String" required="true" description="组件唯一标识前缀（避免页面冲突）"%>
@@ -32,6 +33,7 @@
 <%-- 初始化默认值 --%>
 <c:set var="ctx" value="${pageContext.request.contextPath}" />
 <c:set var="defaultTitle" value="附件信息" />
+<c:set var="defaultTitleDescribe" value="" />
 <c:set var="defaultAddBtnText" value="添加附件" />
 <c:set var="defaultOnChangeFunc" value="insertTitle" />
 <c:set var="defaultUploadMode" value="2" />
@@ -55,6 +57,7 @@
 
 <%-- 处理参数默认值 --%>
 <c:if test="${empty title}"><c:set var="title" value="${defaultTitle}" /></c:if>
+<c:if test="${empty titleDescribe}"><c:set var="titleDescribe" value="${defaultTitleDescribe}" /></c:if>
 <c:if test="${empty addBtnText}"><c:set var="addBtnText" value="${defaultAddBtnText}" /></c:if>
 <c:if test="${empty onChangeFunc}"><c:set var="onChangeFunc" value="${defaultOnChangeFunc}" /></c:if>
 <c:if test="${empty uploadMode}"><c:set var="uploadMode" value="${defaultUploadMode}" /></c:if>
@@ -79,7 +82,7 @@
 <%-- 组件HTML结构 --%>
 <div class="form-group layui-row">
     <%-- 标题区域 --%>
-    <div class="form-group-label"><h2>${title}</h2></div>
+    <div class="form-group-label"><h2>${title}<span style="color: red;font-size: 14px;">${titleDescribe}</span></h2></div>
 
         <%-- 操作按钮区域 --%>
         <c:if test="${showOperateArea}">

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -1247,7 +1247,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllModify.jsp

@@ -1172,7 +1172,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllRcForm.jsp

@@ -1248,7 +1248,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -1285,7 +1285,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoRcForm.jsp

@@ -1247,7 +1247,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment "/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp

@@ -712,7 +712,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-				<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+				<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 				<div class="layui-input-block">
 					<form:textarea path="situationDetail" readonly="true" htmlEscape="false" rows="4" class="form-control" style="background-color: #f1f1f1" />
 				</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -1249,7 +1249,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment"/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -1378,9 +1378,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control"/>
+						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment"/>
 					</div>
 				</div>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -1190,7 +1190,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" placeholder="请输入情况说明" htmlEscape="false" rows="4" class="form-control judgment"/>
 					</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceView.jsp

@@ -253,7 +253,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea situationDetail">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>情况说明：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>红冲情况说明：</label>
 					<div class="layui-input-block">
 						<form:textarea path="situationDetail" readonly="true" placeholder="请输入情况说明" htmlEscape="false"  style="background-color: #f1f1f1"   rows="4" class="form-control judgment "/>
 					</div>

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllFormAdd.jsp

@@ -2394,7 +2394,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
                     <%--<div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                     </div>--%>
@@ -2712,6 +2712,7 @@
             <table:attachmentManager
                     title="附件信息"
                     addBtnText="添加附件"
+                    titleDescribe="(此附件上传不是数电发票上传。数电发票请在报销单后操作栏处上传)"
                     baseId="attachment"
                     attachments="${workReimbursement.workAttachments}"
                     fileHandlerFuncName="insertTitle"

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllModifyApply.jsp

@@ -2381,7 +2381,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
                     <%--<div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                     </div>--%>
@@ -2699,6 +2699,7 @@
             <table:attachmentManager
                     title="附件信息"
                     addBtnText="添加附件"
+                    titleDescribe="(此附件上传不是数电发票上传。数电发票请在报销单后操作栏处上传)"
                     baseId="attachment"
                     attachments="${workReimbursement.workAttachments}"
                     fileHandlerFuncName="insertTitle"

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewFormAdd.jsp

@@ -365,7 +365,6 @@
 
             // 1. 获取后端渲染的列表字符串（注意：不要加单引号，直接获取模板渲染结果）
             var listStr = '${workReimbursement.workAccountListCount}';
-            console.log(listStr)
             if(listStr<1){
                 addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true)
             }
@@ -2441,7 +2440,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
                     <%--<div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                     </div>--%>
@@ -2761,6 +2760,7 @@
             <table:attachmentManager
                     title="附件信息"
                     addBtnText="添加附件"
+                    titleDescribe="(此附件上传不是数电发票上传。数电发票请在报销单后操作栏处上传)"
                     baseId="attachment"
                     attachments="${workReimbursement.workAttachments}"
                     fileHandlerFuncName="insertTitle"

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewModifyApply.jsp

@@ -2379,7 +2379,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
                     <%--<div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
                     </div>--%>
@@ -2697,6 +2697,7 @@
             <table:attachmentManager
                     title="附件信息"
                     addBtnText="添加附件"
+                    titleDescribe="(此附件上传不是数电发票上传。数电发票请在报销单后操作栏处上传)"
                     baseId="attachment"
                     attachments="${workReimbursement.workAttachments}"
                     fileHandlerFuncName="insertTitle"

src/main/webapp/webpage/modules/workreimbursement/treeForm/replenish/workReimbursementReplenishAudit.jsp

@@ -2368,7 +2368,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
+				<div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
 				<div class="layui-item nav-btns">
 					<a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
 				</div>
@@ -2686,6 +2686,7 @@
 			<table:attachmentManager
 					title="附件信息"
 					addBtnText="添加附件"
+					titleDescribe="(此附件上传不是数电发票上传。数电发票请在报销单后操作栏处上传)"
 					baseId="attachment"
 					attachments="${workReimbursement.workAttachments}"
 					fileHandlerFuncName="insertTitle"

src/main/webapp/webpage/modules/workreimbursement/treeForm/specific/workReimbursementSpecificModifyApply.jsp

@@ -2385,7 +2385,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后新增数电发票xml格式的附件获取发票信息)</span></h2></div>
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
 <%--                <div class="layui-item nav-btns">--%>
 <%--                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>--%>
 <%--                </div>--%>
@@ -2703,6 +2703,7 @@
             <table:attachmentManager
                     title="附件信息"
                     addBtnText="添加附件"
+                    titleDescribe="(此附件上传不是数电发票上传。数电发票请在报销单后操作栏处上传)"
                     baseId="attachment"
                     attachments="${workReimbursement.workAttachments}"
                     fileHandlerFuncName="insertTitle"