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 | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 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 91bf6f0..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
@@ -1,23 +1,25 @@
package com.ltkj.web.controller.system;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.hosp.domain.TjCustomerBlack;
+import com.ltkj.hosp.domain.TjReservation;
+import com.ltkj.hosp.service.ITjReservationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
@@ -39,7 +41,8 @@
public class DictCompController extends BaseController {
@Resource
private IDictCompService dictCompService;
-
+ @Resource
+ private ITjReservationService reservationService;
/**
* 鑾峰彇鍗曚綅淇℃伅闆嗗悎鎺ュ彛
*/
@@ -59,6 +62,15 @@
List<DictComp> list = dictCompService.selectDictCompList(dictComp);
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));
+ }
+
/**
* 瀵煎嚭浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
@@ -88,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));
}
@@ -113,4 +127,23 @@
public AjaxResult remove(@PathVariable String[] drugManufacturerIds) {
return toAjax(dictCompService.deleteDictCompByDrugManufacturerIds(drugManufacturerIds));
}
+
+
+ @GetMapping("/getCusTomterListByCompId")
+ @ApiOperation(value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
+ 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) {
+
+ 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));
+ wq.eq(TjReservation::getIsExpire,"2");
+ return AjaxResult.success(reservationService.list(wq));
+ }
+
+
}
--
Gitblit v1.8.0