From b98bda282397df60077efbe4c1ad35a44bdfffb9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 02 十二月 2024 17:57:17 +0800
Subject: [PATCH] 2024-12-02
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 4ff09ee..4e42584 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
@@ -91,9 +91,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));
}
@@ -123,17 +125,15 @@
public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId,
@RequestParam(required = false) @ApiParam(value = "鍚嶅瓧") String name,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId,
- @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime,
- @RequestParam(defaultValue = "1") @ApiParam(value = "椤电爜鏁�") Integer page,
- @RequestParam(defaultValue = "10") @ApiParam(value = "姣忛〉鏄剧ず鏉℃暟") Integer pageSize) {
- IPage<TjReservation> pages=new Page<>(page,pageSize);
+ @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime) {
+
LambdaQueryWrapper<TjReservation> wq=new LambdaQueryWrapper<>();
if(null !=compId)wq.eq(TjReservation::getCompanyId,compId);
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);
- return AjaxResult.success(iPage);
+ wq.eq(TjReservation::getIsExpire,"2");
+ return AjaxResult.success(reservationService.list(wq));
}
--
Gitblit v1.8.0