From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 7d2b254..00aedcb 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
@@ -108,11 +108,25 @@
if(i>0){
return AjaxResult.error("璇ユ�у埆鍒嗙粍宸插瓨鍦ㄤ笉鍙噸澶嶅垱寤�");
}
- tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName());
+ 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());
+ if(null !=dwDept){
+ tjDwGrouping.setDwDeptName(dwDept.getDwDeptName());
+ }
+ tjDwGrouping.setDwName(compService.getById(tjDwGrouping.getDwId()).getCnName());
if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
// groupingProService.remove(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjDwGrouping.getId()));
- // TODO: 2023/12/25 鎸夌収鎬у埆鍒犻櫎
groupingProService.deletedTjGroupingProByGroupingId(tjDwGrouping.getId());
for (Map<String, Object> map : tjDwGrouping.getMapList()) {
TjGroupingPro groupingPro=new TjGroupingPro();
--
Gitblit v1.8.0