From a6e6348c8008fd3984fc0f42323c17b322be142f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 23 一月 2024 14:50:16 +0800
Subject: [PATCH] zjh 2024/01/23--2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 6 ++-
ltkj-admin/src/test/java/zjhTest.java | 38 ++----------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 17 +++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 37 +++++++++---------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 2
ltkj-admin/src/test/java/ImageTextExtractor.java | 6 ++
6 files changed, 44 insertions(+), 62 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 8c51008..0d03dae 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
@@ -413,10 +413,10 @@
}
/**
- * 褰卞儚妫�鏌ラ〉闈㈠垪琛�
+ * 鍖栭獙妫�鏌ラ〉闈㈠垪琛�
*/
@GetMapping("/huaYangetProList")
- @ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�")
+ @ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult huaYangetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
@ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@@ -454,9 +454,9 @@
ksproList = projectService.getKsTjProjectIdList();
}
- //绛涢�夊奖鍍忕殑椤圭洰銆�
+ //绛涢�夊寲楠岀殑椤圭洰銆�
ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522589L)
+ .filter(element -> element ==1633660948860522629L)
.collect(Collectors.toList());
if (ksproList == null || ksproList.size() == 0) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
@@ -623,10 +623,10 @@
/**
- * 鍖栭獙妫�鏌ラ〉闈㈠垪琛�
+ * 褰卞儚妫�鏌ラ〉闈㈠垪琛�
*/
@GetMapping("/yingXiangGetProList")
- @ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�")
+ @ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult yingXiangGetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
@ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@@ -663,19 +663,20 @@
} else {
ksproList = projectService.getKsTjProjectIdList();
}
- //绛涢�夊寲楠岀殑椤圭洰銆�
+ //绛涢�夊奖鍍忕殑椤圭洰銆�
ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522629L || element ==1633660948860522504L
- ||
- element ==1633660948860522507L|| element ==1633660948860522508L
- ||
- element ==1633660948860522515L|| element ==1633660948860522516L
- ||
- element ==1633660948860522517L|| element ==1633660948860522519L
- ||
- element ==1633660948860522524L|| element ==1633660948860522530L
- ||
- element ==1633660948860522531L|| element ==1633660948860522533L
+ .filter(element -> element ==1633660948860522589L
+// || element ==1633660948860522504L
+// ||
+// element ==1633660948860522507L|| element ==1633660948860522508L
+// ||
+// element ==1633660948860522515L|| element ==1633660948860522516L
+// ||
+// element ==1633660948860522517L|| element ==1633660948860522519L
+// ||
+// element ==1633660948860522524L|| element ==1633660948860522530L
+// ||
+// element ==1633660948860522531L|| element ==1633660948860522533L
)
.collect(Collectors.toList());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 8de8799..ae5a863 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -560,8 +560,10 @@
project.getProId());
String s = tjFlowingWaterService.getDiscount(OrderId);
if(null !=decimal){
- project.setProPrice(decimal.setScale(2));
- project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+// project.setProPrice(decimal.setScale(2));
+ project.setProPrice(decimal);
+// project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+ project.setProOrdPrice(decimal);
}else {
BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
if(null !=decimal1){
diff --git a/ltkj-admin/src/test/java/ImageTextExtractor.java b/ltkj-admin/src/test/java/ImageTextExtractor.java
index c02f45a..b7724b9 100644
--- a/ltkj-admin/src/test/java/ImageTextExtractor.java
+++ b/ltkj-admin/src/test/java/ImageTextExtractor.java
@@ -27,9 +27,13 @@
}
public static void main(String[] args) throws IOException {
- String imagePath = "C:\\Users\\w\\Pictures\\Saved Pictures\\333.png";
+ String imagePath = "C:\\Users\\w\\Pictures\\Saved Pictures\\a.png";
String extractedText = extractTextFromImage(imagePath);
System.out.println(extractedText);
+ System.out.println("============================================================");
+ String imagePath1 = "C:\\Users\\w\\Pictures\\Saved Pictures\\b.png";
+ String extractedText1 = extractTextFromImage(imagePath1);
+ System.out.println(extractedText1);
}
}
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index d4ed7e5..d0cc02f 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -65,46 +65,18 @@
@Test
public void test() {
// List<DictHosp> list = dictHospService.list();
+// DateTime dateTime1 = DateUtil.offsetMonth(new Date(),100);
// for (DictHosp dictHosp : list) {
-// DateTime dateTime1 = DateUtil.offsetMonth(new Date(),6);
-// String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dictHosp.getExpirationTime());
+// String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dateTime1);
// dictHosp.setSecretKey(mallMerchantSecretKey);
-// dictHosp.setExpirationTime(DateUtil.offsetDay(new Date(),30));
+// dictHosp.setExpirationTime(dateTime1);
// dictHospService.updateById(dictHosp);
// System.out.println(dateTime1);
// System.out.println("=================================================");
// System.out.println(mallMerchantSecretKey);
+// }
-// List<Object> list=new ArrayList<>();
-// ScanOptions options = ScanOptions.scanOptions().match("cS*").build();
-// try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(redisConnection -> {
-// return redisConnection.scan(options);
-// })) {
-// while (cursor.hasNext()) {
-// byte[] keyBytes = cursor.next();
-// String key = new String(keyBytes);
-// // 澶勭悊鍖归厤鐨刱ey
-// List<Object> multiCacheMapValue = redisCache.getMultiCacheMapValue(key, null);
-// list.add(multiCacheMapValue);
-// }
-// }
-// System.out.println(list);
-// System.out.println(redisCache.getMultiCacheMapValue("check",null));
-// }
-
-/* LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId,0);
- List<TjProject> projectList = projectService.list(wq);
- for (TjProject project : projectList) {
- LambdaQueryWrapper<TjProject> wqq=new LambdaQueryWrapper<>();
- wqq.eq(TjProject::getProParentId,project.getProId());
- List<TjProject> list = projectService.list(wqq);
- for (TjProject tjProject : list) {
- tjProject.setDeptId(project.getDeptId());
- projectService.updateById(tjProject);
- }
- }*/
- }
+ }
public static void main(String[] args) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 52c0625..d07b15f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -190,13 +190,16 @@
boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);
- @Select("SELECT b.price_now FROM \n" +
- "(SELECT a.pac_id FROM tb_transition a WHERE\n" +
- "\ta.cus_id = #{cusId} \n" +
- "GROUP BY\n" +
- "\ta.pac_id) aa \n" +
- "LEFT JOIN tj_package_project b\n" +
- "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
+// @Select("SELECT b.price_now FROM \n" +
+// "(SELECT a.pac_id FROM tb_transition a WHERE\n" +
+// "\ta.cus_id = #{cusId} \n" +
+// "GROUP BY\n" +
+// "\ta.pac_id) aa \n" +
+// "LEFT JOIN tj_package_project b\n" +
+// "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
+// BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
+
+ @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId}")
BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index acae5da..d5c6c0b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -139,7 +139,7 @@
"SELECT #{tjNum},b.cus_id,b.cus_name,'1633660948860522619','绾煶鍚槇'," +
"#{userName},SYSDATE(),#{userId} FROM tb_transition a LEFT JOIN tj_customer b " +
"ON a.cus_id=b.cus_idcard WHERE a.cus_id=#{cusId} AND a.parent_pro_id IN('1633660948860522619') GROUP BY a.cus_id")
- boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId);
+ boolean saveTjPureToneTesByCusId(@Param("cusId")String cusId,@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId);
@Update("UPDATE tj_order_detail a SET\n" +
--
Gitblit v1.8.0