From dcdcf7bf4708d409554b89096eb688557ab39342 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期六, 12 十月 2024 16:55:58 +0800
Subject: [PATCH] 签到登记修改
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 126 +++++++++---------------------------------
1 files changed, 27 insertions(+), 99 deletions(-)
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 4ec3fe7..620b462 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
@@ -398,7 +398,11 @@
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
wq.eq(TjOrderDetail::getIsSampling, 0);
List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
- if (null != detailList && detailList.size() > 0) {
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);
+ }
+
+ public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser) {
+ if (null != detailList && detailList1) {
String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
for (TjOrderDetail detail : detailList) {
TjSampling sampling = new TjSampling();
@@ -503,7 +507,7 @@
@Override
@Async("async")
- @Transactional
+// @Transactional
public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -522,7 +526,6 @@
proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
blService.save(proBl);
- List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
String config = configService.selectConfigByKey("sfkqdyhis");
@@ -542,8 +545,9 @@
List<TjProject> projectList=new ArrayList<>();
for (String tjProId : tjProIds) {
- LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+// wqq.isNull(TbTransition::getTjNum);
TjProject project = projectService.getById(Long.valueOf(tjProId));
if (null != project && project.getProParentId() == 0) {
TjOrderRemark tjOrderRemark = new TjOrderRemark();
@@ -591,7 +595,7 @@
detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
}
- wqq.in(TbTransition::getProId, proIds);
+// wqq.in(TbTransition::getProId, proIds);
if(null !=config && config.equals("Y")){
//妫�楠�
@@ -729,7 +733,7 @@
} else {
- wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
+// wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
TjProject projectss = projectService.getById(projects.getProParentId());
@@ -737,11 +741,9 @@
projectList.add(projectss);
}
}
-// List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
TjOrderDetail detail = new TjOrderDetail();
detail.setTjStatus(0L);
detail.setOrderId(tjFlowingWater.getOrderId());
-// detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail.setProId(Long.valueOf(tjProId));
detail.setIsAddition("Y");
detail.setCreateBy(sysUser.getNickName());
@@ -755,64 +757,23 @@
}
- List<TbTransition> tbTransitionList = transitionService.list(wqq);
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
+// List<TbTransition> tbTransitionList = transitionService.list(wqq);
+ List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(),tjProId);
+ if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
for (TbTransition transition : tbTransitionList) {
- transition.setJxbz(jxbz);
- transition.setTjNum(order.getTjNumber());
- transition.setCardId(order.getCardId());
- transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
- transitionService.updateById(transition);
-// TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
- //瀛愰」
-// if (null != tjProject) {
-// TjChargingStandard tjChargingStandard = new TjChargingStandard();
-// tjChargingStandard.setTjNum(order.getTjNumber());
-// tjChargingStandard.setProId(transition.getProId());
-// tjChargingStandard.setPrice(transition.getNowPrice());
-// tjChargingStandard.setProName(tjProject.getProName());
-// tjChargingStandard.setCreateBy(sysUser.getNickName());
-// tjChargingStandard.setCreateTime(dates);
-// tjChargingStandard.setUpdateBy(sysUser.getNickName());
-// tjChargingStandard.setUpdateTime(dates);
-// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
-// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
-// chargingStandardService.save(tjChargingStandard);
-// }
+// transition.setJxbz(jxbz);
+// transition.setTjNum(order.getTjNumber());
+// transition.setCardId(order.getCardId());
+// transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
+// transitionService.updateById(transition);
+ transitionService.updateTbTransitionById(transition.getId().toString(),jxbz,order.getTjNumber(),order.getCardId(),
+ transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
}
- //鐖堕」
-//
-// TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
-// if (null != parentProject && parentProject.getProParentId() == 0) {
-// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
-// wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
-// List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
-// if (null != proConsumables && proConsumables.size() > 0) {
-// for (TjProConsumables tjProConsumables : proConsumables) {
-// TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
-// list2.add(tjConsumables);
-// }
-// }
-//
-// } else {
-// TjProject parentProjects = projectService.getById(tjProId);
-// if (null != parentProjects) {
-// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
-// wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
-// List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
-// if (null != proConsumables && proConsumables.size() > 0) {
-// for (TjProConsumables tjProConsumables : proConsumables) {
-// TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
-// list2.add(tjConsumables);
-// }
-// }
-// }
-// }
}
}
- if(projectList.size()>0){
+ if(!projectList.isEmpty()){
List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
for (TjProject project : list) {
TjOrderRemark tjOrderRemark = new TjOrderRemark();
@@ -832,7 +793,6 @@
TjOrderDetail detail1 = new TjOrderDetail();
detail1.setTjStatus(0L);
detail1.setOrderId(tjFlowingWater.getOrderId());
-// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail1.setProId(project.getProId());
detail1.setIsAddition("Y");
detail1.setCreateBy(sysUser.getNickName());
@@ -982,10 +942,8 @@
if(null !=config && config.equals("Y")){
-
-
//妫�楠岀敵璇�
- if(detailsDtos.size()>0){
+ if(!detailsDtos.isEmpty()){
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(order.getCardId());
dto.setSfzh(customer.getCusIdcard());
@@ -1048,7 +1006,7 @@
}
//闂ㄨ瘖妫�鏌ョ敵璇�
- if(detailsDtoss.size()>0){
+ if(!detailsDtoss.isEmpty()){
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(order.getCardId());
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
@@ -1109,7 +1067,7 @@
}
//鑽搧鐢宠
- if(outpinmedicapplyDetilsDtos.size()>0){
+ if(!outpinmedicapplyDetilsDtos.isEmpty()){
OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
dto1.setHisRegistrationId(order.getCardId());
dto1.setSfzh(customer.getCusIdcard());
@@ -1157,7 +1115,7 @@
}
//闂ㄨ瘖娌荤枟澶勭疆鐢宠
- if(detailDtos.size()>0){
+ if(!detailDtos.isEmpty()){
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(order.getCardId());
dao.setSfzh(customer.getCusIdcard());
@@ -1218,7 +1176,6 @@
}
}
}
-
//鐖堕」鑰楁潗
// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
@@ -1740,36 +1697,7 @@
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
wq.eq(TjOrderDetail::getIsSampling, 0);
List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
- if (null != detailList && detailList.size() > 0) {
- String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
- for (TjOrderDetail detail : detailList) {
- TjSampling sampling = new TjSampling();
- if (null == projectService.getById(detail.getProId())) continue;
- Long proParentId = projectService.getById(detail.getProId()).getProParentId();
- if (null != proParentId && proParentId == 0) {
- sampling.setSpecimenType(projectService.getById(detail.getProId()).getSpecimenType());
- } else {
- sampling.setSpecimenType(projectService.getById(projectService.getById(detail.getProId()).getProParentId()).getSpecimenType());
- }
- sampling.setSamplingNumber(format);
- sampling.setTjNum(order.getTjNumber());
- sampling.setCusId(String.valueOf(order.getUserId()));
- if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) {
- sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName());
- }
- sampling.setApplicationTime(new Date());
- sampling.setTjTime(order.getCreateTime());
- sampling.setProId(String.valueOf(detail.getProId()));
- sampling.setProName(projectService.getById(detail.getProId()).getProName());
- sampling.setCreateBy(sysUser.getNickName());
- sampling.setCreateTime(new Date());
- sampling.setUpdateBy(sysUser.getNickName());
- sampling.setUpdateTime(new Date());
- sampling.setCreateId(String.valueOf(sysUser.getUserId()));
- sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
- samplingService.save(sampling);
- }
- }
+ addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser);
}
//棣栭〉楗肩姸鍥剧櫥璁颁汉鏁版帴鍙�
--
Gitblit v1.8.0