From a51a70b780ef0ed24abb81b096c80649a0255ece Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 七月 2024 19:29:23 +0800
Subject: [PATCH] zjh 2024/07/2-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 5
ltkj-admin/pom.xml | 75 +++++++++++---
ltkj-common/pom.xml | 6 +
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 14 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 192 ++++++++++++++++++++------------------
5 files changed, 175 insertions(+), 117 deletions(-)
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index 59b6c25..257cf12 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -8,8 +8,15 @@
<version>3.8.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<artifactId>ltkj-admin</artifactId>
+ <name>ltkj-admin</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
<description>
web鏈嶅姟鍏ュ彛
@@ -23,7 +30,10 @@
</repositories>
<dependencies>
-
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
<dependency>
<groupId>net.sourceforge.tess4j</groupId>
@@ -36,7 +46,6 @@
<artifactId>pdfbox</artifactId>
<version>0.7.3</version>
</dependency>
-
<!-- spring-boot-devtools -->
@@ -172,21 +181,52 @@
<version>4.2.0</version>
</dependency>
</dependencies>
- <properties>
- <!-- docker闀滃儚鍓嶇紑 -->
- <docker.image.prefix>ltkj</docker.image.prefix>
- </properties>
+
+
+<!--
+ <build>
+ <plugins>
+ <!– maven鎵撳寘鎻掍欢–>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.1.1.RELEASE</version>
+ <configuration>
+ <fork>true</fork> <!– 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 –>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <!– <warName>${project.artifactId}</warName>–>
+ <warName>ltkj-admin</warName>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>ltkj-admin</finalName>
+ </build>
+-->
+
<build>
<plugins>
- <!-- maven鎵撳寘鎻掍欢-->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.1.1.RELEASE</version>
+ <version>2.5.15</version>
<configuration>
<fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
</configuration>
@@ -201,16 +241,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.0.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
-<!-- <warName>${project.artifactId}</warName>-->
- <warName>ltkj-admin</warName>
+ <warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugins>
- <finalName>ltkj-admin</finalName>
-<!-- <finalName>${project.artifactId}</finalName>-->
+ <finalName>${project.artifactId}</finalName>
</build>
+
</project>
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index bca4ac9..fd6ce97 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -2395,13 +2395,13 @@
public void saveRedisTransitionByProId(String cusId,String cardId, List<Long> proIds) {
for (Long proId : proIds) {
TjProject project = projectService.selectTjProjectByProId(proId);
-// if(null !=project && (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))){
-// List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
-// if (null != transitionList && transitionList.size() > 0) {
-// continue;
-// }
-// }
- if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.size() == 0) {
+ transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ }
+ }
+// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
}
}
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 66c90b8..3b21af4 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
@@ -1530,66 +1530,68 @@
redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
}
}
- List<TbTransition> tbTransitionList = null;
- if (!redisCache.hasKey(cardId + cusId)) {
- tbTransitionList = new ArrayList<>();
- } else {
- tbTransitionList = redisCache.getCacheList(cardId + cusId);
- }
+// List<TbTransition> tbTransitionList = null;
+// if (!redisCache.hasKey(cardId + cusId)) {
+// tbTransitionList = new ArrayList<>();
+// } else {
+// tbTransitionList = redisCache.getCacheList(cardId + cusId);
+// }
//濂楅
+ /*濂楅*/
if (null != packId && !packId.equals("")) {
Long pacId = Long.valueOf(packId.toString());
List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
if (null == list || list.size() == 0) {
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
- if (redisCache.hasKey(cardId + cusId + "cusId"))
- redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
- if (redisCache.hasKey(cardId + cusId)) {
- tbTransitionList = new ArrayList<>();
- redisCache.deleteObject(cardId + cusId);
- }
+// if (redisCache.hasKey(cardId + cusId + "cusId"))
+// redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
+// if (redisCache.hasKey(cardId + cusId)) {
+// tbTransitionList = new ArrayList<>();
+// redisCache.deleteObject(cardId + cusId);
+// }
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && ppList.size() > 0) {
+ transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
- for (TjPackageProject tjPackageProject : ppList) {
- TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
- if (null != project) {
-
- BigDecimal divide = BigDecimal.valueOf(0);
- if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
- divide = BigDecimal.valueOf(0);
- } else {
- divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
- }
- List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
- if (null != tjProSonList && tjProSonList.size() > 0) {
- //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
- for (TjProject tjProject : tjProSonList) {
- TbTransition tbTransition = new TbTransition();
- tbTransition.setCusId(cusId);
- tbTransition.setPacId(pacId);
- if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
- tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
- tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
- } else {
- tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
- tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
- }
- tbTransition.setParentProId(project.getProId());
- tbTransition.setParentProName(project.getProName());
- tbTransition.setProId(tjProject.getProId());
- tbTransition.setProName(tjProject.getProName());
- tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
- tbTransition.setProType(tjProject.getProType());
- tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
- tbTransitionList.add(tbTransition);
- }
-
- }
- }
- }
+// asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
+// for (TjPackageProject tjPackageProject : ppList) {
+// TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
+// if (null != project) {
+//
+// BigDecimal divide = BigDecimal.valueOf(0);
+// if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
+// divide = BigDecimal.valueOf(0);
+// } else {
+// divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
+// }
+// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+// if (null != tjProSonList && tjProSonList.size() > 0) {
+// //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
+// for (TjProject tjProject : tjProSonList) {
+// TbTransition tbTransition = new TbTransition();
+// tbTransition.setCusId(cusId);
+// tbTransition.setPacId(pacId);
+// if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
+// tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
+// tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
+// } else {
+// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
+// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
+// }
+// tbTransition.setParentProId(project.getProId());
+// tbTransition.setParentProName(project.getProName());
+// tbTransition.setProId(tjProject.getProId());
+// tbTransition.setProName(tjProject.getProName());
+// tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
+// tbTransition.setProType(tjProject.getProType());
+// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
+// tbTransitionList.add(tbTransition);
+// }
+//
+// }
+// }
+// }
}
}
}
@@ -1597,53 +1599,63 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
- asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
+// asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
- List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.size() == 0) {
+ transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ }
+ }
+// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ }
+// for (Long proId : proIds) {
+// List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
// if (null != transitions && transitions.size() > 0) {
// continue;
// }
- TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
- if (null != tjProject) {
-// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
-// if (null != tjProSonList && tjProSonList.size() > 0) {
-// for (TjProject tjProject : tjProSonList) {
-// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
-// if (null != transitionss && transitionss.size() > 0) {
-// continue;
+// TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
+// if (null != tjProject) {
+//// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+//// if (null != tjProSonList && tjProSonList.size() > 0) {
+//// for (TjProject tjProject : tjProSonList) {
+//// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
+//// if (null != transitionss && transitionss.size() > 0) {
+//// continue;
+//// }
+// TbTransition tbTransition = new TbTransition();
+// tbTransition.setCusId(cusId);
+// tbTransition.setPacId(null);
+// if (null != tjProject.getProPrice()) {
+// tbTransition.setOrdPrice(tjProject.getProPrice());
+// tbTransition.setNowPrice(tjProject.getProPrice());
+// } else {
+// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
+// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
// }
- TbTransition tbTransition = new TbTransition();
- tbTransition.setCusId(cusId);
- tbTransition.setPacId(null);
- if (null != tjProject.getProPrice()) {
- tbTransition.setOrdPrice(tjProject.getProPrice());
- tbTransition.setNowPrice(tjProject.getProPrice());
- } else {
- tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
- tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
- }
- tbTransition.setParentProId(tjProject.getProParentId());
- if (tjProject.getProParentId() != null) {
- TjProject byId = projectService.getById(tjProject.getProParentId());
- if (null != byId) {
- tbTransition.setParentProName(byId.getProName());
- }
- }
- tbTransition.setParentProName("");
-
- tbTransition.setProId(tjProject.getProId());
- tbTransition.setProName(tjProject.getProName());
- tbTransition.setProType(tjProject.getProType());
- tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
- tbTransitionList.add(tbTransition);
+// tbTransition.setParentProId(tjProject.getProParentId());
+// if (tjProject.getProParentId() != null) {
+// TjProject byId = projectService.getById(tjProject.getProParentId());
+// if (null != byId) {
+// tbTransition.setParentProName(byId.getProName());
// }
// }
- }
- }
+// tbTransition.setParentProName("");
+//
+// tbTransition.setProId(tjProject.getProId());
+// tbTransition.setProName(tjProject.getProName());
+// tbTransition.setProType(tjProject.getProType());
+// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
+// tbTransitionList.add(tbTransition);
+//// }
+//// }
+// }
+// }
}
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
+// if (null != tbTransitionList && tbTransitionList.size() > 0) {
// if (redisCache.hasKey(cardId + cusId)) {
// redisCache.deleteObject(cardId + cusId);
// redisCache.setCacheList(cardId + cusId, tbTransitionList);
@@ -1652,9 +1664,9 @@
// redisCache.setCacheList(cardId + cusId, tbTransitionList);
// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
// }
- List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList);
- return AjaxResult.success(map1);
- }
+// List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList);
+// return AjaxResult.success();
+// }
return AjaxResult.success();
}
diff --git a/ltkj-common/pom.xml b/ltkj-common/pom.xml
index d8ce7e4..0f64d5f 100644
--- a/ltkj-common/pom.xml
+++ b/ltkj-common/pom.xml
@@ -23,6 +23,12 @@
<!-- </repositories>-->
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>2.5.14</version>
+ </dependency>
+
<!--浠ヤ笅tduck-->
<dependency>
<groupId>com.aventrix.jnanoid</groupId>
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 708e8e2..82043c6 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
@@ -96,7 +96,7 @@
// @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id) AND pro_id =#{proId}")
// public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
- @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pro_id =#{proId}")
+ @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pro_id =#{proId} and ISNULL(tj_num)")
public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
@Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
@@ -141,7 +141,8 @@
"\tb.pro_id,\n" +
"\tb.pro_name,\n" +
"\tTRUNCATE(c.pro_price,2),\n" +
- " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
+ "\tTRUNCATE(c.pro_price,2),\n" +
+// " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
"\tSYSDATE(),\n" +
"\tc.pro_check_method,\n" +
"\tIFNULL(c.pro_type,''),\n" +
--
Gitblit v1.8.0