From 2a9583fd376451ca77a0400af7f3a02d1b80e7f5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 18:04:34 +0800
Subject: [PATCH] 2025-06-24
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 4271cb5..eda06d6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -2,10 +2,12 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
@@ -57,11 +59,20 @@
//@PreAuthorize("@ss.hasPermi('hosp:rules:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ瑙勫垯+鐥呯鍒楄〃")
- public TableDataInfo list(TjRules tjRules) {
- startPage();
+ public AjaxResult list(TjRules tjRules) {
+
+ Page<TjRules> page=new Page<>(tjRules.getPageNum(),tjRules.getPageSize());
+
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
if (tjRules.getProId() != null) {
- wq.eq(TjRules::getProId, tjRules.getProId());
+ List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
+ if(null !=projects && !projects.isEmpty()){
+ wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
+ .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
+ }else {
+ wq.eq(TjRules::getProId, tjRules.getProId());
+ }
+
}
if (tjRules.getProName() != null) {
wq.like(TjRules::getProName, tjRules.getProName());
@@ -82,16 +93,12 @@
wq.eq(TjRules::getSex, tjRules.getSex());
}
wq.orderByAsc(TjRules::getSort);
- List<TjRules> list = tjRulesService.list(wq);
- if (list != null) {
- for (TjRules rules : list) {
- LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjRuleAdvice::getBz, rules.getAid());
- final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
- rules.setRuleAdvices(list1);
- }
- }
- return getDataTable(list);
+// List<TjRules> list = tjRulesService.list(wq);
+ Page<TjRules> page1 = tjRulesService.page(page, wq);
+ Map<String,Object>map=new HashMap<>();
+ map.put("rows",page1.getRecords());
+ map.put("total",page1.getTotal());
+ return AjaxResult.success(map);
}
@@ -217,30 +224,30 @@
TjProject project = projectService.getById(proId);
TjOrder order = orderService.getOrderByTjNum(tjNum);
if(null !=project && null !=order){
- TjProject pproject = projectService.getById(project.getProParentId());
- List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
- if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
+ TjProject pproject = projectService.getById(project.getProParentId());
+ List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
+ if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
// proGzjyService.remove(new LambdaQueryWrapper<TjProGzjy>().eq(TjProGzjy::getProId,proId).eq(TjProGzjy::getTjNumber,tjNum));
- proGzjyService.deletedByTjNumAndProId(proId,tjNum);
- for (Map<String, Object> map : tjproGzJy) {
- Object bz = map.get("bz");
- Object bt = map.get("bt");
- Object nr = map.get("nr");
- TjProGzjy proGzjy=new TjProGzjy();
- proGzjy.setTjNumber(tjNum);
- proGzjy.setOrderId(order.getOrderId());
- proGzjy.setProId(Long.valueOf(proId));
- proGzjy.setProName(project.getProName());
- proGzjy.setProPrentId(project.getProParentId());
- proGzjy.setProPrentName(pproject.getProName());
- proGzjy.setProJgz(keyNum);
- if(null !=bz)proGzjy.setBz(bz.toString());
- if(null !=bt)proGzjy.setBt(bt.toString());
- if(null !=nr)proGzjy.setJy(nr.toString());
- proGzjyService.save(proGzjy);
+ proGzjyService.deletedByTjNumAndProId(proId,tjNum);
+ for (Map<String, Object> map : tjproGzJy) {
+ Object bz = map.get("bz");
+ Object bt = map.get("bt");
+ Object nr = map.get("nr");
+ TjProGzjy proGzjy=new TjProGzjy();
+ proGzjy.setTjNumber(tjNum);
+ proGzjy.setOrderId(order.getOrderId());
+ proGzjy.setProId(Long.valueOf(proId));
+ proGzjy.setProName(project.getProName());
+ proGzjy.setProPrentId(project.getProParentId());
+ proGzjy.setProPrentName(pproject.getProName());
+ proGzjy.setProJgz(keyNum);
+ if(null !=bz)proGzjy.setBz(bz.toString());
+ if(null !=bt)proGzjy.setBt(bt.toString());
+ if(null !=nr)proGzjy.setJy(nr.toString());
+ proGzjyService.save(proGzjy);
+ }
}
- }
- return AjaxResult.success(tjproGzJy);
+ return AjaxResult.success(tjproGzJy);
}
return AjaxResult.success();
}
--
Gitblit v1.8.0