From 9b6f602df09c5e39481f03e22d99fffe825b9393 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 31 十二月 2024 19:13:17 +0800
Subject: [PATCH] zjh202412031
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index 00aedcb..9cde62d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -16,6 +16,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +55,32 @@
@Resource
private IDictCompService compService;
+
+
+ @GetMapping("/huoqutuantitaocanxiangmu")
+ @ApiOperation(value = "绛惧埌鐧昏鑾峰彇鍥綋濂楅椤圭洰")
+ public AjaxResult huoqutuantitaocanxiangmu(@RequestParam String dwId,@RequestParam Long sex) {
+ List<TjPackage> list= tjDwGroupingService.huoqutuantitaocanxiangmu(dwId,sex);
+ if (null !=list && !list.isEmpty()){
+ for (TjPackage tjPackage : list) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjGroupingPro> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjGroupingPro::getGroupingId,tjPackage.getPacId());
+ final List<TjGroupingPro> groupingProList = groupingProService.list(wqq);
+ if (null !=groupingProList && !groupingProList.isEmpty()){
+ for (TjGroupingPro pro : groupingProList) {
+ final TjProject byId = projectService.getById(pro.getProId());
+ if(null !=byId){
+ res.add(byId);
+ }
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
+ }
+ return AjaxResult.success(list);
+ }
+
/**
* 鏌ヨ浣撴鍗曚綅鍒嗙粍鍒楄〃
@@ -100,23 +127,34 @@
@Transactional
public AjaxResult add(@RequestBody TjDwGrouping tjDwGrouping) {
if((null==tjDwGrouping.getGroupingName() || "".equals(tjDwGrouping.getGroupingName()))
- || (null==tjDwGrouping.getSex() || "".equals(tjDwGrouping.getSex()))
- || (null==tjDwGrouping.getPacName()||"".equals(tjDwGrouping.getPacName()))){
+ || (null==tjDwGrouping.getSex() || "".equals(tjDwGrouping.getSex()))){
return AjaxResult.error("蹇呭～椤逛笉鑳戒负绌�!");
}
- int i = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(), tjDwGrouping.getSex());
- if(i>0){
- return AjaxResult.error("璇ユ�у埆鍒嗙粍宸插瓨鍦ㄤ笉鍙噸澶嶅垱寤�");
+
+ String id = tjDwGrouping.getId();
+ if(StringUtil.isNotBlank(id)){
+ TjDwGrouping dwGrouping = tjDwGroupingService.getById(tjDwGrouping.getId());
+ if(null !=dwGrouping){
+ if(null !=tjDwGrouping.getMapList() && !tjDwGrouping.getMapList().isEmpty()){
+ tjDwGroupingService.deleteTjDwGroupingById(tjDwGrouping.getId());
+ }
+ }
+ }else {
+ int i = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(), tjDwGrouping.getSex());
+ if(i>0){
+ return AjaxResult.error("璇ユ�у埆鍒嗙粍宸插瓨鍦ㄤ笉鍙噸澶嶅垱寤�");
+ }
+ int wz = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"2");
+ if(wz>0 && (tjDwGrouping.getSex().contains("0") || tjDwGrouping.getSex().contains("1"))){
+ return AjaxResult.error("宸插瓨鍦ㄩ�氱敤鍒嗙粍涓嶅彲鍒涘缓鍏朵粬鍒嗙粍");
+ }
+ int n = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"0");
+ int v = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"1");
+ if((n>0 || v>0) && tjDwGrouping.getSex().contains("2")){
+ return AjaxResult.error("宸插瓨鍦ㄥ叾浠栧垎缁勪笉鍙垱寤洪�氱敤鍒嗙粍");
+ }
}
- int wz = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"2");
- if(wz>0 && (tjDwGrouping.getSex().contains("0") || tjDwGrouping.getSex().contains("1"))){
- return AjaxResult.error("宸插瓨鍦ㄩ�氱敤鍒嗙粍涓嶅彲鍒涘缓鍏朵粬鍒嗙粍");
- }
- int n = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"0");
- int v = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(),"1");
- if((n>0 || v>0) && tjDwGrouping.getSex().contains("2")){
- return AjaxResult.error("宸插瓨鍦ㄥ叾浠栧垎缁勪笉鍙垱寤洪�氱敤鍒嗙粍");
- }
+
if(null ==tjDwGrouping.getPayType()|| tjDwGrouping.getPayType().isEmpty())return AjaxResult.error("璇烽�夋嫨缁撶畻鏂瑰紡!!!");
TjDwDept dwDept = dwDeptService.getById(tjDwGrouping.getDwDeptId());
@@ -124,9 +162,9 @@
tjDwGrouping.setDwDeptName(dwDept.getDwDeptName());
}
tjDwGrouping.setDwName(compService.getById(tjDwGrouping.getDwId()).getCnName());
+ if(StringUtil.isBlank(tjDwGrouping.getPacName())) tjDwGrouping.setPacName(tjDwGrouping.getGroupingName());
if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
- if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
-// groupingProService.remove(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjDwGrouping.getId()));
+ if(null !=tjDwGrouping.getMapList() && !tjDwGrouping.getMapList().isEmpty()){
groupingProService.deletedTjGroupingProByGroupingId(tjDwGrouping.getId());
for (Map<String, Object> map : tjDwGrouping.getMapList()) {
TjGroupingPro groupingPro=new TjGroupingPro();
--
Gitblit v1.8.0