From 06059e134de6817418335516f56bbf4280ff351b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 04 一月 2025 18:56:07 +0800
Subject: [PATCH] zjh20250104
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 19 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 4 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 19 +-----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 97 +++++++++++++++++---------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 14 ++--
5 files changed, 75 insertions(+), 78 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 3f29bea..b61a155 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -2,6 +2,7 @@
import java.io.*;
import java.math.BigDecimal;
+import java.sql.Struct;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -1788,9 +1789,10 @@
@GetMapping("/getxmjgz")
@ApiOperation(value = "鍖荤敓妫�鏌ュ鑾峰彇椤圭洰瑙勫垯鍊�")
- public AjaxResult getxmjgz(@RequestParam String proId) {
+ public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) {
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
wq.eq(TjRules::getProId, proId);
+ if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz);
List<TjRules> list = tjRulesService.list(wq);
if(null !=list && !list.isEmpty()){
for (TjRules tjRules : list) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index c474214..8c09de2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -235,9 +235,9 @@
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
if (tjCustomer1 != null) {
- if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
- tjCustomerService.updateById(tjCustomer1);
+// if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
+// tjCustomerService.updateById(tjCustomer1);
tjCustomer1.setTjType(tjReservation.getTjType());
tjCustomer1.setCusName(tjReservation.getName());
tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
@@ -260,8 +260,8 @@
tjCustomer1.setDiscount(tjReservation.getDiscount());
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
- if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
+// if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
// tjCustomerService.updateById(tjCustomer1);
@@ -291,8 +291,8 @@
tjCustomer.setCusPassword(substring);
tjCustomer.setTjType(tjReservation.getTjType());
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
- if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
+// if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
if (null != key && key.equals("Y"))
{
AjaxResult result = controller.Outpincreateapply(tjCustomer);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 63c41d8..6e0d904 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -498,13 +498,9 @@
order.setIdType(tjCustomer.getIdType());
order.setAgeUnit(tjCustomer.getAgeUnit());
order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- if (null != tjCustomer.getCompName()) {
- order.setDictCompName(tjCustomer.getCompName());
- } else {
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
+ String firmName = order.getFirmName();
+ if (StringUtil.isNotBlank(firmName)) {
+ order.setDictCompName(firmName);
}
if (null != order.getPacId()) {
if (null != tjPackageService.getById(order.getPacId())) {
@@ -1039,16 +1035,9 @@
tjOrder.setTjType("2");
}
}
-
- if (null != tjCustomer.getCompName()) {
- tjOrder.setFirmName(tjCustomer.getCompName());
- }
- if (null != tjCustomer.getDictCompId()) {
- tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId()));
- } else {
+ if(StringUtil.isBlank(tjOrder.getFirmId())){
tjOrder.setFirmId("0");
}
-
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 8a384d3..0c2433c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -103,56 +103,61 @@
@ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�")
public void importTemplate(HttpServletResponse response) {
//鍘熸潵鐨勪笅杞芥ā鏉胯皟鐢ㄦ帴鍙�
- String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_excelTemplate"));
- if (null != base64String) {
- PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + File.separator + "鍥綋棰勭害Excel妯＄増.xls");
- String filePath = value + File.separator + "鍥綋棰勭害Excel妯＄増.xls";
- File f = new File(filePath);
- BufferedInputStream br = null;
- OutputStream out = null;
- FileInputStream fileInputStream = null;
- try {
- fileInputStream = new FileInputStream(f);
- br = new BufferedInputStream(fileInputStream);
- byte[] bs = new byte[1024];
- int len = 0;
- response.reset(); // 闈炲父閲嶈
- if (true) {
- // 鍦ㄧ嚎鎵撳紑鏂瑰紡
- URL u = new URL("file:///" + filePath);
- //System.out.println(u);
- String contentType = u.openConnection().getContentType();
- response.setContentType(contentType);
- response.setHeader("Content-Disposition", "inline;filename=鍥綋棰勭害Excel妯＄増.xls");
- } else {
- // 绾笅杞芥柟寮�
- response.setContentType("application/x-msdownload");
- response.setContentType("application/pdf;charset=utf-8");
- response.setHeader("Content-Disposition", "attachment;filename=鍥綋棰勭害Excel妯＄増.xls");
- }
- out = response.getOutputStream();
- while ((len = br.read(bs)) > 0) {
- out.write(bs, 0, len);
- }
- out.flush();
- out.close();
- br.close();
- fileInputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- //System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e);
- } finally {
- if (out != null) {
- try {
- out.close();
- br.close();
- fileInputStream.close();
+ try {
+ String base64String = PDFBinaryUtil.getPDFBinary(value + File.separator + "瑗垮畨璺嘲鏈虹數绉戞妧鏈夐檺鍏徃.xls");
+ if (null != base64String) {
+ PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + File.separator + "鍥綋棰勭害Excel妯＄増.xls");
+ String filePath = value + File.separator + "鍥綋棰勭害Excel妯＄増.xls";
+ File f = new File(filePath);
+ BufferedInputStream br = null;
+ OutputStream out = null;
+ FileInputStream fileInputStream = null;
+ try {
+ fileInputStream = new FileInputStream(f);
+ br = new BufferedInputStream(fileInputStream);
+ byte[] bs = new byte[1024];
+ int len = 0;
+ response.reset(); // 闈炲父閲嶈
+ if (true) {
+ // 鍦ㄧ嚎鎵撳紑鏂瑰紡
+ URL u = new URL("file:///" + filePath);
+ //System.out.println(u);
+ String contentType = u.openConnection().getContentType();
+ response.setContentType(contentType);
+ response.setHeader("Content-Disposition", "inline;filename=鍥綋棰勭害Excel妯＄増.xls");
+ } else {
+ // 绾笅杞芥柟寮�
+ response.setContentType("application/x-msdownload");
+ response.setContentType("application/pdf;charset=utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=鍥綋棰勭害Excel妯＄増.xls");
+ }
+ out = response.getOutputStream();
+ while ((len = br.read(bs)) > 0) {
+ out.write(bs, 0, len);
+ }
+ out.flush();
+ out.close();
+ br.close();
+ fileInputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ //System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e);
+ } finally {
+ if (out != null) {
+ try {
+ out.close();
+ br.close();
+ fileInputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
}
+ } catch (Exception e) {
+ ExcelUtils.exportTemplate(response,"鍥綋棰勭害Excel妯＄増",TjReservation.class);
+ throw new RuntimeException(e);
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index b0d9753..6b98f0b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -20,6 +20,7 @@
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 浣撴棰勭害瀵硅薄 tj_reservation
@@ -190,12 +191,12 @@
private String company;
/**
- * 鍗曚綅鍚嶅瓧
+ * 濂楅鍒嗙被
*/
- @ExcelExport(value = "閮ㄩ棬",sort =99)
- @ExcelImport("閮ㄩ棬")
- @Excel(name = "閮ㄩ棬",sort = 99,cellType = Excel.ColumnType.STRING)
- @ApiModelProperty("閮ㄩ棬")
+ @ExcelExport(value = "濂楅鍒嗙被",sort =99)
+ @ExcelImport("濂楅鍒嗙被")
+ @Excel(name = "濂楅鍒嗙被",sort = 99,cellType = Excel.ColumnType.STRING)
+ @ApiModelProperty("濂楅鍒嗙被")
@TableField(exist = false)
private String dwxm;
@@ -215,10 +216,10 @@
/**
* 閮ㄩ棬
*/
-// @ExcelExport(value = "閮ㄩ棬",sort =-2)
-// @ExcelImport("閮ㄩ棬")
-// @Excel(name = "閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING)
- @ApiModelProperty("閮ㄩ棬")
+ @ExcelExport(value = "鍗曚綅閮ㄩ棬",sort =-2)
+ @ExcelImport("鍗曚綅閮ㄩ棬")
+ @Excel(name = "鍗曚綅閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED)
+ @ApiModelProperty("鍗曚綅閮ㄩ棬")
private String department;
/**
--
Gitblit v1.8.0