From d26dae167a83c7eb4dfeb59e386bbb30540493c9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 29 九月 2024 18:08:20 +0800
Subject: [PATCH] zjh20240929
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 134 +++++++++++++++-----------------------------
1 files changed, 46 insertions(+), 88 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 cc9253a..2022c2e 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
@@ -129,6 +129,8 @@
private ISysDeptService deptService;
@Autowired
private TjCfService cfService;
+ @Resource
+ private LtkjHysqdService hysqdService;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -501,7 +503,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");
@@ -520,7 +522,6 @@
proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
blService.save(proBl);
- List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
String config = configService.selectConfigByKey("sfkqdyhis");
@@ -540,8 +541,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();
@@ -589,7 +591,7 @@
detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
}
- wqq.in(TbTransition::getProId, proIds);
+// wqq.in(TbTransition::getProId, proIds);
if(null !=config && config.equals("Y")){
//妫�楠�
@@ -727,7 +729,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());
@@ -735,11 +737,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());
@@ -753,64 +753,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();
@@ -830,7 +789,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());
@@ -980,10 +938,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());
@@ -1046,7 +1002,7 @@
}
//闂ㄨ瘖妫�鏌ョ敵璇�
- if(detailsDtoss.size()>0){
+ if(!detailsDtoss.isEmpty()){
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(order.getCardId());
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
@@ -1107,7 +1063,7 @@
}
//鑽搧鐢宠
- if(outpinmedicapplyDetilsDtos.size()>0){
+ if(!outpinmedicapplyDetilsDtos.isEmpty()){
OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
dto1.setHisRegistrationId(order.getCardId());
dto1.setSfzh(customer.getCusIdcard());
@@ -1125,10 +1081,10 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null !=code && code.equals("200")){
- JSONArray resultData = object.getJSONArray("ResultData");
- Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
- String cfh = resultDatasss.get("cfh").toString();
+ if(null !=code && code.equals("0")){
+ JSONObject resultData = object.getJSONObject("ResultData");
+// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+ String cfh = resultData.getStr("cfh");
for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
TjCf cf=new TjCf();
@@ -1155,7 +1111,7 @@
}
//闂ㄨ瘖娌荤枟澶勭疆鐢宠
- if(detailDtos.size()>0){
+ if(!detailDtos.isEmpty()){
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(order.getCardId());
dao.setSfzh(customer.getCusIdcard());
@@ -1216,7 +1172,6 @@
}
}
}
-
//鐖堕」鑰楁潗
// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
@@ -1774,11 +1729,13 @@
private AjaxResult getPieCharts() {
Map<String, Object> map = new HashMap<>();
+ Date date=new Date();
+
//鑾峰彇浣撴鐧昏鏁�
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
- wq0.between(TjOrder::getCreateTime, DateUtil.lastMonth(), DateUtil.now());
+ wq0.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
List<TjOrder> orderCountList = orderService.list(wq0);
- if (null != orderCountList && orderCountList.size() > 0) {
+ if (null != orderCountList && !orderCountList.isEmpty()) {
List<PieChartVo> pieChartVoList = getTjorderCountMap(orderCountList);
map.put("tjdj", pieChartVoList);
} else {
@@ -1786,11 +1743,13 @@
}
//鑾峰彇浣撴寮傚父鏁�
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.between(TjOrder::getFinishTime, DateUtil.lastMonth(), DateUtil.now());
- wq1.eq(TjOrder::getCheckStatus, 1);
- List<TjOrder> orderAbnormalCountList = orderService.list(wq1);
- if (null != orderAbnormalCountList && orderAbnormalCountList.size() > 0) {
- List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderAbnormalCountList);
+ wq1.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
+// wq1.isNotNull(TjOrder::getFinishTime);
+// wq1.eq(TjOrder::getCheckStatus, 1);
+ List<TjOrder> orderList = orderService.list(wq1);
+ if (null !=orderList && !orderList.isEmpty()) {
+// List<TjOrder> orderList = orderAbnormalCountList.stream().distinct().collect(Collectors.toList());
+ List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderList);
map.put("tjyc", pieChartVoList);
} else {
map.put("tjyc", 0);
@@ -1857,14 +1816,14 @@
int c = 0;
int d = 0;
int e = 0;
- Map<String, Object> map = null;
+ Map<String, Object> map = new HashMap<>();
for (TjOrder tjOrder : orderList) {
- map = new HashMap<>();
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq.eq(TjOrderDetail::getExceptionDesc, 1);
List<TjOrderDetail> list = tjOrderDetailService.list(wq);
- if (null != list && list.size() > 0) {
+ int count = hysqdService.getHyYcXmCount(tjOrder.getCardId());
+ if ((null != list && !list.isEmpty()) || (count>0)) {
TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
if (null != customer) {
int age = DateUtil.ageOfNow(customer.getCusBrithday());
@@ -1880,15 +1839,14 @@
e += 1;
}
}
- map.put("0-3宀�", a);
- map.put("3-16宀�", b);
- map.put("16-40宀�", c);
- map.put("40-60宀�", d);
- map.put("60宀佷互涓�", e);
}
}
+ map.put("0-3宀�", a);
+ map.put("3-16宀�", b);
+ map.put("16-40宀�", c);
+ map.put("40-60宀�", d);
+ map.put("60宀佷互涓�", e);
List<PieChartVo> pieChartVoList = new ArrayList<>();
- assert map != null;
for (Map.Entry<String, Object> entry : map.entrySet()) {
PieChartVo pieChartVo = new PieChartVo();
pieChartVo.setName(entry.getKey());
--
Gitblit v1.8.0