From 971162978842f8cf87d34f99da8c529e2e945da8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 四月 2025 08:46:57 +0800
Subject: [PATCH] zjh20250415
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 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 2b67a4a..4a56102 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
@@ -1,10 +1,8 @@
package com.ltkj.web.controller.system;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -51,6 +49,8 @@
private ITjGroupingProService groupingProService;
@Resource
private ITjProjectService projectService;
+ @Resource
+ private TjProGzjyService proGzjyService;
/**
* 鏌ヨ瑙勫垯+鐥呯鍒楄〃
@@ -62,7 +62,14 @@
startPage();
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());
@@ -84,14 +91,7 @@
}
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);
}
@@ -210,15 +210,49 @@
@GetMapping("/AutoGetRule")
@ApiOperation(value = "瑙勫垯鑷姩璁＄畻")
public AjaxResult AutoGetRule(@ApiParam(value = "椤圭洰") @RequestParam String proId,
- @ApiParam(value = "瀹㈡埛") @RequestParam String cusId,
+ @ApiParam(value = "瀹㈡埛") @RequestParam(required = false) String cusId,
+ @ApiParam(value = "浣撴鍙�")@RequestParam String tjNum,
@ApiParam(value = "鍏抽敭瀛�") @RequestParam(required = false) String keyWord,
- @ApiParam(value = "缁撴灉鍊�") @RequestParam(required = false) BigDecimal keyNum) {
+ @ApiParam(value = "缁撴灉鍊�") @RequestParam(required = false) String keyNum) {
+ 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()){
+// 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);
+ }
+ }
+ return AjaxResult.success(tjproGzJy);
+ }
+ return AjaxResult.success();
+ }
+
+ //涔嬪墠瑙勫垯绠楁硶鏂规硶
+ private AjaxResult getAjaxResult(String proId, String cusId, String keyWord, BigDecimal keyNum) {
List<TjRules> res = new ArrayList<>();
- if (proId==null){
+ if (proId ==null){
return AjaxResult.success(res);
}
- if (cusId==null){
+ if (cusId ==null){
return AjaxResult.success(res);
}
TjCustomer byId = customerService.getById(cusId);
@@ -229,7 +263,7 @@
wq.eq(TjRules::getProId, proId);
wq.lt(TjRules::getAgeLt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
wq.gt(TjRules::getAgeGt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
- wq.in(TjRules::getSex, 0, byId.getCusSex());
+// wq.in(TjRules::getSex, 0, byId.getCusSex());
final List<TjRules> list = tjRulesService.list(wq);
if (list==null){
return AjaxResult.success(res);
@@ -248,7 +282,7 @@
}
}
} else if ("1".equals(tjRules.getRuleType())) {
- if (keyWord!=null){
+ if (keyWord !=null){
if (tjRules.getRuleStr().contains(keyWord)) {
res.add(tjRules);
}
@@ -256,7 +290,7 @@
}
}
- if (res!=null && res.size() > 0) {
+ if (!res.isEmpty()) {
//寤鸿璧嬪��
for (TjRules re : res) {
LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
--
Gitblit v1.8.0