yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pad接口-退货-退货指令列表 可根据退货指令id或单号精准匹配

This commit is contained in:
1378012178@qq.com 2025-12-05 15:10:29 +08:00
parent 826b17adf8
commit 18b0319068
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java
View File

@ -77,6 +77,11 @@ public class InvoicingThdMainEntity implements Serializable {
*/ */
private String searchContent; private String searchContent;
/**
* 前后台交互用字段
*/
private String refreshDataKey;
/** /**
* 发起人姓名 * 发起人姓名
*/ */

7
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml
View File

@ -26,6 +26,13 @@
or baseInfo.nu_name LIKE CONCAT('%', #{dto.searchContent}, '%') or baseInfo.nu_name LIKE CONCAT('%', #{dto.searchContent}, '%')
or main.nu_id LIKE CONCAT('%', #{dto.searchContent}, '%') or main.nu_id LIKE CONCAT('%', #{dto.searchContent}, '%')
or main.thd_no LIKE CONCAT('%', #{dto.searchContent}, '%') or main.thd_no LIKE CONCAT('%', #{dto.searchContent}, '%')
or main.id = #{dto.searchContent}
)
</if>
<if test="dto.refreshDataKey != null and dto.refreshDataKey != ''">
AND (
main.thd_no = #{dto.refreshDataKey}
or main.id = #{dto.refreshDataKey}
) )
</if> </if>
<if test="dto.status != null and dto.status != ''"> <if test="dto.status != null and dto.status != ''">

54
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -78,7 +78,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
if (list_.getRecords() == null || list_.getRecords().isEmpty()) { if (list_.getRecords() == null || list_.getRecords().isEmpty()) {
return list_.getRecords(); return list_.getRecords();
} }
configServiceDirective.setIzEnabled("Y"); // configServiceDirective.setIzEnabled("Y");
List<ConfigServiceDirective> list = baseMapper.pageList(configServiceDirective, list_.getRecords()); List<ConfigServiceDirective> list = baseMapper.pageList(configServiceDirective, list_.getRecords());
//处理服务标签字段 //处理服务标签字段
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()) {
@ -375,11 +375,11 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
}); });
// 查询未删除并带标签的所有服务指令 // 查询未删除并带标签的所有服务指令
List<ConfigServiceDirective> directives = baseMapper.getActiveDirectivesWithTags(); // List<ConfigServiceDirective> directives = baseMapper.getActiveDirectivesWithTags();
// 按 typeId 分组 // 按 typeId 分组
Map<String, List<ConfigServiceDirective>> directiveMap = directives.stream() // Map<String, List<ConfigServiceDirective>> directiveMap = directives.stream()
.collect(Collectors.groupingBy(ConfigServiceDirective::getTypeId)); // .collect(Collectors.groupingBy(ConfigServiceDirective::getTypeId));
// 获取被引用的各级分类 // 获取被引用的各级分类
List<InstructionTag> instructions = baseMapper.getUsedInstructionTags(); List<InstructionTag> instructions = baseMapper.getUsedInstructionTags();
@ -414,29 +414,29 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
List<ConfigServiceType> typeList = typeMap.get(cat.getId()); List<ConfigServiceType> typeList = typeMap.get(cat.getId());
if (typeList != null) { if (typeList != null) {
typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort)); typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort));
for (ConfigServiceType tp : typeList) { // for (ConfigServiceType tp : typeList) {
typUsing = "Y".equals(tp.getIzEnabled()); // typUsing = "Y".equals(tp.getIzEnabled());
if ("enabled".equals(filterIzEnabled) && !typUsing) { // if ("enabled".equals(filterIzEnabled) && !typUsing) {
continue; // continue;
} // }
TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,""); // TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,"");
List<ConfigServiceDirective> dirList = directiveMap.get(tp.getId()); // List<ConfigServiceDirective> dirList = directiveMap.get(tp.getId());
if (dirList != null) { // if (dirList != null) {
dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort)); // dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
for (ConfigServiceDirective dir : dirList) { // for (ConfigServiceDirective dir : dirList) {
if ("enabled".equals(filterIzEnabled) && "N".equals(dir.getIzEnabled())) { // if ("enabled".equals(filterIzEnabled) && "N".equals(dir.getIzEnabled())) {
continue; // continue;
} // }
TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing,""); // TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing,"");
// TreeNode tagNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), IdUtil.simpleUUID(), "标签", 5, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing,insUsing && catUsing && typUsing); //// TreeNode tagNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), IdUtil.simpleUUID(), "标签", 5, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing,insUsing && catUsing && typUsing);
// tagNode.setBodyTagList(dir.getBodyTagList()); //// tagNode.setBodyTagList(dir.getBodyTagList());
// tagNode.setEmotionTagList(dir.getEmotionTagList()); //// tagNode.setEmotionTagList(dir.getEmotionTagList());
typeNode.addChild(dirNode); // typeNode.addChild(dirNode);
// dirNode.addChild(tagNode); //// dirNode.addChild(tagNode);
} // }
} // }
catNode.addChild(typeNode); // catNode.addChild(typeNode);
} // }
} }
instNode.addChild(catNode); instNode.addChild(catNode);
} }