From 7b248040f67265d54fb1a386f8e36a022ee22cee Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 24 十二月 2024 17:48:39 +0800
Subject: [PATCH] zjh202412024
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 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 f5331c7..4271cb5 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,7 @@
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 javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -51,6 +48,8 @@
private ITjGroupingProService groupingProService;
@Resource
private ITjProjectService projectService;
+ @Resource
+ private TjProGzjyService proGzjyService;
/**
* 鏌ヨ瑙勫垯+鐥呯鍒楄〃
@@ -210,15 +209,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);
@@ -248,7 +281,7 @@
}
}
} else if ("1".equals(tjRules.getRuleType())) {
- if (keyWord!=null){
+ if (keyWord !=null){
if (tjRules.getRuleStr().contains(keyWord)) {
res.add(tjRules);
}
--
Gitblit v1.8.0