From 308589effc0fe60876a5794571ede0c211cc828c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 10 一月 2025 17:25:09 +0800
Subject: [PATCH] zjh20250110
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 17 ++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 53 ++++++++++++++++++++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 21 ++--------
4 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index fae6ec7..9c7ef7e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -94,32 +94,19 @@
public AjaxResult getPacInFo(@ApiParam(value = "浣撴濂楅瀵硅薄id") String pacId) {
TjPackage aPackage = tjPackageService.getById(pacId);
if (null != aPackage) {
- List<TjProject> tjProjectList = new ArrayList<>();
List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
if (null != pplist) {
for (TjPackageProject packageProject : pplist) {
-// StringBuilder allSonProName = new StringBuilder(); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
TjProject tjProject = tjProjectService.getById(packageProject.getProId());
if (null != tjProject) {
-// List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
-// for (TjProject project : listBySoneId) {
-// allSonProName.append(project.getProName()).append(";"); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-// }
- tjProject.setAllSonProName(tjProjectService.getAllSonNames(String.valueOf(packageProject.getProId()))); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
- tjProjectList.add(tjProject);
- //鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 2023.2.8
- if (packageProject.getPriceNow() != null) {
- tjProject.setPriceNow(packageProject.getPriceNow());
- } else {
- tjProject.setPriceNow(tjProject.getProPrice());
- }
-
+ packageProject.setProName(tjProject.getProName());
}
}
}
- aPackage.setTjProjectList(tjProjectList);
+ aPackage.setPackageProjects(pplist);
+ return AjaxResult.success(aPackage);
}
- return AjaxResult.success(aPackage);
+ return AjaxResult.error();
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 2f592be..8b7e808 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -349,6 +349,8 @@
@ApiOperation(value = "淇敼浣撴椤圭洰")
@Transactional
public AjaxResult edit(@RequestBody @ApiParam(value = "浣撴椤圭洰瀵硅薄") TjProject tjProject) {
+ TjProject ytjproject = tjProjectService.getById(tjProject.getProId());
+ if(null==ytjproject)return AjaxResult.error();
if (tjProject.getProStatus() == 1) {
LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjPackageProject::getProId, tjProject.getProId());
@@ -356,14 +358,21 @@
if (null != list1 && !list1.isEmpty()) {
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍋滅敤");
}
+ if(tjProject.getProParentId() !=0){
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId, tjProject.getProParentId());
+ wq.eq(TjProject::getProStatus,0);
+ List<TjProject> list = tjProjectService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ int i = list.size();
+ if(i<2) return AjaxResult.error("鑷冲皯淇濈暀涓�涓瓙椤圭洰,涓嶅彲鍏ㄩ儴鍋滅敤!!!");
+ }
+ }
}
tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
-
- TjProject ytjproject = tjProjectService.getById(tjProject.getProId());
Date date=new Date();
if (tjProject.getProParentId() == 0) {
if (tjProjectService.updateById(tjProject)) {
- if(null !=ytjproject){
if(ytjproject.getProPrice().compareTo(tjProject.getProPrice())!=0){
TjProjectXgjl xgjl=new TjProjectXgjl();
BeanUtils.copyBeanProp(xgjl,ytjproject);
@@ -371,7 +380,6 @@
xgjl.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
xgjlService.save(xgjl);
}
- }
if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
if (null != tjProject.getSfxmId()) {
DictProSfxm proSfxm = new DictProSfxm();
@@ -380,7 +388,11 @@
dictProSfxmService.save(proSfxm);
}
}
- List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
+ LambdaQueryWrapper<TjProject> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjProject::getProParentId,tjProject.getProId());
+ if(ytjproject.getProStatus()==0)
+ wqq.eq(TjProject::getProStatus,0);
+ List<TjProject> list = tjProjectService.list(wqq);
if (null != list && !list.isEmpty()) {
for (TjProject project : list) {
project.setDeptId(tjProject.getDeptId());
@@ -415,7 +427,6 @@
tjProject.setIsSampling(byId1.getIsSampling());
}
if (tjProjectService.updateById(tjProject)) {
- if(null !=ytjproject){
if(ytjproject.getProPrice().compareTo(tjProject.getProPrice())!=0){
TjProjectXgjl xgjl=new TjProjectXgjl();
BeanUtils.copyBeanProp(xgjl,ytjproject);
@@ -423,7 +434,7 @@
xgjl.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
xgjlService.save(xgjl);
}
- }
+
if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
if (null != tjProject.getSfxmId()) {
DictProSfxm proSfxm = new DictProSfxm();
@@ -575,7 +586,7 @@
* 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
*/
@GetMapping("/getProParentIdDxList")
- @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
public AjaxResult getProParentIdDxList() {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
@@ -584,11 +595,37 @@
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
+
map.put("list", tjProjects);
map.put("key", key);
return AjaxResult.success(map);
}
+
+ @GetMapping("/getProParentIdDxListByFenYe")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�(鏈夊垎椤�)")
+ public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize) {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if (null != config && config.equals("N")) {
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String, Object> map = new HashMap<>();
+
+ if(null !=tjProjects && !tjProjects.isEmpty()){
+ List<TjProject> collect = tjProjects.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ map.put("total", tjProjects.size());
+ map.put("list", collect);
+ }else {
+ map.put("total",0);
+ map.put("list", tjProjects);
+ }
+ map.put("key", key);
+ return AjaxResult.success(map);
+ }
+
+
@GetMapping("/getProSonDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鏍规嵁鐖堕」id閫夋嫨瀛愰」)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
public AjaxResult getProSonDxList(@RequestParam String proId) {
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 c296ee3..38da148 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
@@ -144,6 +144,7 @@
" parent_pro_id,\n" +
" parent_pro_name,\n" +
" ord_price,\n" +
+ " discount,\n" +
" now_price,\n" +
" create_time,\n" +
" pro_check_method,\n" +
@@ -158,9 +159,9 @@
"\tc.pro_name,\n" +
"\tb.pro_id,\n" +
"\tb.pro_name,\n" +
- "\tTRUNCATE(c.pro_price,2),\n" +
- "\tTRUNCATE(c.pro_price,2),\n" +
-// " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
+ "\t(c.pro_price * c.sl),\n" +
+ "\ta.limits,\n" +
+ "\t((c.pro_price * c.sl) * (a.limits/10)),\n" +
"\tSYSDATE(),\n" +
"\tc.pro_check_method,\n" +
"\tIFNULL(c.pro_type,''),\n" +
@@ -179,7 +180,7 @@
"(cus_id, pro_id, pro_name, parent_pro_id, parent_pro_name, ord_price, now_price, create_time, pro_check_method, pro_type,card_id ) \n" +
"SELECT\n" +
"#{cusId},\n" +
- "a.pro_id,a.pro_name,b.pro_id,b.pro_name,a.pro_price,a.pro_price,SYSDATE(),a.pro_check_method,\n" +
+ "a.pro_id,a.pro_name,b.pro_id,b.pro_name,a.pro_price * a.sl,a.pro_price * a.sl,SYSDATE(),a.pro_check_method,\n" +
"IFNULL ( a.pro_type, '' ), \n" +
"#{cardId}\n" +
"FROM\n" +
@@ -211,9 +212,9 @@
"c.pro_name,\n" +
"b.pro_id,\n" +
"b.pro_name,\n" +
- "c.pro_price,\n" +
+ "(c.pro_price * c.sl),\n" +
"a.limits,\n" +
- "c.pro_price * (a.limits/10),\n" +
+ "((c.pro_price * c.sl) * (a.limits/10)),\n" +
"SYSDATE(),\n" +
"c.pro_check_method,\n" +
"c.pro_type\n" +
@@ -249,9 +250,9 @@
"c.pro_name,\n" +
"b.pro_id,\n" +
"b.pro_name,\n" +
- "c.pro_price,\n" +
+ "(c.pro_price * c.sl),\n" +
"a.limits,\n" +
- "(c.pro_price * (a.limits/10)),\n" +
+ "((c.pro_price * c.sl) * (a.limits/10)),\n" +
"SYSDATE(),\n" +
"c.pro_check_method,\n" +
"c.pro_type,\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index d72358b..35c8d0c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.*;
import java.util.stream.Collectors;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
@@ -156,6 +157,8 @@
public List<TreeSelect> selectProjectTreeList(TjProject tjProject) {
LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
wq.eq(TjProject::getProStatus,0);
+ if(StrUtil.isNotBlank(tjProject.getProName()))wq.like(TjProject::getProName,tjProject.getProName());
+ if(StrUtil.isNotBlank(tjProject.getProEngName()))wq.like(TjProject::getProEngName,tjProject.getProEngName());
List<TjProject> projects = SpringUtils.getAopProxy(this).list(wq);
return buildProjectTreeSelect(projects);
}
--
Gitblit v1.8.0