From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
index 9b9ffe8..4b6c83f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
@@ -63,6 +63,15 @@
return getDataTable(list);
}
+ @GetMapping("/getZybCompList")
+ @ApiOperation(value = "鑾峰彇鑱屼笟鐥呭崟浣嶄俊鎭泦鍚堟帴鍙�")
+ public AjaxResult getZybCompList() {
+ LambdaQueryWrapper<DictComp> wq = new LambdaQueryWrapper<>();
+ wq.eq(DictComp::getDwlx,"1");
+ return AjaxResult.success(dictCompService.list(wq));
+ }
+
+
/**
* 瀵煎嚭浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
*/
@@ -91,9 +100,11 @@
@Log(title = "浣撴鍗曚綅淇℃伅缁存姢", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DictComp dictComp) {
- String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
- dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
- dictComp.setEnName(firstLetter);
+ if(null !=dictComp.getCnName()){
+ String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
+ dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
+ dictComp.setEnName(firstLetter);
+ }
return toAjax(dictCompService.save(dictComp));
}
@@ -130,7 +141,7 @@
if(null !=name)wq.eq(TjReservation::getName,name);
if(null !=deptId)wq.eq(TjReservation::getDepartment,deptId);
if(null !=reservationTime)wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime),DateUtil.endOfDay(reservationTime));
-// IPage<TjReservation> iPage = reservationService.page(pages, wq);
+ wq.eq(TjReservation::getIsExpire,"2");
return AjaxResult.success(reservationService.list(wq));
}
--
Gitblit v1.8.0